Merge pull request Azure#5 from DeepakRajendranMsft/UpdateNetworkAndC…

…ompute update network powershell to new api version
dihan0604 · Mar 23, 2016 · 547e0d3 · 547e0d3
2 parents ab27ef2 + ed4a2d8
commit 547e0d3
Show file tree

Hide file tree

Showing 101 changed files with 4,681 additions and 4,678 deletions.
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
@@ -67,8 +67,9 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.3.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/....Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinux.json b/....Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinux.json
diff --git a/...ommands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindows.json b/...ommands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindows.json
diff --git a/...ure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinux.json b/...ure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinux.json
diff --git a/...e.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindows.json b/...e.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindows.json
diff --git a/...s.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionBasic.json b/...s.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionBasic.json
diff --git a/...s.DiagnosticsExtensionTests/TestDiagnosticsExtensionCantListSepcifyStorageAccountKey.json b/...s.DiagnosticsExtensionTests/TestDiagnosticsExtensionCantListSepcifyStorageAccountKey.json
diff --git a/...rioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSepcifyStorageAccountName.json b/...rioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSepcifyStorageAccountName.json
diff --git a/...st.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSupportJsonConfig.json b/...st.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSupportJsonConfig.json
diff --git a/...e.Commands.Compute.Test.ScenarioTests.DscExtensionTests/TestGetAzureRmVMDscExtension.json b/...e.Commands.Compute.Test.ScenarioTests.DscExtensionTests/TestGetAzureRmVMDscExtension.json
diff --git a/...narioTests.VirtualMachineBootDiagnosticsTests/TestLinuxVirtualMachineBootDiagnostics.json b/...narioTests.VirtualMachineBootDiagnosticsTests/TestLinuxVirtualMachineBootDiagnostics.json
diff --git a/...rioTests.VirtualMachineBootDiagnosticsTests/TestVirtualMachineBootDiagnosticsPremium.json b/...rioTests.VirtualMachineBootDiagnosticsTests/TestVirtualMachineBootDiagnosticsPremium.json
diff --git a/...cenarioTests.VirtualMachineBootDiagnosticsTests/TestVirtualMachineBootDiagnosticsSet.json b/...cenarioTests.VirtualMachineBootDiagnosticsTests/TestVirtualMachineBootDiagnosticsSet.json
diff --git a/...te.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineAccessExtension.json b/...te.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineAccessExtension.json
diff --git a/...te.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineBginfoExtension.json b/...te.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineBginfoExtension.json
diff --git a/...t.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineCustomScriptExtension.json b/...t.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineCustomScriptExtension.json
diff --git a/...rioTests.VirtualMachineExtensionTests/TestVirtualMachineCustomScriptExtensionFileUri.json b/...rioTests.VirtualMachineExtensionTests/TestVirtualMachineCustomScriptExtensionFileUri.json
diff --git a/....VirtualMachineExtensionTests/TestVirtualMachineCustomScriptExtensionSecureExecution.json b/....VirtualMachineExtensionTests/TestVirtualMachineCustomScriptExtensionSecureExecution.json
diff --git a/....Compute.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtension.json b/....Compute.Test.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtension.json
diff --git a/...ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtensionUsingHashTable.json b/...ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtensionUsingHashTable.json
diff --git a/...est.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtensionWithSwitch.json b/...est.ScenarioTests.VirtualMachineExtensionTests/TestVirtualMachineExtensionWithSwitch.json
diff --git a/...mpute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestAddNetworkInterface.json b/...mpute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestAddNetworkInterface.json
diff --git a/...narioTests.VirtualMachineNetworkInterfaceTests/TestSingleNetworkInterfaceDnsSettings.json b/...narioTests.VirtualMachineNetworkInterfaceTests/TestSingleNetworkInterfaceDnsSettings.json
diff --git a/...Tests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineMultipleNetworkInterface.json b/...Tests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineMultipleNetworkInterface.json
diff --git a/...ioTests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineSingleNetworkInterface.json b/...ioTests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineSingleNetworkInterface.json
diff --git a/...zure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestLinuxVirtualMachine.json b/...zure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestLinuxVirtualMachine.json
diff --git a/...oft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachine.json b/...oft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachine.json
diff --git a/...re.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineCapture.json b/...re.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineCapture.json
diff --git a/...e.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineDataDisk.json b/...e.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineDataDisk.json
diff --git a/...ds.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineDataDiskNegative.json b/...ds.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineDataDiskNegative.json
diff --git a/...ands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineListWithPaging.json b/...ands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineListWithPaging.json
diff --git a/...zure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePIRv2.json b/...zure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePIRv2.json
diff --git a/...ure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePiping.json b/...ure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePiping.json
diff --git a/...Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePlan.json b/...Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePlan.json
diff --git a/...zure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePlan2.json b/...zure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachinePlan2.json
diff --git a/...e.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineRedeploy.json b/...e.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineRedeploy.json
diff --git a/...mmands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineSizeAndUsage.json b/...mmands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineSizeAndUsage.json
diff --git a/...Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineTags.json b/...Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineTags.json
diff --git a/...e.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithBYOL.json b/...e.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithBYOL.json
diff --git a/...est.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithDifferentStorageResource.json b/...est.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithDifferentStorageResource.json
diff --git a/...mmands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithEmptyAuc.json b/...mmands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithEmptyAuc.json
diff --git a/...mpute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithVMAgentAutoUpdate.json b/...mpute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineWithVMAgentAutoUpdate.json
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/packages.config b/src/ResourceManager/Compute/Commands.Compute.Test/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Compute" version="12.0.1-prerelease" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Network" version="3.3.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Network" version="4.1.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.0-preview" targetFramework="net45" />
@@ -28,4 +28,4 @@
   <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
   <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
   <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
