.

src/AzurePowershell.sln

@@ -28,6 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTest", "Co
 	ProjectSection(ProjectDependencies) = postProject
 		{CD5AA507-F5EF-473D-855B-84B91A1ABE54} = {CD5AA507-F5EF-473D-855B-84B91A1ABE54}
 		{DDF5D225-C9C5-42B7-BDB5-2C3646E479AA} = {DDF5D225-C9C5-42B7-BDB5-2C3646E479AA}
+		{E895BBDA-0B06-46AB-B909-9B97B3ECE47E} = {E895BBDA-0B06-46AB-B909-9B97B3ECE47E}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement", "ServiceManagement\Compute\Commands.ServiceManagement\Commands.ServiceManagement.csproj", "{E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}"
@@ -577,6 +578,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{37455286-D8A7-4E0C-8B4D-C517D20C641A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{D6F470A6-7395-4B8B-9D29-44DF0EC8F624} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{A3965B66-5A3E-4B8C-9574-28E5958D4828} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -587,7 +589,6 @@ Global
 		{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{3B48A77B-5956-4A62-9081-92BA04B02B27} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
-		{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{374D4000-DEDE-4995-9B63-E3B9FE0C4D29} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}

src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

@@ -206,6 +206,18 @@
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationSuspendAndResumeJob.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunAutoGeneratedHostedServiceCmdletTests.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunAutoGeneratedVirtualMachineCmdletTests.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunNewAzureComputeArgumentListTests.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunNewAzureComputeParameterObjectTests.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunServiceManagementCloudExceptionTests.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -129,4 +129,217 @@ function Run-StartAndStopMultipleVirtualMachinesTest
         # Cleanup
         Cleanup-CloudService $svcName;
     }
+}
+
+# Run Auto-Generated Hosted Service Cmdlet Tests
+function Run-AutoGeneratedHostedServiceCmdletTests
+{
+    # Setup
+    $location = Get-DefaultLocation;
+    $imgName = Get-DefaultImage $location;
+
+    $storageName = 'pstest' + (getAssetName);
+    New-AzureStorageAccount -StorageAccountName $storageName -Location $location;
+
+    # Associate the new storage account with the current subscription
+    Set-CurrentStorageAccountName $storageName;
+
+    $vmNameList = @("vm01", "vm02", "test04");
+    $svcName = 'pstest' + (Get-CloudServiceName);
+    $userName = "pstestuser";
+    $password = "p@ssw0rd";
+
+    try
+    {
+        # Create Parameters
+        $svcCreateParams = New-AzureComputeParameterObject -FriendlyName 'HostedServiceCreateParameters';
+        $svcCreateParams.ServiceName = $svcName;
+        $svcCreateParams.Location = $location;
+        $svcCreateParams.Description = $svcName;
+        $svcCreateParams.Label = $svcName;
+
+        # Invoke Create
+        $st = Invoke-AzureComputeMethod -MethodName 'HostedServiceCreate' -HostedServiceCreateParameters $svcCreateParams;
+
+        Assert-AreEqual $st.StatusCode 'Created';
+        Assert-NotNull $st.RequestId;
+
+        # Invoke Get
+        $svcGetResult = Invoke-AzureComputeMethod -MethodName 'HostedServiceGet' -ServiceName $svcName;
+        Assert-AreEqual $svcGetResult.ServiceName $svcName;
+        Assert-AreEqual $svcGetResult.Properties.Description $svcName;
+        Assert-AreEqual $svcGetResult.Properties.Label $svcName;
+
+        # Update Parameters
+        $svcUpdateParams = New-AzureComputeParameterObject -FriendlyName 'HostedServiceUpdateParameters';
+        $svcUpdateParams.Description = 'update1';
+        $svcUpdateParams.Label = 'update2';
+
+        # Invoke Update
+        $svcGetResult2 = Invoke-AzureComputeMethod -MethodName 'HostedServiceUpdate' -ServiceName $svcName -HostedServiceUpdateParameters $svcUpdateParams;
+
+        # Invoke Get
+        $svcGetResult2 = Invoke-AzureComputeMethod -MethodName 'HostedServiceGet' -ServiceName $svcName;
+        Assert-AreEqual $svcGetResult2.ServiceName $svcName;
+        Assert-AreEqual $svcGetResult2.Properties.Description $svcUpdateParams.Description;
+        Assert-AreEqual $svcGetResult2.Properties.Label $svcUpdateParams.Label;
+
+        # Invoke List
+        $svcListResult = Invoke-AzureComputeMethod -MethodName 'HostedServiceList';
+        Assert-True { ($svcListResult | where { $_.ServiceName -eq $svcName }).Count -gt 0 };
+
+        # Invoke Delete
+        $st = Invoke-AzureComputeMethod -MethodName 'HostedServiceDelete' -ServiceName $svcName;
+        Assert-AreEqual $st.StatusCode 'OK';
+        Assert-NotNull $st.RequestId;
+    }
+    finally
+    {
+        # Cleanup
+        Cleanup-CloudService $svcName;
+    }
+}
+
+# Run Auto-Generated Virtual Machine Cmdlet Tests
+function Run-AutoGeneratedVirtualMachineCmdletTests
+{
+    # Setup
+    $location = Get-DefaultLocation;
+
+    $storageName = 'pstest' + (getAssetName);
+    New-AzureStorageAccount -StorageAccountName $storageName -Location $location;
+
+    # Associate the new storage account with the current subscription
+    Set-CurrentStorageAccountName $storageName;
+
+    $svcName = 'pstest' + (Get-CloudServiceName);
+    $userName = "pstestuser";
+    $password = "p@ssw0rd";
+
+    try
+    {
+        # Create Hosted Service Parameters
+        $svcCreateParams = New-AzureComputeParameterObject -FriendlyName 'HostedServiceCreateParameters';
+        $svcCreateParams.ServiceName = $svcName;
+        $svcCreateParams.Location = $location;
+        $svcCreateParams.Description = $svcName;
+        $svcCreateParams.Label = $svcName;
+
+        # Invoke Hosted Service Create
+        $st = Invoke-AzureComputeMethod -MethodName 'HostedServiceCreate' -ArgumentList $svcCreateParams;
+        Assert-AreEqual $st.StatusCode 'Created';
+        Assert-NotNull $st.RequestId;
+
+        # Invoke Hosted Service Get
+        $svcGetResult = Invoke-AzureComputeMethod -MethodName 'HostedServiceGet' -ArgumentList $svcName;
+        Assert-AreEqual $svcGetResult.ServiceName $svcName;
+        Assert-AreEqual $svcGetResult.Properties.Description $svcName;
+        Assert-AreEqual $svcGetResult.Properties.Label $svcName;
+
+        # Invoke Virtual Machine OS Image List
+        $images = (Invoke-AzureComputeMethod -MethodName 'VirtualMachineOSImageList').Images;
+        $image = $images | where { $_.OperatingSystemType -eq 'Windows' -and $_.LogicalSizeInGB -le 100 } | select -First 1;
+
+        # Create Virtual Machine Deployment Create Parameters
+        $vmDeployment = New-AzureComputeParameterObject -FriendlyName 'VirtualMachineCreateDeploymentParameters';
+        $vmDeployment.Name = $svcName;
+        $vmDeployment.Label = $svcName;
+        $vmDeployment.DeploymentSlot = 'Production';
+        $vmDeployment.Roles = New-AzureComputeParameterObject -FriendlyName 'VirtualMachineRoleList';
+        $vmDeployment.Roles.Add((New-AzureComputeParameterObject -FriendlyName 'VirtualMachineRole'));
+        $vmDeployment.Roles[0].RoleName = $svcName;
+        $vmDeployment.Roles[0].RoleSize = 'Large';
+        $vmDeployment.Roles[0].RoleType = 'PersistentVMRole';
+        $vmDeployment.Roles[0].ProvisionGuestAgent = $false;
+        $vmDeployment.Roles[0].ResourceExtensionReferences = $null;
+        $vmDeployment.Roles[0].DataVirtualHardDisks = $null;
+        $vmDeployment.Roles[0].OSVirtualHardDisk = New-AzureComputeParameterObject -FriendlyName 'VirtualMachineOSVirtualHardDisk';
+        $vmDeployment.Roles[0].OSVirtualHardDisk.SourceImageName = $image.Name;
+        $vmDeployment.Roles[0].OSVirtualHardDisk.MediaLink = "http://${storageName}.blob.core.windows.net/myvhds/${svcName}.vhd";
+        $vmDeployment.Roles[0].OSVirtualHardDisk.ResizedSizeInGB = 128;
+        $vmDeployment.Roles[0].OSVirtualHardDisk.HostCaching = 'ReadWrite';
+        $vmDeployment.Roles[0].ConfigurationSets = New-AzureComputeParameterObject -FriendlyName 'VirtualMachineConfigurationSetList';
+        $vmDeployment.Roles[0].ConfigurationSets.Add((New-AzureComputeParameterObject -FriendlyName 'VirtualMachineConfigurationSet'));
+        $vmDeployment.Roles[0].ConfigurationSets[0].ConfigurationSetType = "WindowsProvisioningConfiguration";
+        $vmDeployment.Roles[0].ConfigurationSets[0].AdminUserName = $userName;
+        $vmDeployment.Roles[0].ConfigurationSets[0].AdminPassword = $password;
+        $vmDeployment.Roles[0].ConfigurationSets[0].ComputerName = 'test';
+        $vmDeployment.Roles[0].ConfigurationSets[0].HostName = "${svcName}.cloudapp.net";
+        $vmDeployment.Roles[0].ConfigurationSets[0].EnableAutomaticUpdates = $false;
+        $vmDeployment.Roles[0].ConfigurationSets[0].TimeZone = "Pacific Standard Time";
+
+        # Invoke Virtual Machine Create Deployment
+        $st = Invoke-AzureComputeMethod -MethodName 'VirtualMachineCreateDeployment' -ArgumentList $svcName,$vmDeployment;
+        Assert-AreEqual $st.StatusCode 'OK';
+        Assert-NotNull $st.RequestId;
+
+        # Invoke Virtual Machine Get
+        $st = Invoke-AzureComputeMethod -MethodName 'VirtualMachineGet' -ArgumentList $svcName,$svcName,$svcName;
+        Assert-AreEqual $st.RoleName $svcName;
+
+        # Invoke Hosted Service Delete
+        $st = Invoke-AzureComputeMethod -MethodName 'HostedServiceDeleteAll' -ArgumentList $svcName;
+        Assert-AreEqual $st.StatusCode 'OK';
+        Assert-NotNull $st.RequestId;
+    }
+    finally
+    {
+        # Cleanup
+        Cleanup-CloudService $svcName;
+    }
+}
+
+
+# Run New-AzureComputeArgumentList Cmdlet Tests Using Method Names
+function Run-NewAzureComputeArgumentListTests
+{
+    $command = Get-Command -Name 'New-AzureComputeArgumentList';
+    $all_methods = $command.Parameters['MethodName'].Attributes.ValidValues;
+
+    foreach ($method in $all_methods)
+    {
+        $args = New-AzureComputeArgumentList -MethodName $method;
+        foreach ($arg in $args)
+        {
+            Assert-NotNull $arg;
+        }
+
+        Write-Verbose "Invoke-AzureComputeMethod -MethodName $method -ArgumentList $args;";
+
+        if ($args.Count -gt 0)
+        {
+            # If the method requires any inputs, empty/null input call would fail
+            Assert-Throws { Invoke-AzureComputeMethod -MethodName $method -ArgumentList $args; }
+        }
+        else
+        {
+            # If the method doesn't requires any inputs, it shall succeed.
+            $st = Invoke-AzureComputeMethod -MethodName $method;
+        }
+    }
+}
+
+
+# Run New-AzureComputeParameterObject Cmdlet Tests
+function Run-NewAzureComputeParameterObjectTests
+{
+    $command = Get-Command -Name 'New-AzureComputeParameterObject';
+
+    $all_friendly_names = $command.Parameters['FriendlyName'].Attributes.ValidValues;
+    foreach ($friendly_name in $all_friendly_names)
+    {
+        $param = New-AzureComputeParameterObject -FriendlyName $friendly_name;
+        Assert-NotNull $param;
+    }
+
+    $all_full_names = $command.Parameters['FullName'].Attributes.ValidValues;
+    foreach ($full_name in $all_full_names)
+    {
+        $param = New-AzureComputeParameterObject -FullName $full_name;
+        Assert-NotNull $param;
+
+        $param_type_name = $param.GetType().ToString().Replace('+', '.');
+        $full_name_query = $full_name.Replace('+', '.').Replace('<', '*').Replace('>', '*');
+        Assert-True { $param_type_name -like $full_name_query } "`'$param_type_name`' & `'$full_name`'";
+    }
 }

