Skip to content

Commit b5e60b7

Browse files
stankovskistankovski
committed
Merge pull request Azure#1579 from hyonholee/swagger
Update Compute library to Swagger-generated one
2 parents abd4e71 + 794e63e commit b5e60b7

File tree

117 files changed

+46238
-40493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+46238
-40493
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<Reference Include="Microsoft.Azure.Management.Authorization">
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Compute, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<Reference Include="Microsoft.Azure.Management.Compute">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.9.1.0\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
71+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.11.1.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -205,7 +205,7 @@
205205
</ProjectReference>
206206
</ItemGroup>
207207
<ItemGroup>
208-
<None Include="..\..\..\Common\Commands.ScenarioTests.Common\Assert.ps1">
208+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Assert.ps1">
209209
<Link>ScenarioTests\Assert.ps1</Link>
210210
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
211211
</None>

‎src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
159159
GalleryClient = GetGalleryClient();
160160
//var eventsClient = GetEventsClient();
161161
NetworkManagementClient = this.GetNetworkManagementClientClient(context);
162-
ComputeManagementClient = GetComputeManagementClient();
162+
ComputeManagementClient = GetComputeManagementClient(context);
163163
AuthorizationManagementClient = GetAuthorizationManagementClient();
164164
GraphClient = GetGraphClient();
165165

@@ -242,10 +242,10 @@ private NetworkManagementClient GetNetworkManagementClientClient(RestTestFramewo
242242
: TestBase.GetServiceClient<NetworkManagementClient>(new RDFETestEnvironmentFactory());
243243
}
244244

245-
private ComputeManagementClient GetComputeManagementClient()
245+
private ComputeManagementClient GetComputeManagementClient(RestTestFramework.MockContext context)
246246
{
247247
return testViaCsm
248-
? TestBase.GetServiceClient<ComputeManagementClient>(this.csmTestFactory)
248+
? context.GetServiceClient<ComputeManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment())
249249
: TestBase.GetServiceClient<ComputeManagementClient>(new RDFETestEnvironmentFactory());
250250
}
251251
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Hyak.Common;
16+
using Microsoft.Azure.Commands.Compute.Common;
1617
using Microsoft.WindowsAzure.Commands.Common;
1718
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1819
using Xunit;
@@ -26,31 +27,31 @@ public class ComputeCloudExceptionTests
2627
public void RunComputeCloudExceptionTests()
2728
{
2829
// Message Only
29-
var ex1 = new CloudException("Test1");
30+
var ex1 = new Rest.Azure.CloudException("Test1");
3031
var cx1 = new ComputeCloudException(ex1);
3132
Assert.True(string.Equals(cx1.Message, ex1.Message));
32-
Assert.True(cx1.InnerException is CloudException);
33+
Assert.True(cx1.InnerException is Rest.Azure.CloudException);
3334
Assert.True(string.Equals(cx1.InnerException.Message, ex1.Message));
3435

3536
// Message + Inner Exception
36-
var ex2 = new CloudException("Test2", ex1);
37+
var ex2 = new Rest.Azure.CloudException("Test2", ex1);
3738
var cx2 = new ComputeCloudException(ex2);
3839
Assert.True(string.Equals(cx2.Message, ex2.Message));
39-
Assert.True(cx2.InnerException is CloudException);
40+
Assert.True(cx2.InnerException is Rest.Azure.CloudException);
4041
Assert.True(string.Equals(cx2.InnerException.Message, ex2.Message));
4142

4243
// Empty Message
43-
var ex3 = new CloudException(string.Empty);
44+
var ex3 = new Rest.Azure.CloudException(string.Empty);
4445
var cx3 = new ComputeCloudException(ex3);
4546
Assert.True(string.IsNullOrEmpty(cx3.Message));
46-
Assert.True(cx3.InnerException is CloudException);
47+
Assert.True(cx3.InnerException is Rest.Azure.CloudException);
4748
Assert.True(string.IsNullOrEmpty(cx3.InnerException.Message));
4849

4950
// Default message is used, if 'null' passed to the constructor.
50-
var ex4 = new CloudException(null);
51+
var ex4 = new Rest.Azure.CloudException(null);
5152
var cx4 = new ComputeCloudException(ex4);
5253
Assert.True(!string.IsNullOrEmpty(cx4.Message));
53-
Assert.True(cx4.InnerException is CloudException);
54+
Assert.True(cx4.InnerException is Rest.Azure.CloudException);
5455
Assert.True(!string.IsNullOrEmpty(cx4.InnerException.Message));
5556

5657
ComputeTestController.NewInstance.RunPsTest("Run-ComputeCloudExceptionTests");

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function Run-ComputeCloudExceptionTests
2323
$loc = Get-ComputeVMLocation;
2424
New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
2525

26-
$compare = "Resource*NotFound*OperationID : `'*`'";
26+
$compare = "*Resource*not found*OperationID : `'*`'";
2727
Assert-ThrowsLike { $s1 = Get-AzureRmVM -ResourceGroupName $rgname -Name 'test' } $compare;
2828
Assert-ThrowsLike { $s2 = Get-AzureRmVM -ResourceGroupName 'foo' -Name 'bar' } $compare;
2929
Assert-ThrowsLike { $s3 = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name 'test' } $compare;

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
120120
# VM Profile & Hardware
121121
$vmsize = 'Standard_A2';
122122
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
123-
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
123+
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
124124

125125
# NRP
126126
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
@@ -136,7 +136,7 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
136136

137137
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
138138
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
139-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
139+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
140140

141141
# Storage Account (SA)
142142
$stoname = 'sto' + $rgname;
@@ -159,18 +159,18 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
159159
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
160160
$p = Remove-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3';
161161

162-
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
163-
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
164-
Assert-AreEqual $p.StorageProfile.OSDisk.VirtualHardDisk.Uri $osDiskVhdUri;
162+
Assert-AreEqual $p.StorageProfile.OsDisk.Caching $osDiskCaching;
163+
Assert-AreEqual $p.StorageProfile.OsDisk.Name $osDiskName;
164+
Assert-AreEqual $p.StorageProfile.OsDisk.Vhd.Uri $osDiskVhdUri;
165165
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
166166
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
167167
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
168168
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
169-
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
169+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Vhd.Uri $dataDiskVhdUri1;
170170
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
171171
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
172172
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
173-
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
173+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Vhd.Uri $dataDiskVhdUri2;
174174

175175
# OS & Image
176176
$user = "Foo12";

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function Test-GetAzureRmVMDscExtension
2323
$vmsize = 'Standard_A2';
2424
$vmname = 'vm' + $rgname;
2525
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
26-
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
26+
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
2727

2828
# NRP
2929
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
@@ -39,7 +39,7 @@ function Test-GetAzureRmVMDscExtension
3939

4040
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
4141
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
42-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
42+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
4343

4444
# Storage Account
4545
$stoname = 'sto' + $rgname;

0 commit comments

Comments
 (0)