Added new Set-AzureDedicatedCircuitProperties commandlet and removed Set-AzureDedicatedCircuitBandwidth

brooklyngw · vvvarunv · commit aaf4888af62d · 2015-04-23T12:17:07.000-07:00
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj
@@ -81,9 +81,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.2-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.3-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -135,7 +134,7 @@
     <Compile Include="DedicatedCircuits\GetAzureDedicatedCircuit.cs" />
     <Compile Include="DedicatedCircuits\NewAzureDedicatedCircuit.cs" />
     <Compile Include="DedicatedCircuits\RemoveAzureDedicatedCircuit.cs" />
-    <Compile Include="DedicatedCircuitBandwidths\SetAzureDedicatedCircuitBandwidth.cs" />
+    <Compile Include="DedicatedCircuitProperties\SetAzureDedicatedCircuitProperties.cs" />
     <Compile Include="ExpressRouteBaseCmdlet.cs" />
     <Compile Include="ExpressRouteClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitProperties/SetAzureDedicatedCircuitProperties.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitProperties/SetAzureDedicatedCircuitProperties.cs
@@ -20,18 +20,20 @@ namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
     using Management.ExpressRoute.Models;
 
-    [Cmdlet(VerbsCommon.Set, "AzureDedicatedCircuitBandwidth"), OutputType(typeof(AzureDedicatedCircuit))]
-    public class SetAzureDedicatedCircuitBandwidthCommand : ExpressRouteBaseCmdlet
+    [Cmdlet(VerbsCommon.Set, "AzureDedicatedCircuitProperties"), OutputType(typeof(AzureDedicatedCircuit))]
+    public class SetAzureDedicatedCircuitPropertiesCommand : ExpressRouteBaseCmdlet
     {
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Service Key of Azure Dedicated Circuit to be removed")]
         [ValidateGuid]
         [ValidateNotNullOrEmpty]
         public string ServiceKey { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Bandwidth")]
-        [ValidateNotNullOrEmpty]
-        public UInt32 Bandwidth { get; set; }
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Bandwidth")]
+        public UInt32? Bandwidth { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Sku")]
+        public CircuitSku? Sku { get; set; }
 
         [Parameter(HelpMessage = "Do not confirm Azure Dedicated Circuit Update")]
         public SwitchParameter Force { get; set; }
@@ -45,7 +47,7 @@ public override void ExecuteCmdlet()
                 ServiceKey,
                 () =>
                 {
-                    var circuit = ExpressRouteClient.SetAzureDedicatedCircuitBandwidth(ServiceKey, Bandwidth);
+                    var circuit = ExpressRouteClient.SetAzureDedicatedCircuitProperties(ServiceKey, Bandwidth, Sku);
                     
                     WriteObject(circuit);
                     
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuits/NewAzureDedicatedCircuit.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuits/NewAzureDedicatedCircuit.cs
@@ -37,6 +37,9 @@ public class NewAzureDedicatedCircuitCommand : ExpressRouteBaseCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Service Provider Name")]
         public string ServiceProviderName { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Sku")]
+        public CircuitSku Sku { get; set; }
+
         [Parameter(HelpMessage = "Do not confirm Azure Dedicated Circuit creation")]
         public SwitchParameter Force { get; set; }
 
@@ -50,7 +53,7 @@ public override void ExecuteCmdlet()
                () =>
                {
                    var circuit = ExpressRouteClient.NewAzureDedicatedCircuit(CircuitName, Bandwidth, Location,
-               ServiceProviderName);
+               ServiceProviderName, Sku);
                    WriteVerboseWithTimestamp(Resources.NewAzureDedicatedCircuitSucceeded);
                    WriteObject(circuit);
                });
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs
@@ -115,14 +115,15 @@ public AzureDedicatedCircuit GetAzureDedicatedCircuit(string serviceKey)
         }
 
         public AzureDedicatedCircuit NewAzureDedicatedCircuit(string circuitName, 
-            UInt32 bandwidth, string location, string serviceProviderName)
+            UInt32 bandwidth, string location, string serviceProviderName, CircuitSku sku)
         {
             var result = Client.DedicatedCircuits.New(new DedicatedCircuitNewParameters()
             {
                 Bandwidth = bandwidth,
                 CircuitName = circuitName,
                 Location = location,
-                ServiceProviderName = serviceProviderName
+                ServiceProviderName = serviceProviderName,
+                Sku = sku
             });
 
             if (result.HttpStatusCode.Equals(HttpStatusCode.OK))
@@ -140,12 +141,21 @@ public IEnumerable<AzureDedicatedCircuit> ListAzureDedicatedCircuit()
             return (Client.DedicatedCircuits.List().DedicatedCircuits);
         }
 
-        public AzureDedicatedCircuit SetAzureDedicatedCircuitBandwidth(string serviceKey, UInt32 bandwidth)
+        public AzureDedicatedCircuit SetAzureDedicatedCircuitProperties(string serviceKey, UInt32? bandwidth, CircuitSku? sku)
         {
-            var result = Client.DedicatedCircuits.Update(serviceKey, (new DedicatedCircuitUpdateParameters()
+            var updateParams = new DedicatedCircuitUpdateParameters() {};
+
+            if (bandwidth.HasValue)
+            {
+                updateParams.Bandwidth = bandwidth.Value.ToString();
+            }
+
+            if (sku.HasValue)
             {
-                Bandwidth = bandwidth
-            }));
+                updateParams.Sku = sku.Value.ToString();
+            }
+
+            var result = Client.DedicatedCircuits.Update(serviceKey, updateParams);
 
             if (result.HttpStatusCode.Equals(HttpStatusCode.OK))
             {
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config
@@ -11,6 +11,6 @@
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.2-preview" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.3-preview" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
 </packages>
diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj
@@ -119,7 +119,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute">
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.2-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.3-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.MediaServices">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.MediaServices.4.0.0\lib\net40\Microsoft.WindowsAzure.Management.MediaServices.dll</HintPath>
@@ -318,6 +318,7 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="app.config" />
     <None Include="MSSharedLibKey.snk" />
     <Content Include="Resources\MyWebTemplateFolder\web.cloud.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ServiceManagement/Services/Commands.Test/packages.config b/src/ServiceManagement/Services/Commands.Test/packages.config
@@ -18,7 +18,7 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.2-preview" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.3-preview" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.MediaServices" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.ServiceBus" version="0.17.0-preview" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -115,14 +115,15 @@ public AzureDedicatedCircuit GetAzureDedicatedCircuit(string serviceKey)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public AzureDedicatedCircuit NewAzureDedicatedCircuit(string circuitName,`
`118`		`- UInt32 bandwidth, string location, string serviceProviderName)`
	`118`	`+ UInt32 bandwidth, string location, string serviceProviderName, CircuitSku sku)`
`119`	`119`	`{`
`120`	`120`	`var result = Client.DedicatedCircuits.New(new DedicatedCircuitNewParameters()`
`121`	`121`	`{`
`122`	`122`	`Bandwidth = bandwidth,`
`123`	`123`	`CircuitName = circuitName,`
`124`	`124`	`Location = location,`
`125`		`- ServiceProviderName = serviceProviderName`
	`125`	`+ ServiceProviderName = serviceProviderName,`
	`126`	`+ Sku = sku`
`126`	`127`	`});`
`127`	`128`
`128`	`129`	`if (result.HttpStatusCode.Equals(HttpStatusCode.OK))`
`@@ -140,12 +141,21 @@ public IEnumerable<AzureDedicatedCircuit> ListAzureDedicatedCircuit()`
`140`	`141`	`return (Client.DedicatedCircuits.List().DedicatedCircuits);`
`141`	`142`	`}`
`142`	`143`
`143`		`- public AzureDedicatedCircuit SetAzureDedicatedCircuitBandwidth(string serviceKey, UInt32 bandwidth)`
	`144`	`+ public AzureDedicatedCircuit SetAzureDedicatedCircuitProperties(string serviceKey, UInt32? bandwidth, CircuitSku? sku)`
`144`	`145`	`{`
`145`		`- var result = Client.DedicatedCircuits.Update(serviceKey, (new DedicatedCircuitUpdateParameters()`
	`146`	`+ var updateParams = new DedicatedCircuitUpdateParameters() {};`
	`147`	`+`
	`148`	`+ if (bandwidth.HasValue)`
	`149`	`+ {`
	`150`	`+ updateParams.Bandwidth = bandwidth.Value.ToString();`
	`151`	`+ }`
	`152`	`+`
	`153`	`+ if (sku.HasValue)`
`146`	`154`	`{`
`147`		`- Bandwidth = bandwidth`
`148`		`- }));`
	`155`	`+ updateParams.Sku = sku.Value.ToString();`
	`156`	`+ }`
	`157`	`+`
	`158`	`+ var result = Client.DedicatedCircuits.Update(serviceKey, updateParams);`
`149`	`159`
`150`	`160`	`if (result.HttpStatusCode.Equals(HttpStatusCode.OK))`
`151`	`161`	`{`