src/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

@@ -53,5 +53,41 @@ public void RunStartAndStopMultipleVirtualMachinesTest()
         {
             this.RunPowerShellTest("Run-StartAndStopMultipleVirtualMachinesTest");
         }
+
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void RunAutoGeneratedHostedServiceCmdletTests()
+        {
+            this.RunPowerShellTest("Run-AutoGeneratedHostedServiceCmdletTests");
+        }
+
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void RunAutoGeneratedVirtualMachineCmdletTests()
+        {
+            this.RunPowerShellTest("Run-AutoGeneratedVirtualMachineCmdletTests");
+        }
+
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void RunNewAzureComputeArgumentListTests()
+        {
+            this.RunPowerShellTest("Run-NewAzureComputeArgumentListTests");
+        }
+
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void RunNewAzureComputeParameterObjectTests()
+        {
+            this.RunPowerShellTest("Run-NewAzureComputeParameterObjectTests");
+        }
     }
 }

src/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs

@@ -54,6 +54,7 @@ protected void RunPowerShellTest(params string[] scripts)
                 List<string> modules = Directory.GetFiles(@"Resources\ServiceManagement", "*.ps1").ToList();
                 modules.Add("Common.ps1");
                 modules.Add(@"..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1");
+                modules.Add(@"..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\AzurePreview.psd1");
 
                 helper.SetupEnvironment(AzureModule.AzureServiceManagement);
                 helper.SetupModules(modules.ToArray());

