Upgrading to use Azure RemoteApp v1.0.7

yadavbdev · yadavbdev · commit 07e643c0f448 · 2015-02-26T14:40:05.000-08:00
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Commands.RemoteApp.Test.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Commands.RemoteApp.Test.csproj
@@ -92,7 +92,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.RemoteApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.6\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.7\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/MockObject.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/MockObject.cs
@@ -60,7 +60,7 @@ public partial class MockObject
 
         internal static IList<StartMenuApplication> mockStartMenuList { get; set; }
 
-        internal static IList<VNetVpnDevices> mockVpnList { get; set; }
+        internal static IList<Vendor> mockVpnList { get; set; }
 
         internal static IList<VNetOperationStatus> mockVNetStatusList { get; set; }
 
@@ -118,7 +118,7 @@ private static List<T> ExpectedResult<T>()
             {
                 expectedResults = ConvertList<T>(mockVNetList);
             }
-            else if (typeof(T) == typeof(VNetVpnDevices))
+            else if (typeof(T) == typeof(Vendor))
             {
                 expectedResults = ConvertList<T>(mockVpnList);
             }
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/VNetObjects.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/VNetObjects.cs
@@ -167,37 +167,30 @@ public static int SetUpDefaultResetVpnSharedKey(Mock<IRemoteAppManagementClient>
 
         public static int SetUpDefaultVpnDevice(Mock<IRemoteAppManagementClient> clientMock, string name)
         {
-            ISetup<IRemoteAppManagementClient, Task<VNetVpnDevicesResult>> setup = null;
+            ISetup<IRemoteAppManagementClient, Task<VNetVpnDeviceResult>> setup = null;
 
-            VNetVpnDevicesResult response = new VNetVpnDevicesResult()
+            VNetVpnDeviceResult response = new VNetVpnDeviceResult()
             {
                 RequestId = "23411-345",
                 StatusCode = System.Net.HttpStatusCode.OK,
-                VpnDevices = new VNetVpnDevices()
-                {
-                    Version = "0.9",
-                    Vendors = new List<Vendor>()
+                Vendors = new Vendor[]
                     { 
                         new Vendor()
                         {
                             Name = "Acme",
-                            VpnDevices = new List<VpnDevice>()
+                            Platforms = new List<Platform>()
                             { 
-                                new VpnDevice()
+                                new Platform()
                                 {
                                     Name = "BasicVPN",
                                     OsFamilies = new List<OsFamily>()
                                 }
                             }
                         }
                     }
-                }
             };
 
-            mockVpnList = new List<VNetVpnDevices>()
-            {
-                response.VpnDevices
-            };
+            mockVpnList = new List<Vendor>(response.Vendors);
 
             setup = clientMock.Setup(c => c.VNet.GetVpnDevicesAsync(name, It.IsAny<CancellationToken>()));
             setup.Returns(Task.Factory.StartNew(() => response));
@@ -228,21 +221,6 @@ public static bool ContainsExpectedVendor(List<Vendor> vendors, Vendor vendor)
             return false;
         }
 
-        public static bool ContainsExpectedVpnDevices(List<VNetVpnDevices> expectedResult, VNetVpnDevices operationResult)
-        {
-            bool isIdentical = false;
-            foreach (VNetVpnDevices expected in expectedResult)
-            {
-                isIdentical = expected.Version == operationResult.Version;
-                if (isIdentical)
-                {
-                    break;
-                }
-            }
-
-            return isIdentical;
-        }
-
         public static bool ContainsExpectedSharedKeyResult(List<VNetOperationStatus> expectedResult, VNetOperationStatus operationResult)
         {
             bool isIdentical = false;
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/VNet/RemoteAppVNet.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/VNet/RemoteAppVNet.cs
@@ -283,7 +283,7 @@ public void GetVNetSharedKeyResult()
         [TestMethod]
         public void GetVpnDevices()
         {
-            List<VNetVpnDevices> vpnDevices = null; 
+            List<Vendor> vpnDevices = null; 
             int countOfExpectedVNetVpnDevices = 0;
             GetAzureRemoteAppVpnDevices mockCmdlet = SetUpTestCommon<GetAzureRemoteAppVpnDevices>();
 
@@ -306,7 +306,7 @@ public void GetVpnDevices()
                 );
             }
 
-            vpnDevices = MockObject.ConvertList<VNetVpnDevices>(mockCmdlet.runTime().OutputPipeline);
+            vpnDevices = MockObject.ConvertList<Vendor>(mockCmdlet.runTime().OutputPipeline);
             Assert.IsNotNull(vpnDevices);
 
             Assert.IsTrue(vpnDevices.Count == countOfExpectedVNetVpnDevices,
@@ -316,10 +316,6 @@ public void GetVpnDevices()
                 )
             );
 
