Added more PS output object types.

shutchings · shutchings · commit 74123ccd2e64 · 2017-10-05T12:24:58.000-07:00
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/ScenarioTests/MLCTests.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/ScenarioTests/MLCTests.cs
@@ -16,7 +16,6 @@ public MLCTests(ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(interceptor);
         }
 
-        /*
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewGetRemove()
@@ -37,13 +36,14 @@ public void TestUpdateSystemServices()
         {
             TestController.NewInstance.RunPsTest(this.interceptor, "Test-UpdateSystemServices");
         }
-        */
 
+        /*
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSandbox()
         {
             TestController.NewInstance.RunPsTest(this.interceptor, "Test-Sandbox");
         }
+        */
     }
 }
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Cmdlets/GetAzureRmMlOpClusterKey.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Cmdlets/GetAzureRmMlOpClusterKey.cs
@@ -15,15 +15,14 @@
 using Microsoft.Azure.Commands.MachineLearningCompute.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using Microsoft.Azure.Management.MachineLearningCompute;
-using Microsoft.Azure.Management.MachineLearningCompute.Models;
 using Microsoft.Rest.Azure;
 using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.MachineLearningCompute.Cmdlets
 {
     [Cmdlet(VerbsCommon.Get, CmdletSuffix + "Key")]
-    [OutputType(typeof(OperationalizationClusterCredentials))]
+    [OutputType(typeof(PSOperationalizationClusterCredentials))]
     public class GetAzureRmMlOpClusterKey : MachineLearningComputeCmdletBase
     {
         protected const string CmdletParametersParameterSet =
@@ -77,7 +76,7 @@ public override void ExecuteCmdlet()
 
             try
             {
-                WriteObject(MachineLearningComputeManagementClient.OperationalizationClusters.ListKeys(ResourceGroupName, Name));
+                WriteObject(new PSOperationalizationClusterCredentials(MachineLearningComputeManagementClient.OperationalizationClusters.ListKeys(ResourceGroupName, Name)));
             }
             catch (CloudException e)
             {
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Cmdlets/TestAzureRmMlOpClusterSystemServicesUpdateAvailability.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Cmdlets/TestAzureRmMlOpClusterSystemServicesUpdateAvailability.cs
@@ -1,15 +1,14 @@
 ﻿using Microsoft.Azure.Commands.MachineLearningCompute.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using Microsoft.Azure.Management.MachineLearningCompute;
-using Microsoft.Azure.Management.MachineLearningCompute.Models;
 using Microsoft.Rest.Azure;
 using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.MachineLearningCompute.Cmdlets
 {
     [Cmdlet(VerbsDiagnostic.Test, CmdletSuffix + "SystemServicesUpdateAvailability")]
-    [OutputType(typeof(CheckSystemServicesUpdatesAvailableResponse))]
+    [OutputType(typeof(PSCheckSystemServicesUpdatesAvailableResponse))]
     public class TestAzureRmOpClusterSystemServicesUpdateAvailability: MachineLearningComputeCmdletBase
     {
         protected const string CmdletParametersParameterSet =
@@ -63,7 +62,7 @@ public override void ExecuteCmdlet()
 
             try
             {
-                WriteObject(MachineLearningComputeManagementClient.OperationalizationClusters.CheckSystemServicesUpdatesAvailable(ResourceGroupName, Name));
+                WriteObject(new PSCheckSystemServicesUpdatesAvailableResponse(MachineLearningComputeManagementClient.OperationalizationClusters.CheckSystemServicesUpdatesAvailable(ResourceGroupName, Name)));
             }
             catch (CloudException e)
             {
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Cmdlets/UpdateAzureRmMlOpClusterSystemService.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Cmdlets/UpdateAzureRmMlOpClusterSystemService.cs
@@ -15,7 +15,6 @@
 using Microsoft.Azure.Commands.MachineLearningCompute.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using Microsoft.Azure.Management.MachineLearningCompute;
-using Microsoft.Azure.Management.MachineLearningCompute.Models;
 using Microsoft.Rest.Azure;
 using System;
 using System.Management.Automation;
@@ -24,7 +23,7 @@ namespace Microsoft.Azure.Commands.MachineLearningCompute.Cmdlets
 {
 
     [Cmdlet(VerbsData.Update, CmdletSuffix + "SystemService", SupportsShouldProcess = true)]
-    [OutputType(typeof(UpdateSystemServicesResponse))]
+    [OutputType(typeof(PSUpdateSystemServicesResponse))]
     public class UpdateAzureRmMlOpClusterSystemService : MachineLearningComputeCmdletBase
     {
         protected const string CmdletParametersParameterSet =
@@ -80,7 +79,7 @@ public override void ExecuteCmdlet()
 
                 try
                 {
-                    WriteObject(MachineLearningComputeManagementClient.OperationalizationClusters.UpdateSystemServices(ResourceGroupName, Name));
+                    WriteObject(new PSUpdateSystemServicesResponse(MachineLearningComputeManagementClient.OperationalizationClusters.UpdateSystemServices(ResourceGroupName, Name)));
                 }
                 catch (CloudException e)
                 {
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Commands.MachineLearningCompute.csproj b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Commands.MachineLearningCompute.csproj
@@ -87,8 +87,10 @@
     <Compile Include="Cmdlets\NewAzureRmMlOpCluster.cs" />
     <Compile Include="Cmdlets\RemoveAzureRmMlOpCluster.cs" />
     <Compile Include="Cmdlets\UpdateAzureRmMlOpClusterSystemService.cs" />
+    <Compile Include="Models\PSCheckSystemServicesUpdatesAvailableResponse.cs" />
     <Compile Include="Models\PSOperationalizationCluster.cs" />
-    <Compile Include="Models\PSOperationalizationClusterCredential.cs" />
+    <Compile Include="Models\PSOperationalizationClusterCredentials.cs" />
+    <Compile Include="Models\PSUpdateSystemServicesResponse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Models/PSCheckSystemServicesUpdatesAvailableResponse.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Models/PSCheckSystemServicesUpdatesAvailableResponse.cs
@@ -0,0 +1,18 @@
+﻿using Microsoft.Azure.Management.MachineLearningCompute.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.MachineLearningCompute.Models
+{
+    class PSCheckSystemServicesUpdatesAvailableResponse : CheckSystemServicesUpdatesAvailableResponse
+    {
+        public PSCheckSystemServicesUpdatesAvailableResponse(CheckSystemServicesUpdatesAvailableResponse response)
+            : base(response.UpdatesAvailable)
+        {
+
+        }
+    }
+}
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Models/PSOperationalizationClusterCredentials.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Models/PSOperationalizationClusterCredentials.cs
@@ -0,0 +1,17 @@
+﻿using Microsoft.Azure.Management.MachineLearningCompute.Models;
+
+namespace Microsoft.Azure.Commands.MachineLearningCompute.Models
+{
+    public class PSOperationalizationClusterCredentials : OperationalizationClusterCredentials
+    {
+        public PSOperationalizationClusterCredentials(OperationalizationClusterCredentials credentials)
+        {
+            this.StorageAccount = credentials.StorageAccount;
+            this.ContainerRegistry = credentials.ContainerRegistry;
+            this.ContainerService = credentials.ContainerService;
+            this.AppInsights = credentials.AppInsights;
+            this.ServiceAuthConfiguration = credentials.ServiceAuthConfiguration;
+            this.SslConfiguration = credentials.SslConfiguration;
+        }
+    }
+}
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Models/PSUpdateSystemServicesResponse.cs b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Models/PSUpdateSystemServicesResponse.cs
@@ -0,0 +1,18 @@
+﻿using Microsoft.Azure.Management.MachineLearningCompute.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.MachineLearningCompute.Models
+{
+    class PSUpdateSystemServicesResponse : UpdateSystemServicesResponse
+    {
+        public PSUpdateSystemServicesResponse(UpdateSystemServicesResponse response)
+            : base(response.UpdateStatus, response.UpdateStartedOn, response.UpdateCompletedOn)
+        {
+
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public MLCTests(ITestOutputHelper output)`
`16`	`16`	`XunitTracingInterceptor.AddToContext(interceptor);`
`17`	`17`	`}`
`18`	`18`
`19`		`- /*`
`20`	`19`	`[Fact]`
`21`	`20`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`22`	`21`	`public void TestNewGetRemove()`
`@@ -37,13 +36,14 @@ public void TestUpdateSystemServices()`
`37`	`36`	`{`
`38`	`37`	`TestController.NewInstance.RunPsTest(this.interceptor, "Test-UpdateSystemServices");`
`39`	`38`	`}`
`40`		`- */`
`41`	`39`
	`40`	`+ /*`
`42`	`41`	`[Fact]`
`43`	`42`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`44`	`43`	`public void TestSandbox()`
`45`	`44`	`{`
`46`	`45`	`TestController.NewInstance.RunPsTest(this.interceptor, "Test-Sandbox");`
`47`	`46`	`}`
	`47`	`+ */`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,14 @@`
`15`	`15`	`using Microsoft.Azure.Commands.MachineLearningCompute.Models;`
`16`	`16`	`using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;`
`17`	`17`	`using Microsoft.Azure.Management.MachineLearningCompute;`
`18`		`-using Microsoft.Azure.Management.MachineLearningCompute.Models;`
`19`	`18`	`using Microsoft.Rest.Azure;`
`20`	`19`	`using System;`
`21`	`20`	`using System.Management.Automation;`
`22`	`21`
`23`	`22`	`namespace Microsoft.Azure.Commands.MachineLearningCompute.Cmdlets`
`24`	`23`	`{`
`25`	`24`	`[Cmdlet(VerbsCommon.Get, CmdletSuffix + "Key")]`
`26`		`- [OutputType(typeof(OperationalizationClusterCredentials))]`
	`25`	`+ [OutputType(typeof(PSOperationalizationClusterCredentials))]`
`27`	`26`	`public class GetAzureRmMlOpClusterKey : MachineLearningComputeCmdletBase`
`28`	`27`	`{`
`29`	`28`	`protected const string CmdletParametersParameterSet =`
`@@ -77,7 +76,7 @@ public override void ExecuteCmdlet()`
`77`	`76`
`78`	`77`	`try`
`79`	`78`	`{`
`80`		`- WriteObject(MachineLearningComputeManagementClient.OperationalizationClusters.ListKeys(ResourceGroupName, Name));`
	`79`	`+ WriteObject(new PSOperationalizationClusterCredentials(MachineLearningComputeManagementClient.OperationalizationClusters.ListKeys(ResourceGroupName, Name)));`
`81`	`80`	`}`
`82`	`81`	`catch (CloudException e)`
`83`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`	`1`	`using Microsoft.Azure.Commands.MachineLearningCompute.Models;`
`2`	`2`	`using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;`
`3`	`3`	`using Microsoft.Azure.Management.MachineLearningCompute;`
`4`		`-using Microsoft.Azure.Management.MachineLearningCompute.Models;`
`5`	`4`	`using Microsoft.Rest.Azure;`
`6`	`5`	`using System;`
`7`	`6`	`using System.Management.Automation;`
`8`	`7`
`9`	`8`	`namespace Microsoft.Azure.Commands.MachineLearningCompute.Cmdlets`
`10`	`9`	`{`
`11`	`10`	`[Cmdlet(VerbsDiagnostic.Test, CmdletSuffix + "SystemServicesUpdateAvailability")]`
`12`		`- [OutputType(typeof(CheckSystemServicesUpdatesAvailableResponse))]`
	`11`	`+ [OutputType(typeof(PSCheckSystemServicesUpdatesAvailableResponse))]`
`13`	`12`	`public class TestAzureRmOpClusterSystemServicesUpdateAvailability: MachineLearningComputeCmdletBase`
`14`	`13`	`{`
`15`	`14`	`protected const string CmdletParametersParameterSet =`
`@@ -63,7 +62,7 @@ public override void ExecuteCmdlet()`
`63`	`62`
`64`	`63`	`try`
`65`	`64`	`{`
`66`		`- WriteObject(MachineLearningComputeManagementClient.OperationalizationClusters.CheckSystemServicesUpdatesAvailable(ResourceGroupName, Name));`
	`65`	`+ WriteObject(new PSCheckSystemServicesUpdatesAvailableResponse(MachineLearningComputeManagementClient.OperationalizationClusters.CheckSystemServicesUpdatesAvailable(ResourceGroupName, Name)));`
`67`	`66`	`}`
`68`	`67`	`catch (CloudException e)`
`69`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`using Microsoft.Azure.Commands.MachineLearningCompute.Models;`
`16`	`16`	`using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;`
`17`	`17`	`using Microsoft.Azure.Management.MachineLearningCompute;`
`18`		`-using Microsoft.Azure.Management.MachineLearningCompute.Models;`
`19`	`18`	`using Microsoft.Rest.Azure;`
`20`	`19`	`using System;`
`21`	`20`	`using System.Management.Automation;`
`@@ -24,7 +23,7 @@ namespace Microsoft.Azure.Commands.MachineLearningCompute.Cmdlets`
`24`	`23`	`{`
`25`	`24`
`26`	`25`	`[Cmdlet(VerbsData.Update, CmdletSuffix + "SystemService", SupportsShouldProcess = true)]`
`27`		`- [OutputType(typeof(UpdateSystemServicesResponse))]`
	`26`	`+ [OutputType(typeof(PSUpdateSystemServicesResponse))]`
`28`	`27`	`public class UpdateAzureRmMlOpClusterSystemService : MachineLearningComputeCmdletBase`
`29`	`28`	`{`
`30`	`29`	`protected const string CmdletParametersParameterSet =`
`@@ -80,7 +79,7 @@ public override void ExecuteCmdlet()`
`80`	`79`
`81`	`80`	`try`
`82`	`81`	`{`
`83`		`- WriteObject(MachineLearningComputeManagementClient.OperationalizationClusters.UpdateSystemServices(ResourceGroupName, Name));`
	`82`	`+ WriteObject(new PSUpdateSystemServicesResponse(MachineLearningComputeManagementClient.OperationalizationClusters.UpdateSystemServices(ResourceGroupName, Name)));`
`84`	`83`	`}`
`85`	`84`	`catch (CloudException e)`
`86`	`85`	`{`