+</packages>
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
@@ -80,8 +80,9 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.3.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage">

diff --git a/src/ResourceManager/Compute/Commands.Compute/packages.config b/src/ResourceManager/Compute/Commands.Compute/packages.config
@@ -3,14 +3,13 @@
   <package id="AutoMapper" version="3.1.1" targetFramework="net45" />
   <package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
-
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Compute" version="12.0.1-prerelease" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Network" version="3.3.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Network" version="4.1.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

diff --git a/src/ResourceManager/Network/AzureRM.Network.psd1 b/src/ResourceManager/Network/AzureRM.Network.psd1
@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '1.0.5' 
+ModuleVersion = '1.0.6' 
 
 # ID used to uniquely identify this module
 GUID = 'eb75c732-e274-4a20-b502-e9958e63484a'

diff --git a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj
@@ -63,8 +63,9 @@
     <Reference Include="Microsoft.Azure.Management.Authorization">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.3.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager">

diff --git a/...mmands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUD.json b/...mmands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUD.json
diff --git a/...Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitAuthorizationCRUD.json b/...Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitAuthorizationCRUD.json
diff --git a/...ands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitCRUD.json b/...ands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitCRUD.json
diff --git a/...t.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitMicrosoftPeeringCRUD.json b/...t.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitMicrosoftPeeringCRUD.json
diff --git a/...enarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitPrivatePublicPeeringCRUD.json b/...enarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitPrivatePublicPeeringCRUD.json
diff --git a/...t.ScenarioTests.ExpressRouteServiceProviderTests/TestExpressRouteServiceProviderList.json b/...t.ScenarioTests.ExpressRouteServiceProviderTests/TestExpressRouteServiceProviderList.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/expressRouteServiceProviders?api-version=2015-06-15",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9leHByZXNzUm91dGVTZXJ2aWNlUHJvdmlkZXJzP2FwaS12ZXJzaW9uPTIwMTUtMDYtMTU=",
+      "RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/expressRouteServiceProviders?api-version=2016-03-30",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9leHByZXNzUm91dGVTZXJ2aWNlUHJvdmlkZXJzP2FwaS12ZXJzaW9uPTIwMTYtMDMtMzA=",
       "RequestMethod": "GET",
       "RequestBody": "",
       "RequestHeaders": {
@@ -63,4 +63,4 @@
   "Variables": {
     "SubscriptionId": "9532a63e-f2eb-4649-bb23-5ed01077ce80"
   }
-}
+}
diff --git a/...ds/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestCreateEmptyLoadBalancer.json b/...ds/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestCreateEmptyLoadBalancer.json
diff --git a/...nds.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalDynamic.json b/...nds.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalDynamic.json
diff --git a/...ands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalStatic.json b/...ands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalStatic.json
diff --git a/...nds.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalUsingId.json b/...nds.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalUsingId.json
diff --git a/...rds/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublic.json b/...rds/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublic.json
diff --git a/...work.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicNoInboundNATRule.json b/...work.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicNoInboundNATRule.json
diff --git a/...etwork.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicPublicNoLbRule.json b/...etwork.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicPublicNoLbRule.json
diff --git a/...mands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicUsingId.json b/...mands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDPublicUsingId.json
diff --git a/.../Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerChildResource.json b/.../Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerChildResource.json