-            Assert.IsTrue(MockObject.HasExpectedResults<VNetVpnDevices>(vpnDevices, MockObject.ContainsExpectedVpnDevices),
-                 "The actual result does not match the expected"
-            );
-
             Log("The test for Get-AzureRemoteAppVNet with {0} VNets completed successfully", countOfExpectedVNetVpnDevices);
         }
     }
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/packages.config b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.RemoteApp" version="1.0.6" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.RemoteApp" version="1.0.7" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj
@@ -67,7 +67,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.RemoteApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.6\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.7\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Vnet/GetAzureRemoteAppVpnDevices.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Vnet/GetAzureRemoteAppVpnDevices.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Management.RemoteApp.Cmdlets
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRemoteAppVpnDevices"), OutputType(typeof(VNetVpnDevices))]
+    [Cmdlet(VerbsCommon.Get, "AzureRemoteAppVpnDevices"), OutputType(typeof(Vendor))]
     public class GetAzureRemoteAppVpnDevices : RdsCmdlet
     {
         [Parameter(Mandatory = true,
@@ -30,8 +30,8 @@ public class GetAzureRemoteAppVpnDevices : RdsCmdlet
 
         public override void ExecuteCmdlet()
         {
-            VNetVpnDevicesResult response = CallClient(() => Client.VNet.GetVpnDevices(VNetName), Client.VNet);
-            WriteObject(response.VpnDevices);
+            VNetVpnDeviceResult response = CallClient(() => Client.VNet.GetVpnDevices(VNetName), Client.VNet);
+            WriteObject(response.Vendors, true);
         }
 
     }
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Azure.Common.Authentication" version="1.0.10-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Extensions" version="0.13.1-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.RemoteApp" version="1.0.6" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.RemoteApp" version="1.0.7" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public partial class MockObject`
`60`	`60`
`61`	`61`	`internal static IList<StartMenuApplication> mockStartMenuList { get; set; }`
`62`	`62`
`63`		`- internal static IList<VNetVpnDevices> mockVpnList { get; set; }`
	`63`	`+ internal static IList<Vendor> mockVpnList { get; set; }`
`64`	`64`
`65`	`65`	`internal static IList<VNetOperationStatus> mockVNetStatusList { get; set; }`
`66`	`66`
`@@ -118,7 +118,7 @@ private static List<T> ExpectedResult<T>()`
`118`	`118`	`{`
`119`	`119`	`expectedResults = ConvertList<T>(mockVNetList);`
`120`	`120`	`}`
`121`		`- else if (typeof(T) == typeof(VNetVpnDevices))`
	`121`	`+ else if (typeof(T) == typeof(Vendor))`
`122`	`122`	`{`
`123`	`123`	`expectedResults = ConvertList<T>(mockVpnList);`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,37 +167,30 @@ public static int SetUpDefaultResetVpnSharedKey(Mock<IRemoteAppManagementClient>`
`167`	`167`
`168`	`168`	`public static int SetUpDefaultVpnDevice(Mock<IRemoteAppManagementClient> clientMock, string name)`
`169`	`169`	`{`
`170`		`- ISetup<IRemoteAppManagementClient, Task<VNetVpnDevicesResult>> setup = null;`
	`170`	`+ ISetup<IRemoteAppManagementClient, Task<VNetVpnDeviceResult>> setup = null;`
`171`	`171`
`172`		`- VNetVpnDevicesResult response = new VNetVpnDevicesResult()`
	`172`	`+ VNetVpnDeviceResult response = new VNetVpnDeviceResult()`
`173`	`173`	`{`
`174`	`174`	`RequestId = "23411-345",`
`175`	`175`	`StatusCode = System.Net.HttpStatusCode.OK,`
`176`		`- VpnDevices = new VNetVpnDevices()`
`177`		`- {`
`178`		`- Version = "0.9",`
`179`		`- Vendors = new List<Vendor>()`
	`176`	`+ Vendors = new Vendor[]`
`180`	`177`	`{`
`181`	`178`	`new Vendor()`
`182`	`179`	`{`
`183`	`180`	`Name = "Acme",`
`184`		`- VpnDevices = new List<VpnDevice>()`
	`181`	`+ Platforms = new List<Platform>()`
`185`	`182`	`{`
`186`		`- new VpnDevice()`
	`183`	`+ new Platform()`
`187`	`184`	`{`
`188`	`185`	`Name = "BasicVPN",`
`189`	`186`	`OsFamilies = new List<OsFamily>()`
`190`	`187`	`}`
`191`	`188`	`}`
`192`	`189`	`}`
`193`	`190`	`}`
`194`		`- }`
`195`	`191`	`};`
`196`	`192`
`197`		`- mockVpnList = new List<VNetVpnDevices>()`
`198`		`- {`
`199`		`- response.VpnDevices`
`200`		`- };`
	`193`	`+ mockVpnList = new List<Vendor>(response.Vendors);`
`201`	`194`
`202`	`195`	`setup = clientMock.Setup(c => c.VNet.GetVpnDevicesAsync(name, It.IsAny<CancellationToken>()));`
`203`	`196`	`setup.Returns(Task.Factory.StartNew(() => response));`
`@@ -228,21 +221,6 @@ public static bool ContainsExpectedVendor(List<Vendor> vendors, Vendor vendor)`
`228`	`221`	`return false;`
`229`	`222`	`}`
`230`	`223`
`231`		`- public static bool ContainsExpectedVpnDevices(List<VNetVpnDevices> expectedResult, VNetVpnDevices operationResult)`
`232`		`- {`
`233`		`- bool isIdentical = false;`
`234`		`- foreach (VNetVpnDevices expected in expectedResult)`
`235`		`- {`
`236`		`- isIdentical = expected.Version == operationResult.Version;`
`237`		`- if (isIdentical)`
`238`		`- {`
`239`		`- break;`
`240`		`- }`
`241`		`- }`
`242`		`-`
`243`		`- return isIdentical;`
`244`		`- }`
`245`		`-`
`246`	`224`	`public static bool ContainsExpectedSharedKeyResult(List<VNetOperationStatus> expectedResult, VNetOperationStatus operationResult)`
`247`	`225`	`{`
`248`	`226`	`bool isIdentical = false;`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public void GetVNetSharedKeyResult()`
`283`	`283`	`[TestMethod]`
`284`	`284`	`public void GetVpnDevices()`
`285`	`285`	`{`
`286`		`- List<VNetVpnDevices> vpnDevices = null;`
	`286`	`+ List<Vendor> vpnDevices = null;`
`287`	`287`	`int countOfExpectedVNetVpnDevices = 0;`
`288`	`288`	`GetAzureRemoteAppVpnDevices mockCmdlet = SetUpTestCommon<GetAzureRemoteAppVpnDevices>();`
`289`	`289`
`@@ -306,7 +306,7 @@ public void GetVpnDevices()`
`306`	`306`	`);`
`307`	`307`	`}`
`308`	`308`
`309`		`- vpnDevices = MockObject.ConvertList<VNetVpnDevices>(mockCmdlet.runTime().OutputPipeline);`
	`309`	`+ vpnDevices = MockObject.ConvertList<Vendor>(mockCmdlet.runTime().OutputPipeline);`
`310`	`310`	`Assert.IsNotNull(vpnDevices);`
`311`	`311`
`312`	`312`	`Assert.IsTrue(vpnDevices.Count == countOfExpectedVNetVpnDevices,`
`@@ -316,10 +316,6 @@ public void GetVpnDevices()`
`316`	`316`	`)`
`317`	`317`	`);`
`318`	`318`
`319`		`- Assert.IsTrue(MockObject.HasExpectedResults<VNetVpnDevices>(vpnDevices, MockObject.ContainsExpectedVpnDevices),`
`320`		`- "The actual result does not match the expected"`
`321`		`- );`
`322`		`-`
`323`	`319`	`Log("The test for Get-AzureRemoteAppVNet with {0} VNets completed successfully", countOfExpectedVNetVpnDevices);`
`324`	`320`	`}`
`325`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`namespace Microsoft.Azure.Management.RemoteApp.Cmdlets`
`20`	`20`	`{`
`21`		`- [Cmdlet(VerbsCommon.Get, "AzureRemoteAppVpnDevices"), OutputType(typeof(VNetVpnDevices))]`
	`21`	`+ [Cmdlet(VerbsCommon.Get, "AzureRemoteAppVpnDevices"), OutputType(typeof(Vendor))]`
`22`	`22`	`public class GetAzureRemoteAppVpnDevices : RdsCmdlet`
`23`	`23`	`{`
`24`	`24`	`[Parameter(Mandatory = true,`
`@@ -30,8 +30,8 @@ public class GetAzureRemoteAppVpnDevices : RdsCmdlet`
`30`	`30`
`31`	`31`	`public override void ExecuteCmdlet()`
`32`	`32`	`{`
`33`		`- VNetVpnDevicesResult response = CallClient(() => Client.VNet.GetVpnDevices(VNetName), Client.VNet);`
`34`		`- WriteObject(response.VpnDevices);`
	`33`	`+ VNetVpnDeviceResult response = CallClient(() => Client.VNet.GetVpnDevices(VNetName), Client.VNet);`
	`34`	`+ WriteObject(response.Vendors, true);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`}`