Merge master -> dev for release 0.8.14

ChangeLog.txt

@@ -1,3 +1,56 @@
+2015.02.12 version 0.8.14
+* StorSimple: New StorSimple commands in AzureServiceManagement mode:
+  * GetAzureStorSimpleAccessControlRecord
+  * GetAzureStorSimpleStorageAccountCredential
+  * RemoveAzureStorSimpleAccessControlRecord
+  * RemoveAzureStorSimpleStorageAccountCredential
+  * SetAzureStorSimpleAccessControlRecord
+  * GetAzureStorSimpleDeviceVolume 
+  * RemoveAzureStorSimpleDeviceVolume 
+  * GetAzureStorSimpleDeviceVolumeContainer
+  * RemoveAzureStorSimpleDeviceVolumeContainer
+  * GetAzureStorSimpleDevice
+  * GetAzureStorSimpleDeviceConnectedInitiator
+  * GetAzureStorSimpleResource
+  * GetAzureStorSimpleResourceContext
+  * SetAzureStorSimpleDeviceBackupPolicy
+  * NewAzureStorSimpleDeviceBackupPolicy
+  * GetAzureStorSimpleDeviceBackup
+  * RemoveAzureStorSimpleDeviceBackup
+  * StartAzureStorSimpleDeviceBackupJob
+  * StartAzureStorSimpleDeviceBackupRestoreJob
+  * RemoveAzureStorSimpleDeviceBackupPolicy
+  * NewAzureStorSimpleDeviceVolume
+  * SetAzureStorSimpleDeviceVolume
+  * NewAzureStorSimpleDeviceVolumeContainer
+  * SelectAzureStorSimpleResource
+  * GetAzureStorSimpleDeviceBackupPolicy
+  * NewAzureStorSimpleStorageAccountCredential
+  * GetAzureStorSimpleTask
+  * SetAzureStorSimpleStorageAccountCredential
+  * NewAzureStorSimpleInlineStorageAccountCredential
+  * NewAzureStorSimpleAccessControlRecord
+
+* HDInsight:
+  * HeadNodeVMSize (update): the parameter is now a string that can now accept various sizes (specifications here: https://msdn.microsoft.com/en-us/library/azure/dn197896.aspx -> Sizes for Web and Worker Role Instances)
+  * DataNodeVMSize (new)  :  use to specify size of data nodes (where applicable)
+  * ZookeeperNodeVMSize (new): use to specify Zookeeper node sizes (where applicable)
+  * ClusterType (update): New value (Spark) can be specified as cluster type
+  * Add-AzureHDInsightConfigValues cmdlet:
+    * Spark (new): collection of configuration properties can be passed in to customize the Spark service
+
+ * Azure Insights cmdlets in AzureResourceManager Mode:
+   * Get-AzureCrrelationLogId
+   * Get-AzureResourceGroupLog
+   * Get-AzureResourceLog
+   * Get-AzureResourceProviderLog
+   * Get-AzureSubscriptionIdLog
+
+* Azure VM cmdlets
+  * Get-AzureVMDscExtentionStatus: Get the DSC Extension status for a cloud service or VM
+
+ * Updates and bug fixes for AzureAutomation and AzureDataFactory cmdlets
+
 2015.01.08 version 0.8.13
 * Key Vault Service - new cmdlets in AzureResourceManager mode:
   * Keys:

setup/azurecmd.wxs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define productName="Microsoft Azure PowerShell - January 2015" ?>
+  <?define productName="Microsoft Azure PowerShell - February 2015" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 

src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

@@ -62,7 +62,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataFactories">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.3-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager">
       <SpecificVersion>False</SpecificVersion>

src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config

@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.DataFactories" version="0.15.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.DataFactories" version="0.15.3-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.13.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5486.28526-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5486.28526-prerelease" targetFramework="net45" />

src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

@@ -63,7 +63,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataFactories, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.3-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/ResourceManager/DataFactories/Commands.DataFactories/packages.config

@@ -4,7 +4,7 @@
   <package id="Microsoft.Azure.Common" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.DataFactories" version="0.15.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.DataFactories" version="0.15.3-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs

@@ -22,6 +22,7 @@
 using System.Net;
 using System.Net.Cache;
 using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Xml;
@@ -1059,6 +1060,98 @@ public void AzureServiceDiagnosticsExtensionTest()
         #endregion
 
 
+
+        [TestMethod(), TestCategory(Category.Scenario), TestProperty("Feature", "PAAS"), Priority(1), Owner("huangpf"), Description("Test the ADDomain cmdlets.")]
+        [DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\Resources\\package.csv", "package#csv", DataAccessMethod.Sequential)]
+        public void AzureServiceADDomainExtensionTest()
+        {
+            StartTest(MethodBase.GetCurrentMethod().Name, testStartTime);
+
+            // Choose the package and config files from local machine
+            string packageName = Convert.ToString(TestContext.DataRow["upgradePackage"]);
+            string configName = Convert.ToString(TestContext.DataRow["upgradeConfig"]);
+            var packagePath1 = new FileInfo(Directory.GetCurrentDirectory() + "\\" + packageName);
+            var configPath1 = new FileInfo(Directory.GetCurrentDirectory() + "\\" + configName);
+
+            Assert.IsTrue(File.Exists(packagePath1.FullName), "VHD file not exist={0}", packagePath1);
+            Assert.IsTrue(File.Exists(configPath1.FullName), "VHD file not exist={0}", configPath1);
+
+            string deploymentName = "deployment1";
+            string deploymentLabel = "label1";
+            DeploymentInfoContext result;
+
+            PSCredential cred = new PSCredential(username, Utilities.convertToSecureString(password));
+
+            try
+            {
+                serviceName = Utilities.GetUniqueShortName(serviceNamePrefix);
+                vmPowershellCmdlets.NewAzureService(serviceName, serviceName, locationName);
+                Console.WriteLine("service, {0}, is created.", serviceName);
+
+                // Workgroup Config
+                var workGroupName = "test";
+                ExtensionConfigurationInput config = vmPowershellCmdlets.NewAzureServiceDomainJoinExtensionConfig(
+                    workGroupName, null, null, false, null, null, null);
+
+                vmPowershellCmdlets.NewAzureDeployment(serviceName, packagePath1.FullName, configPath1.FullName, DeploymentSlotType.Production, deploymentLabel, deploymentName, false, false, config);
+
+                result = vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Production);
+                pass = Utilities.PrintAndCompareDeployment(result, serviceName, deploymentName, deploymentLabel, DeploymentSlotType.Production, null, 2);
+                Console.WriteLine("successfully deployed the package");
+
+                var resultContext = vmPowershellCmdlets.GetAzureServiceDomainJoinExtension(serviceName);
+                Assert.IsTrue(string.IsNullOrEmpty(resultContext.User));
+                Assert.IsTrue(resultContext.Name == workGroupName);
+                Assert.IsTrue(resultContext.Restart == false);
+
+                vmPowershellCmdlets.RemoveAzureServiceDomainJoinExtension(serviceName, DeploymentSlotType.Production);
+
+                // Join a Workgroup
+                vmPowershellCmdlets.SetAzureServiceDomainJoinExtension(
+                    workGroupName, serviceName, DeploymentSlotType.Production, null, null, false, null, null, "1.*");
+                resultContext = vmPowershellCmdlets.GetAzureServiceDomainJoinExtension(serviceName);
+                Assert.IsTrue(string.IsNullOrEmpty(resultContext.User));
+                Assert.IsTrue(resultContext.Name == workGroupName);
+                Assert.IsTrue(resultContext.Restart == false);
+                Assert.IsTrue(resultContext.Version == "1.*");
+
+                vmPowershellCmdlets.RemoveAzureDeployment(serviceName, DeploymentSlotType.Production, true);
+
+                // Domain Config
+                var domainName = "test.bing.com";
+                config = vmPowershellCmdlets.NewAzureServiceDomainJoinExtensionConfig(
+                    domainName, null, null, null, null, null, 35, true, cred, "1.*");
+                Assert.IsTrue(config.Roles.Any(r => r.Default));
+                Assert.IsTrue(config.PublicConfiguration.Contains(cred.UserName));
+                Assert.IsTrue(config.PublicConfiguration.Contains(domainName));
+                Assert.IsTrue(config.PublicConfiguration.Contains("35"));
+
+                vmPowershellCmdlets.NewAzureDeployment(serviceName, packagePath1.FullName, configPath1.FullName, DeploymentSlotType.Production, deploymentLabel, deploymentName, false, false, config);
+
+                vmPowershellCmdlets.RemoveAzureServiceDomainJoinExtension(serviceName, DeploymentSlotType.Production);
+
+                // Join a Domain
+                vmPowershellCmdlets.SetAzureServiceDomainJoinExtension(
+                    domainName, cred, 35, false, serviceName, DeploymentSlotType.Production, null, (X509Certificate2)null, null, (PSCredential)null, null, "1.*");
+
+                resultContext = vmPowershellCmdlets.GetAzureServiceDomainJoinExtension(serviceName);
+                Assert.IsTrue(resultContext.User == cred.UserName);
+                Assert.IsTrue(resultContext.Name == domainName);
+                Assert.IsTrue(resultContext.JoinOption == 35);
+                Assert.IsTrue(resultContext.Restart == false);
+                Assert.IsTrue(resultContext.Version == "1.*");
+
+                vmPowershellCmdlets.RemoveAzureDeployment(serviceName, DeploymentSlotType.Production, true);
+
+                pass &= Utilities.CheckRemove(vmPowershellCmdlets.GetAzureDeployment, serviceName, DeploymentSlotType.Production);
+            }
+            catch (Exception e)
+            {
+                pass = false;
+                Assert.Fail("Exception occurred: {0}", e.ToString());
+            }
+        }
+
         #region AzureServiceRemoteDesktopExtension Tests
 
         [TestMethod(), TestCategory(Category.Scenario), TestProperty("Feature", "PAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet (New-AzureServiceRemoteDesktopConfig)")]

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/ADDomain/BaseAzureServiceADDomainExtension.cs

@@ -181,15 +181,15 @@ public virtual PSCredential UnjoinDomainCredential
         public BaseAzureServiceADDomainExtensionCmdlet()
             : base()
         {
+            PrivateConfig.Password = string.Empty;
+            PrivateConfig.UnjoinDomainPassword = string.Empty;
         }
 
         protected override void ValidateParameters()
         {
             base.ValidateParameters();
             ProviderNamespace = DomainExtensionNamespace;
             ExtensionName = DomainExtensionType;
-            PrivateConfig.Password = string.Empty;
-            PrivateConfig.UnjoinDomainPassword = string.Empty;
         }
 
         protected override void ValidateConfiguration()

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/ADDomain/NewAzureServiceADDomainExtensionConfig.cs

@@ -187,6 +187,8 @@ public override string OUPath
         [Parameter(Position = 9, ValueFromPipelineByPropertyName = true, ParameterSetName = DomainThumbprintParameterSet)]
         [Parameter(Position = 9, ValueFromPipelineByPropertyName = true, ParameterSetName = DomainJoinOptionParameterSet)]
         [Parameter(Position = 9, ValueFromPipelineByPropertyName = true, ParameterSetName = DomainJoinOptionThumbprintParameterSet)]
+        [Parameter(Position = 6, ValueFromPipelineByPropertyName = true, ParameterSetName = WorkgroupParameterSet)]
+        [Parameter(Position = 6, ValueFromPipelineByPropertyName = true, ParameterSetName = WorkgroupThumbprintParameterSet)]
         [ValidateNotNullOrEmpty]
         public override string Version
         {

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/ADDomain/SetAzureServiceADDomainExtension.cs

@@ -204,6 +204,8 @@ public override string OUPath
         [Parameter(Position = 12, ValueFromPipelineByPropertyName = true, ParameterSetName = DomainThumbprintParameterSet)]
         [Parameter(Position = 12, ValueFromPipelineByPropertyName = true, ParameterSetName = DomainJoinOptionParameterSet)]
         [Parameter(Position = 12, ValueFromPipelineByPropertyName = true, ParameterSetName = DomainJoinOptionThumbprintParameterSet)]
+        [Parameter(Position = 8, ValueFromPipelineByPropertyName = true, ParameterSetName = WorkgroupParameterSet)]
+        [Parameter(Position = 8, ValueFromPipelineByPropertyName = true, ParameterSetName = WorkgroupThumbprintParameterSet)]
         [ValidateNotNullOrEmpty]
         public override string Version
         {