Skip to content

Commit 256ce3a

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#157 from vvvarunv/ignite
Added new Set-AzureDedicatedCircuitProperties commandlet and removed Set-AzureDedicatedCircuitBandwidth
2 parents f86f676 + c5855ea commit 256ce3a

File tree

7 files changed

+34
-20
lines changed

7 files changed

+34
-20
lines changed

‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@
8282
<SpecificVersion>False</SpecificVersion>
8383
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8484
</Reference>
85-
<Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.2-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
85+
<Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute">
86+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.3-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
8887
</Reference>
8988
<Reference Include="Newtonsoft.Json">
9089
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -136,7 +135,7 @@
136135
<Compile Include="DedicatedCircuits\GetAzureDedicatedCircuit.cs" />
137136
<Compile Include="DedicatedCircuits\NewAzureDedicatedCircuit.cs" />
138137
<Compile Include="DedicatedCircuits\RemoveAzureDedicatedCircuit.cs" />
139-
<Compile Include="DedicatedCircuitBandwidths\SetAzureDedicatedCircuitBandwidth.cs" />
138+
<Compile Include="DedicatedCircuitProperties\SetAzureDedicatedCircuitProperties.cs" />
140139
<Compile Include="ExpressRouteBaseCmdlet.cs" />
141140
<Compile Include="ExpressRouteClient.cs" />
142141
<Compile Include="Properties\AssemblyInfo.cs" />

‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitBandwidths/SetAzureDedicatedCircuitBandwidth.cs renamed to ‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitProperties/SetAzureDedicatedCircuitProperties.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,20 @@ namespace Microsoft.WindowsAzure.Commands.ExpressRoute
2020
{
2121
using Management.ExpressRoute.Models;
2222

23-
[Cmdlet(VerbsCommon.Set, "AzureDedicatedCircuitBandwidth"), OutputType(typeof(AzureDedicatedCircuit))]
24-
public class SetAzureDedicatedCircuitBandwidthCommand : ExpressRouteBaseCmdlet
23+
[Cmdlet(VerbsCommon.Set, "AzureDedicatedCircuitProperties"), OutputType(typeof(AzureDedicatedCircuit))]
24+
public class SetAzureDedicatedCircuitPropertiesCommand : ExpressRouteBaseCmdlet
2525
{
2626
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
2727
HelpMessage = "Service Key of Azure Dedicated Circuit to be removed")]
2828
[ValidateGuid]
2929
[ValidateNotNullOrEmpty]
3030
public string ServiceKey { get; set; }
3131

32-
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Bandwidth")]
33-
[ValidateNotNullOrEmpty]
34-
public UInt32 Bandwidth { get; set; }
32+
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Bandwidth")]
33+
public UInt32? Bandwidth { get; set; }
34+
35+
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Sku")]
36+
public CircuitSku? Sku { get; set; }
3537

3638
[Parameter(HelpMessage = "Do not confirm Azure Dedicated Circuit Update")]
3739
public SwitchParameter Force { get; set; }
@@ -45,7 +47,7 @@ public override void ExecuteCmdlet()
4547
ServiceKey,
4648
() =>
4749
{
48-
var circuit = ExpressRouteClient.SetAzureDedicatedCircuitBandwidth(ServiceKey, Bandwidth);
50+
var circuit = ExpressRouteClient.SetAzureDedicatedCircuitProperties(ServiceKey, Bandwidth, Sku);
4951

5052
WriteObject(circuit);
5153

‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuits/NewAzureDedicatedCircuit.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public class NewAzureDedicatedCircuitCommand : ExpressRouteBaseCmdlet
3737
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Service Provider Name")]
3838
public string ServiceProviderName { get; set; }
3939

40+
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Circuit Sku")]
41+
public CircuitSku Sku { get; set; }
42+
4043
[Parameter(HelpMessage = "Do not confirm Azure Dedicated Circuit creation")]
4144
public SwitchParameter Force { get; set; }
4245

@@ -50,7 +53,7 @@ public override void ExecuteCmdlet()
5053
() =>
5154
{
5255
var circuit = ExpressRouteClient.NewAzureDedicatedCircuit(CircuitName, Bandwidth, Location,
53-
ServiceProviderName);
56+
ServiceProviderName, Sku);
5457
WriteVerboseWithTimestamp(Resources.NewAzureDedicatedCircuitSucceeded);
5558
WriteObject(circuit);
5659
});

‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,15 @@ public AzureDedicatedCircuit GetAzureDedicatedCircuit(string serviceKey)
115115
}
116116

117117
public AzureDedicatedCircuit NewAzureDedicatedCircuit(string circuitName,
118-
UInt32 bandwidth, string location, string serviceProviderName)
118+
UInt32 bandwidth, string location, string serviceProviderName, CircuitSku sku)
119119
{
120120
var result = Client.DedicatedCircuits.New(new DedicatedCircuitNewParameters()
121121
{
122122
Bandwidth = bandwidth,
123123
CircuitName = circuitName,
124124
Location = location,
125-
ServiceProviderName = serviceProviderName
125+
ServiceProviderName = serviceProviderName,
126+
Sku = sku
126127
});
127128

128129
if (result.HttpStatusCode.Equals(HttpStatusCode.OK))
@@ -140,12 +141,21 @@ public IEnumerable<AzureDedicatedCircuit> ListAzureDedicatedCircuit()
140141
return (Client.DedicatedCircuits.List().DedicatedCircuits);
141142
}
142143

143-
public AzureDedicatedCircuit SetAzureDedicatedCircuitBandwidth(string serviceKey, UInt32 bandwidth)
144+
public AzureDedicatedCircuit SetAzureDedicatedCircuitProperties(string serviceKey, UInt32? bandwidth, CircuitSku? sku)
144145
{
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)
146154
{
147-
Bandwidth = bandwidth
148-
}));
155+
updateParams.Sku = sku.Value.ToString();
156+
}
157+
158+
var result = Client.DedicatedCircuits.Update(serviceKey, updateParams);
149159

150160
if (result.HttpStatusCode.Equals(HttpStatusCode.OK))
151161
{

‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1212
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
14-
<package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.2-preview" targetFramework="net45" />
14+
<package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.3-preview" targetFramework="net45" />
1515
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1616
</packages>

‎src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
121121
</Reference>
122122
<Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute">
123-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.2-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
123+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.3-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
124124
</Reference>
125125
<Reference Include="Microsoft.WindowsAzure.Management.MediaServices">
126126
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.MediaServices.4.0.0\lib\net40\Microsoft.WindowsAzure.Management.MediaServices.dll</HintPath>

‎src/ServiceManagement/Services/Commands.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.2-preview" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.3-preview" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.MediaServices" version="4.0.0" targetFramework="net45" />
2323
<package id="Microsoft.WindowsAzure.Management.ServiceBus" version="0.17.0-preview" targetFramework="net45" />
2424
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />

0 commit comments

Comments
 (0)