Client.

Author: sergey-shandar

src/ResourceManager/Common/Commands.Common.Strategies/Compute/ComputeStrategy.cs

@@ -9,7 +9,7 @@ public static class ComputePolicy
     {
         public static ResourceStrategy<Model> Create<Model, Operations>(
             string header,
-            Func<IComputeManagementClient, Operations> getOperations,
+            Func<ComputeManagementClient, Operations> getOperations,
             Func<GetAsyncParams<Operations>, Task<Model>> getAsync,
             Func<CreateOrUpdateAsyncParams<Operations, Model>, Task<Model>> createOrUpdateAsync)
             where Model : Resource

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

@@ -1,10 +1,11 @@
-using System;
+using Microsoft.Rest;
+using System;
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
     public interface IClient
     {
         T GetClient<T>()
-            where T : class, IDisposable;
+            where T : ServiceClient<T>;
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/Network/NetworkStrategy.cs

@@ -9,7 +9,7 @@ public static class NetworkStrategy
     {
         public static ResourceStrategy<Model> Create<Model, Operations>(
             string header,
-            Func<INetworkManagementClient, Operations> getOperations,
+            Func<NetworkManagementClient, Operations> getOperations,
             Func<GetAsyncParams<Operations>, Task<Model>> getAsync,
             Func<CreateOrUpdateAsyncParams<Operations, Model>, Task<Model>> createOrUpdateAsync)
             where Model : Resource

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

@@ -7,7 +7,7 @@ namespace Microsoft.Azure.Commands.Common.Strategies.ResourceManager
     public static class ResourceGroupStrategy
     {
         public static ResourceStrategy<ResourceGroup> Strategy { get; }
-            = ResourceStrategy.Create<ResourceGroup, IResourceManagementClient, IResourceGroupsOperations>(
+            = ResourceStrategy.Create<ResourceGroup, ResourceManagementClient, IResourceGroupsOperations>(
                 _ => Enumerable.Empty<string>(),
                 client => client.ResourceGroups,
                 p => p.Operations.GetAsync(p.Name, p.CancellationToken),

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

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Rest;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -41,7 +42,7 @@ public static ResourceStrategy<Model> Create<Model, Client, Operations>(
             Func<CreateOrUpdateAsyncParams<Operations, Model>, Task<Model>> createOrUpdateAsync,
             Func<Model, string> getLocation,
             Action<Model, string> setLocation)
-            where Client : class, IDisposable
+            where Client : ServiceClient<Client>
         {
             Func<IClient, Operations> toOperations = client => getOperations(client.GetClient<Client>());
             return new ResourceStrategy<Model>(
@@ -61,7 +62,7 @@ public static ResourceStrategy<Model> Create<Model, Client, Operations>(
             Func<CreateOrUpdateAsyncParams<Operations, Model>, Task<Model>> createOrUpdateAsync,
             Func<Model, string> getLocation,
             Action<Model, string> setLocation)
-            where Client : class, IDisposable
+            where Client : ServiceClient<Client>
             => Create(
                 name => new[] { "providers" }.Concat(headers).Concat(new[] { name }),
                 getOperations,

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs

@@ -16,20 +16,25 @@
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
+using Microsoft.Azure.Commands.Common.Strategies;
 using Microsoft.Azure.Commands.Common.Strategies.Compute;
 using Microsoft.Azure.Commands.Common.Strategies.Network;
 using Microsoft.Azure.Commands.Common.Strategies.ResourceManager;
 using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Commands.Compute.Models;
 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 Microsoft.Rest;
 using System;
 using System.Collections;
 using System.Linq;
 using System.Management.Automation;
 using System.Reflection;
+using System.Threading;
 using CM = Microsoft.Azure.Management.Compute.Models;
 
 namespace Microsoft.Azure.Commands.Compute
@@ -38,14 +43,19 @@ namespace Microsoft.Azure.Commands.Compute
     [OutputType(typeof(PSAzureOperationResponse))]
     public class NewAzureVMCommand : VirtualMachineBaseCmdlet
     {
+        public const string DefaultParameterSet = "DefaultParameterSet";
+        public const string StrategyParameterSet = "StrategyParameterSet";
+
         [Parameter(
+            ParameterSetName = DefaultParameterSet,
             Mandatory = true,
             Position = 0,
             ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
         [Parameter(
+            ParameterSetName = DefaultParameterSet,
             Mandatory = true,
             Position = 1,
             ValueFromPipelineByPropertyName = true)]
@@ -54,6 +64,7 @@ public class NewAzureVMCommand : VirtualMachineBaseCmdlet
 
         [Alias("VMProfile")]
         [Parameter(
+            ParameterSetName = DefaultParameterSet,
             Mandatory = true,
             Position = 2,
             ValueFromPipeline = true,
@@ -62,23 +73,24 @@ public class NewAzureVMCommand : VirtualMachineBaseCmdlet
         public PSVirtualMachine VM { get; set; }
 
         [Parameter(
+            ParameterSetName = DefaultParameterSet,
             Position = 3,
             HelpMessage = "Disable BG Info Extension")]
         public SwitchParameter DisableBginfoExtension { get; set; }
 
         [Parameter(
+            ParameterSetName = DefaultParameterSet,
             Mandatory = false,
             ValueFromPipelineByPropertyName = true)]
         public Hashtable Tags { get; set; }
 
         [Parameter(
+            ParameterSetName = DefaultParameterSet,
             Mandatory = false,
             ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
         public string LicenseType { get; set; }
 
-        public const string StrategyParameterSet = "StrategyParameterSet";
-
         [Parameter(
             ParameterSetName = StrategyParameterSet,
             Mandatory = true)]
@@ -94,7 +106,7 @@ public class NewAzureVMCommand : VirtualMachineBaseCmdlet
             Mandatory = false)]
         public string SubnetAddressPrefix { get; } = "192.168.1.0/24";
 
-        [Parameter(ParameterSetName = StrategyParameterSet, Mandatory = false)]
+        [Parameter(ParameterSetName = StrategyParameterSet, Mandatory = true)]
         public PSCredential Credential { get; }
 
         public override void ExecuteCmdlet()
@@ -110,6 +122,24 @@ public override void ExecuteCmdlet()
             }
         }
 
+        private sealed class Client : IClient
+        {
+            public string SubscriptionId { get; }
+
+            IAzureContext Context { get; }
+
+            public Client(IAzureContext context)
+            {
+                Context = context;
+                SubscriptionId = Context.Subscription.Id;
+            }
+
+            public T GetClient<T>()
+                where T : ServiceClient<T>
+                => AzureSession.Instance.ClientFactory.CreateArmClient<T>(
+                    Context, AzureEnvironment.Endpoint.ResourceManager);
+        }
+
         public void StrategyExecuteCmdlet()
         {
             var resourceGroup = ResourceGroupStrategy.CreateResourceGroupConfig(Name);
@@ -124,6 +154,19 @@ public void StrategyExecuteCmdlet()
                 networkInterface,
                 Credential.UserName,
                 new System.Net.NetworkCredential(string.Empty, Credential.Password).Password);
+
+            //
+            var client = new Client(DefaultProfile.DefaultContext);
+            var state = virtualMachine
+                .GetAsync(client, new CancellationToken())
+                .GetAwaiter()
+                .GetResult();
+            var location = state.GetLocation(virtualMachine);
+            var target = virtualMachine.GetTargetState(client.SubscriptionId, location);
+            var result = virtualMachine
+                .CreateOrUpdateAsync(client, state, target, new CancellationToken())
+                .GetAwaiter()
+                .GetResult();
         }
 
         public void DefaultExecuteCmdlet()