Merge pull request #3 from sergey-shandar/sergey-hovsepm-nestedresource

Improved NestedResource configuration

Author: Hovsep

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/Compute/Commands.Compute/Strategies/Network/BackendAddressPoolStrategy.cs

@@ -27,36 +27,20 @@ static class BackendAddressPoolStrategy
     {
         public static NestedResourceStrategy<BackendAddressPool, LoadBalancer> Strategy { get; }
             = NestedResourceStrategy.Create<BackendAddressPool, LoadBalancer>(
-        provider: "backendAddressPools",
-        get: (lb, name) => lb.BackendAddressPools?.FirstOrDefault(s => s?.Name == name),
-        createOrUpdate: (lb, name, backendConfigurationPool) =>
-        {
-            backendConfigurationPool.Name = name;
-            if (lb.BackendAddressPools == null)
-            {
-                lb.BackendAddressPools = new List<BackendAddressPool> { backendConfigurationPool };
-                return;
-            }
-            var b = lb
-                .BackendAddressPools
-                .Select((bn, i) => new { bn, i })
-                .FirstOrDefault(p => p.bn.Name == name);
-
-            if (b != null)
-            {
-                lb.BackendAddressPools[b.i] = backendConfigurationPool;
-                return;
-            }
-            lb.BackendAddressPools.Add(backendConfigurationPool);
-        });
+                provider: "backendAddressPools",
+                getList: parentModel => parentModel.BackendAddressPools,
+                setList: (parentModel, list) => parentModel.BackendAddressPools = list,
+                getName: model => model.Name,
+                setName: (model, name) => model.Name = name);
 
         public static NestedResourceConfig<BackendAddressPool, LoadBalancer> CreateBackendAddressPool(
             this ResourceConfig<LoadBalancer> loadBalancer,
             string name)
                 => Strategy.CreateConfig(
                     parent: loadBalancer,
                     name: name,
-                    createModel: subscriptionId => CreateBackendAddressPoolConfig(backendPoolName:name , subscriptionId: subscriptionId));
+                    createModel: subscriptionId => CreateBackendAddressPoolConfig(
+                        backendPoolName: name , subscriptionId: subscriptionId));
 
         internal static BackendAddressPool CreateBackendAddressPoolConfig(
             string backendPoolName,

src/ResourceManager/Compute/Commands.Compute/Strategies/Network/FrontendIPConfigurationStrategy.cs

@@ -27,28 +27,11 @@ static class FrontendIPConfigurationStrategy
     {
         public static NestedResourceStrategy<FrontendIPConfiguration, LoadBalancer> Strategy { get; }
             = NestedResourceStrategy.Create<FrontendIPConfiguration, LoadBalancer>(
-        provider: "frontendIPConfigurations",
-        get: (lb, name) => lb.FrontendIPConfigurations?.FirstOrDefault(s => s?.Name == name),
-        createOrUpdate: (lb, name, frontendIpConfiguration) =>
-        {
-            frontendIpConfiguration.Name = name;
-            if (lb.FrontendIPConfigurations == null)
-            {
-                lb.FrontendIPConfigurations = new List<FrontendIPConfiguration> { frontendIpConfiguration };
-                return;
-            }
-            var f = lb
-                .FrontendIPConfigurations
-                .Select((fn, i) => new { fn, i })
-                .FirstOrDefault(p => p.fn.Name == name);
-
-            if (f != null)
-            {
-                lb.FrontendIPConfigurations[f.i] = frontendIpConfiguration;
-                return;
-            }
-            lb.FrontendIPConfigurations.Add(frontendIpConfiguration);
-        });
+                provider: "frontendIPConfigurations",
+                getList: parentModel => parentModel.FrontendIPConfigurations,
+                setList: (parentModel, list) => parentModel.FrontendIPConfigurations = list,
+                getName: model => model.Name,
+                setName: (model, name) => model.Name = name);
 
         public static NestedResourceConfig<FrontendIPConfiguration, LoadBalancer> CreateFrontendIPConfiguration(
             this ResourceConfig<LoadBalancer> loadBalancer, 

src/ResourceManager/Compute/Commands.Compute/Strategies/Network/SubnetStrategy.cs

@@ -23,26 +23,10 @@ static class SubnetStrategy
         public static NestedResourceStrategy<Subnet, VirtualNetwork> Strategy { get; }
             = NestedResourceStrategy.Create<Subnet, VirtualNetwork>(
                 provider: "subnets",
-                get: (vn, name) => vn.Subnets?.FirstOrDefault(s => s?.Name == name),
-                createOrUpdate: (vn, name, subnet) =>
-                {
-                    subnet.Name = name;
-                    if (vn.Subnets == null)
-                    {
-                        vn.Subnets = new List<Subnet> { subnet };
-                        return;
-                    }
-                    var s = vn
-                        .Subnets
-                        .Select((sn, i) => new { sn, i })
-                        .FirstOrDefault(p => p.sn.Name == name);
-                    if (s != null)
-                    {
-                        vn.Subnets[s.i] = subnet;
-                        return;
-                    }
-                    vn.Subnets.Add(subnet);
-                });
+                getList: parentModel => parentModel.Subnets,
+                setList: (parentModel, list) => parentModel.Subnets = list,
+                getName: model => model.Name,
+                setName: (model, name) => model.Name = name);
 
         public static NestedResourceConfig<Subnet, VirtualNetwork> CreateSubnet(
             this ResourceConfig<VirtualNetwork> virtualNetwork, string name, string addressPrefix)