src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunNewAzureComputeParameterObjectTests.json

@@ -0,0 +1,7 @@
+{
+  "Entries": [],
+  "Names": {},
+  "Variables": {
+    "SubscriptionId": "4d368445-cbb1-42a7-97a6-6850ab99f48e"
+  }
+}

src/ResourceManager/Automation/Commands.Automation.Test/Commands.ResourceManagement.Automation.Test.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>
     </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}</ProjectGuid>
+    <ProjectGuid>{59D1B5DC-9175-43EC-90C6-CBA601B3565F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMDataDiskCommand.cs

@@ -68,6 +68,7 @@ public class AddAzureVMDataDiskCommand : AzurePSCmdlet
             Position = 4,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = HelpMessages.VMDataDiskSizeInGB)]
+        [AllowNull]
         public int? DiskSizeInGB { get; set; }
 
         [Parameter(

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

@@ -401,6 +401,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerCrudTests\TestServerUpdate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeWithUpgradeHint.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServiceTierAdvisorTests\GetUpgradeDatabaseHint.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -419,9 +422,6 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestDatabaseTransparentDataEncryptionUpdate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeWithRecommendedDatabase.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeAndCancel.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerUpgradeTests.cs

@@ -22,9 +22,9 @@ public class ServerUpgradeTests : SqlTestsBase
     {
         [Fact]
         [Trait(Category.Sql, Category.CheckIn)]
-        public void TestServerUpgradeWithRecommendedDatabase()
+        public void TestServerUpgradeWithUpgradeHint()
         {
-            RunPowerShellTest("Test-ServerUpgradeWithRecommendedDatabase");
+            RunPowerShellTest("Test-ServerUpgradeWithUpgradeHint");
         }
 
         [Fact]