Skip to content

Added new Set-AzureDedicatedCircuitProperties commandlet and removed SetDedicatedCircuitBandwidth #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Added new Set-AzureDedicatedCircuitProperties commandlet and removed SetDedicatedCircuitBandwidth #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
14 changes: 8 additions & 6 deletions ...dths/SetAzureDedicatedCircuitBandwidth.cs → ...ies/SetAzureDedicatedCircuitProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand All @@ -45,7 +47,7 @@ public override void ExecuteCmdlet()
ServiceKey,
() =>
{
var circuit = ExpressRouteClient.SetAzureDedicatedCircuitBandwidth(ServiceKey, Bandwidth);
var circuit = ExpressRouteClient.SetAzureDedicatedCircuitProperties(ServiceKey, Bandwidth, Sku);

WriteObject(circuit);

Expand Down
5 changes: 4 additions & 1 deletion ...nagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuits/NewAzureDedicatedCircuit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -50,7 +53,7 @@ public override void ExecuteCmdlet()
() =>
{
var circuit = ExpressRouteClient.NewAzureDedicatedCircuit(CircuitName, Bandwidth, Location,
ServiceProviderName);
ServiceProviderName, Sku);
WriteVerboseWithTimestamp(Resources.NewAzureDedicatedCircuitSucceeded);
WriteObject(circuit);
});
Expand Down
22 changes: 16 additions & 6 deletions src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" 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>
3 changes: 2 additions & 1 deletion src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.2.1\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>
Expand Down Expand Up @@ -316,6 +316,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>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Services/Commands.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="9.2.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="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" />
Expand Down