Skip to content

Commit 4f31e18

Browse files
DeepakRajendranMsftDeepakRajendranMsft
committed
Merge pull request #2 from DeepakRajendranMsft/UpdateNrpClient
Update nrp PS cmdlets with NRP client 2.0
2 parents b4dac18 + c525ab1 commit 4f31e18

File tree

39 files changed

+12585
-11040
lines changed

39 files changed

+12585
-11040
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@
6868
<Reference Include="Microsoft.Azure.Management.Compute">
6969
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Azure.Management.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.1.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
74-
<Private>True</Private>
73+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7574
</Reference>
7675
<Reference Include="Microsoft.Azure.Management.Storage">
7776
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.1.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtension.json

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestSingleNetworkInterfaceDnsSettings.json

Lines changed: 512 additions & 677 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineMultipleNetworkInterface.json

Lines changed: 1898 additions & 688 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineSingleNetworkInterface.json

Lines changed: 707 additions & 491 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachine.json

Lines changed: 39 additions & 39 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Compute" version="3.4.0-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Network" version="1.0.9-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="2.0.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="2.1.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
<Reference Include="Microsoft.Azure.Management.Authorization">
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.Azure.Management.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.1.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.ResourceManager">
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.CheckDnsAvailabilityTest/TestCheckDnsAvailability.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/microsoft.network/locations/westus/CheckDnsNameAvailability?domainNameLabel=onesdk9754&api-version=2014-12-01-preview",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9taWNyb3NvZnQubmV0d29yay9sb2NhdGlvbnMvd2VzdHVzL0NoZWNrRG5zTmFtZUF2YWlsYWJpbGl0eT9kb21haW5OYW1lTGFiZWw9b25lc2RrOTc1NCZhcGktdmVyc2lvbj0yMDE0LTEyLTAxLXByZXZpZXc=",
4+
"RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/locations/westus/CheckDnsNameAvailability?domainNameLabel=onesdk2418&api-version=2015-05-01-preview",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9sb2NhdGlvbnMvd2VzdHVzL0NoZWNrRG5zTmFtZUF2YWlsYWJpbGl0eT9kb21haW5OYW1lTGFiZWw9b25lc2RrMjQxOCZhcGktdmVyc2lvbj0yMDE1LTA1LTAxLXByZXZpZXc=",
66
"RequestMethod": "GET",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"User-Agent": [
10-
"Microsoft.Azure.Management.Network.NetworkResourceProviderClient/1.0.0.0"
10+
"Microsoft.Azure.Management.Network.NetworkResourceProviderClient/2.0.0.0"
1111
]
1212
},
1313
"ResponseBody": "{\r\n \"available\": true\r\n}",
@@ -25,7 +25,7 @@
2525
"no-cache"
2626
],
2727
"x-ms-request-id": [
28-
"f0d19344-aec0-4d62-94e1-8b7b7d036635"
28+
"0aac8c2c-947f-4d67-86f4-493bc094f0ac"
2929
],
3030
"Strict-Transport-Security": [
3131
"max-age=31536000; includeSubDomains"
@@ -38,24 +38,24 @@
3838
"Microsoft-HTTPAPI/2.0"
3939
],
4040
"x-ms-ratelimit-remaining-subscription-reads": [
41-
"31994"
41+
"31961"
4242
],
4343
"x-ms-correlation-request-id": [
44-
"75790eb2-e237-4775-9edf-ea53fa08f0e8"
44+
"12a24d0f-40ba-44f9-9925-8fc45ecf0f12"
4545
],
4646
"x-ms-routing-request-id": [
47-
"WESTUS:20150417T054022Z:75790eb2-e237-4775-9edf-ea53fa08f0e8"
47+
"WESTUS:20150417T223259Z:12a24d0f-40ba-44f9-9925-8fc45ecf0f12"
4848
],
4949
"Date": [
50-
"Fri, 17 Apr 2015 05:40:22 GMT"
50+
"Fri, 17 Apr 2015 22:32:58 GMT"
5151
]
5252
},
5353
"StatusCode": 200
5454
}
5555
],
5656
"Names": {
5757
"Test-CheckDnsAvailability": [
58-
"onesdk9754"
58+
"onesdk2418"
5959
]
6060
},
6161
"Variables": {

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestCreateEmptyLoadBalancer.json

Lines changed: 165 additions & 165 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalDynamic.json

Lines changed: 354 additions & 299 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalStatic.json

Lines changed: 302 additions & 357 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalUsingId.json

Lines changed: 306 additions & 361 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublic.json

Lines changed: 429 additions & 426 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicNoInboundNATRule.json

Lines changed: 309 additions & 419 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicPublicNoLbRule.json

Lines changed: 327 additions & 323 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicUsingId.json

Lines changed: 306 additions & 416 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerChildResource.json

Lines changed: 1093 additions & 984 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerNicAssociation.json

Lines changed: 525 additions & 796 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerSet.json

Lines changed: 402 additions & 457 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkInterfaceTests/TestNetworkInterfaceCRUD.json

Lines changed: 322 additions & 322 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkInterfaceTests/TestNetworkInterfaceCRUDStaticAllocation.json

Lines changed: 372 additions & 317 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkInterfaceTests/TestNetworkInterfaceCRUDUsingId.json

Lines changed: 371 additions & 316 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkInterfaceTests/TestNetworkInterfaceNoPublicIpAddress.json

Lines changed: 324 additions & 269 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkInterfaceTests/TestNetworkInterfaceSet.json

Lines changed: 458 additions & 458 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkSecurityGroupTests/TestNetworkSecurityGroupCRUD.json

Lines changed: 546 additions & 381 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkSecurityGroupTests/TestNetworkSecurityGroupSecurityRuleCRUD.json

Lines changed: 491 additions & 381 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpAddressCRUD.json

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpAddressCRUDEditDomainNameLavel.json

Lines changed: 341 additions & 231 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpAddressCRUDNoDomainNameLabel.json

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpAddressCRUDReverseFqdn.json

Lines changed: 225 additions & 225 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpAddressCRUDStaticAllocation.json

Lines changed: 194 additions & 249 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkTests/TestVirtualNetworkCRUD.json

Lines changed: 240 additions & 185 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkTests/TestVirtualNetworkSubnetCRUD.json

Lines changed: 602 additions & 383 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Network" version="1.0.9-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Network" version="2.0.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@
7171
<Reference Include="Microsoft.Azure.Management.Authorization">
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Azure.Management.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.1.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
77+
<Private>True</Private>
7778
</Reference>
7879
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7980
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Network/Commands.Network/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Network" version="1.0.9-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="2.0.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎tools/LocalFeed/Microsoft.Azure.Management.Network.1.0.9-preview.nupkg

-211 KB
Binary file not shown.

‎tools/LocalFeed/Microsoft.Azure.Management.Network.2.0.0-preview.nupkg

200 KB
Binary file not shown.

0 commit comments

Comments
 (0)