Merge pull request #5315 from markcowl/vmsssimple

Simplified Parameter set for VM ScaleSet Creation

Author: markcowl

src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceConfig.cs

@@ -36,7 +36,7 @@ public sealed class NestedResourceConfig<TModel, TParenModel> : IEntityConfig<TM
         /// </summary>
         public IEntityConfig<TParenModel> Parent { get; }
 
-        public Func<TModel> CreateModel { get; }
+        public Func<string, TModel> CreateModel { get; }
 
         public IResourceConfig Resource => Parent.Resource;
 
@@ -46,7 +46,7 @@ public NestedResourceConfig(
             NestedResourceStrategy<TModel, TParenModel> strategy,            
             IEntityConfig<TParenModel> parent,
             string name,
-            Func<TModel> createModel)
+            Func<string, TModel> createModel)
         {
             Strategy = strategy;
             Name = name;

src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceConfigExtensions.cs

@@ -22,7 +22,7 @@ public static NestedResourceConfig<TModel, TParenModel> CreateConfig<TModel, TPa
             this NestedResourceStrategy<TModel, TParenModel> strategy,
             IEntityConfig<TParenModel> parent,
             string name,
-            Func<TModel> createModel)
+            Func<string, TModel> createModel)
             where TModel : class
             where TParenModel : class
             => new NestedResourceConfig<TModel, TParenModel>(strategy, parent, name, createModel);

src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceStrategy.cs

@@ -14,6 +14,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
@@ -48,5 +49,37 @@ public static NestedResourceStrategy<TModel, TParentModel> Create<TModel, TParen
                 name => new[] { provider, name},
                 get,
                 createOrUpdate);
+
+        public static NestedResourceStrategy<TModel, TParentModel> Create<TModel, TParentModel>(
+            string provider,
+            Func<TParentModel, IList<TModel>> getList,
+            Action<TParentModel, IList<TModel>> setList,
+            Func<TModel, string> getName,
+            Action<TModel, string> setName)
+            where TModel : class
+            where TParentModel : class
+            => Create<TModel, TParentModel>(
+                provider,
+                (parentModel, name) => getList(parentModel)?.FirstOrDefault(model => getName(model) == name),
+                (parentModel, name, model) =>
+                {
+                    setName(model, name);
+                    var list = getList(parentModel);
+                    if (list == null)
+                    {
+                        list = new List<TModel> { model };
+                        setList(parentModel, list);
+                        return;
+                    }
+                    var modelAndIndex = list
+                        .Select((m, i) => new { m, i })
+                        .FirstOrDefault(mi => getName(mi.m) == name);
+                    if (modelAndIndex != null)
+                    {
+                        list[modelAndIndex.i] = model;
+                        return;
+                    }
+                    list.Add(model);
+                });
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/TargetStateExtensions.cs

@@ -45,10 +45,10 @@ sealed class Context
 
             public string Location { get; }
 
-            public Context(IState current, string subscription, string location)
+            public Context(IState current, string subscriptionId, string location)
             {
                 Current = current;
-                Subscription = subscription;
+                Subscription = subscriptionId;
                 Location = location;
             }
 
@@ -84,7 +84,7 @@ public TModel GetOrAdd<TModel, TParentModel>(
                 var model = config.Strategy.Get(parentModel, config.Name);
                 if (model == null)
                 {
-                    model = config.CreateModel();
+                    model = config.CreateModel(Subscription);
                     config.Strategy.CreateOrUpdate(parentModel, config.Name, model);
                 }
                 return model;

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs

@@ -255,7 +255,7 @@ public TClient CreateCustomArmClient<TClient>(params object[] parameters) where
                 }
             }
 
-            if (TestMockSupport.RunningMocked)
+            if (TestMockSupport.RunningMocked && HttpMockServer.GetCurrentMode() != HttpRecorderMode.Record)
             {
                 IAzureClient azureClient = client as IAzureClient;
                 if (azureClient != null)

src/ResourceManager/Compute/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added simplified parameter set to New-AzureRmVmss, which creates a Virtual Machine Scale Set and all required resources using smart defaults
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
 * Obsoleted -Tags in favor of -Tag for New-AzureRmVm and Update-AzureRmVm

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

@@ -179,6 +179,7 @@
     </Compile>
     <Compile Include="ScenarioTests\DscExtensionTests.cs" />
     <Compile Include="ScenarioTests\RunnerTests.cs" />
+    <Compile Include="ScenarioTests\StrategiesVmssTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineBootDiagnosticsTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineRunCommandTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineScaleSetExtensionTests.cs" />
@@ -318,6 +319,9 @@
     <None Include="ScenarioTests\SqlIaaSExtensionTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ScenarioTests\StrategiesVmssTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\test.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -371,6 +375,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StrategiesVirtualMachineTests\TestSimpleNewVm.json" />
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StrategiesVmssTests\TestSimpleNewVmss.json" />
     <None Include="Templates\azuredeploy.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

@@ -1,4 +1,18 @@
-using Microsoft.Azure.Commands.Compute.Test.ScenarioTests;
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Compute.Test.ScenarioTests;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
@@ -11,8 +25,8 @@ public StrategiesVirtualMachineTests(Xunit.Abstractions.ITestOutputHelper output
             ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
         }
 
-        [Fact(/*Skip = "TODO: only works for live mode"*/)]
-        [Trait(Category.RunType, Category.LiveOnly)]
+        [Fact]
+        [Trait(Category.RunType, Category.CheckIn)]
         public void TestSimpleNewVm()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVm");

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVmssTests.cs

@@ -0,0 +1,35 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Compute.Test.ScenarioTests;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
+{
+    public class StrategiesVmssTests
+    {
+        public StrategiesVmssTests(Xunit.Abstractions.ITestOutputHelper output)
+        {
+            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
+        }
+
+        [Fact]
+        [Trait(Category.RunType, Category.CheckIn)]
+        public void TestSimpleNewVmss()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVmss");
+        }
+    }
+}

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVmssTests.ps1

@@ -0,0 +1,48 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vm
+#>
+function Test-SimpleNewVmss
+{
+    # Setup
+    $vmssname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+        $password = "werWER345#%^" | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+
+        # Common
+        $x = New-AzureRmVmss -Name $vmssname -Credential $cred
+
+        Assert-AreEqual $vmssname $x.Name;
+        Assert-AreEqual $vmssname $x.ResourceGroupName;
+        Assert-AreEqual $vmssname $x.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Name;
+        Assert-AreEqual $vmssname $x.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Name;
+        Assert-AreEqual "Standard_DS1_v2" $x.Sku.Name
+        Assert-AreEqual $username $x.VirtualMachineProfile.OsProfile.AdminUsername
+        Assert-AreEqual "2016-Datacenter" $x.VirtualMachineProfile.StorageProfile.ImageReference.Sku
+        Assert-NotNull $x.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].LoadBalancerBackendAddressPools;
+        Assert-NotNull $x.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Subnet
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $vmssname
+    }
+}