Use new SDK.

huangpf · Dec 4, 2017 · 143153b · 143153b
1 parent 0ce5261
commit 143153b
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 23 deletions.
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Compute/ComputeStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Compute/ComputeStrategy.cs
@@ -37,6 +37,7 @@ public static ResourceStrategy<TModel> Create<TModel, TOperations>(
                 createOrUpdateAsync,
                 config => config.Location,
                 (config, location) => config.Location = location,
-                createTime);
+                createTime,
+                true);
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Compute/VirtualMachineStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Compute/VirtualMachineStrategy.cs
@@ -14,9 +14,9 @@
 
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01.Models;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Commands.Compute.Strategies.ResourceManager;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 
 namespace Microsoft.Azure.Commands.Common.Strategies.Compute
 {
@@ -42,7 +42,7 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
             string adminPassword,
             Image image,
             string size)
-            => Strategy.CreateConfig(
+            => Strategy.CreateResourceConfig(
                 resourceGroup,
                 name, 
                 subscription => new VirtualMachine

diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/NetworkInterfaceStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/NetworkInterfaceStrategy.cs
@@ -12,8 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01;
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01.Models;
+using Microsoft.Azure.Commands.Compute.Strategies.ResourceManager;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 
 namespace Microsoft.Azure.Commands.Common.Strategies.Network
@@ -37,7 +38,7 @@ public static ResourceConfig<NetworkInterface> CreateNetworkInterfaceConfig(
             NestedResourceConfig<Subnet, VirtualNetwork> subnet,
             ResourceConfig<PublicIPAddress> publicIPAddress,
             ResourceConfig<NetworkSecurityGroup> networkSecurityGroup = null)
-            => Strategy.CreateConfig(
+            => Strategy.CreateResourceConfig(
                 resourceGroup,
                 name,
                 subscription => new NetworkInterface

diff --git a/...ResourceManager/Compute/Commands.Compute/Strategies/Network/NetworkSecurityGroupPolicy.cs b/...ResourceManager/Compute/Commands.Compute/Strategies/Network/NetworkSecurityGroupPolicy.cs
@@ -12,10 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01.Models;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Commands.Compute.Strategies.ResourceManager;
 using System.Linq;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
 
 namespace Microsoft.Azure.Commands.Common.Strategies.Network
 {
@@ -34,7 +35,7 @@ public static class NetworkSecurityGroupStrategy
 
         public static ResourceConfig<NetworkSecurityGroup> CreateNetworkSecurityGroupConfig(
             this ResourceConfig<ResourceGroup> resourceGroup, string name, int[] openPorts)
-            => Strategy.CreateConfig(
+            => Strategy.CreateResourceConfig(
                 resourceGroup,
                 name,
                 _ => new NetworkSecurityGroup

diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/NetworkStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/NetworkStrategy.cs
@@ -12,8 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01;
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01.Models;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 using System;
 using System.Threading.Tasks;
 

diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/PublicIPAddressStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/PublicIPAddressStrategy.cs
@@ -12,9 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.Network;
-using Microsoft.Azure.Management.Network.Models;
-using Microsoft.Azure.Management.ResourceManager.Models;
+using Microsoft.Azure.Commands.Compute.Strategies.ResourceManager;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
+using Microsoft.Azure.Management.Internal.Resources.Models;
 
 namespace Microsoft.Azure.Commands.Common.Strategies.Network
 {
@@ -36,7 +37,7 @@ public static ResourceConfig<PublicIPAddress> CreatePublicIPAddressConfig(
             string name,
             string domainNameLabel,
             string allocationMethod)
-            => Strategy.CreateConfig(
+            => Strategy.CreateResourceConfig(
                 resourceGroup,
                 name,
                 _ => new PublicIPAddress

diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/SubnetStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/SubnetStrategy.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.Internal.Network.Version2017_03_01.Models;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/VirtualNetworkStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/Network/VirtualNetworkStrategy.cs
@@ -12,9 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.Network;
-using Microsoft.Azure.Management.Network.Models;
-using Microsoft.Azure.Management.ResourceManager.Models;
+using Microsoft.Azure.Commands.Compute.Strategies.ResourceManager;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
+using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
+using Microsoft.Azure.Management.Internal.Resources.Models;
 
 namespace Microsoft.Azure.Commands.Common.Strategies.Network
 {
@@ -35,7 +36,7 @@ public static ResourceConfig<VirtualNetwork> CreateVirtualNetworkConfig(
             this ResourceConfig<ResourceGroup> resourceGroup,
             string name,
             string addressPrefix)
-            => Strategy.CreateConfig(
+            => Strategy.CreateResourceConfig(
                 resourceGroup,
                 name,
                 _ => new VirtualNetwork

diff --git a/...ceManager/Compute/Commands.Compute/Strategies/ResourceManager/ResourceConfigExtensions.cs b/...ceManager/Compute/Commands.Compute/Strategies/ResourceManager/ResourceConfigExtensions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Azure.Commands.Compute.Strategies.ResourceManager
 {
     static class ResourceConfigExtensions
     {
-        public static ResourceConfig<TModel> CreateConfig<TModel>(
+        public static ResourceConfig<TModel> CreateResourceConfig<TModel>(
             this ResourceStrategy<TModel> strategy,
             ResourceConfig<ResourceGroup> resourceGroup,
             string name,

diff --git a/...ourceManager/Compute/Commands.Compute/Strategies/ResourceManager/ResourceGroupStrategy.cs b/...ourceManager/Compute/Commands.Compute/Strategies/ResourceManager/ResourceGroupStrategy.cs
@@ -29,7 +29,8 @@ public static class ResourceGroupStrategy
                 (o, p) => o.CreateOrUpdateAsync(p.Name, p.Model, p.CancellationToken),
                 model => model.Location,
                 (model, location) => model.Location = location,
-                _ => 3);
+                _ => 3,
+                false);
 
         public static ResourceConfig<ResourceGroup> CreateResourceGroupConfig(string name)
             => Strategy.CreateConfig(name, name);

diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs
@@ -25,8 +25,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
-using Microsoft.Azure.Management.Network;
-using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Management.Storage.Models;
 using System;