Skip to content

Commit 1549b8e

Browse files
ogailogail
committed
Merge pull request #162 from kagamsft/dev
Application Gateway command-lets
2 parents c415006 + bfbe272 commit 1549b8e

File tree

54 files changed

+4524
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+4524
-21
lines changed

‎setup/azurecmdfiles.wxi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,9 @@
845845
<Component Id="cmp54514D36BA8821CF1149D4647C9F34BA" Guid="*">
846846
<File Id="fil133B69D4144D718FE7E559FF1AA9673B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.Network.dll" />
847847
</Component>
848+
<Component Id="cmp40C5FD8B583CA05AA7EC5F1FCF0E3E92" Guid="*">
849+
<File Id="fil813CB6FE82DAC50B66F7775533F7CB99" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.Network.dll-help.xml" />
850+
</Component>
848851
<Component Id="cmp92D521CCBFF0A4064A70115D4DBE13C4" Guid="*">
849852
<File Id="filF6C9F9970C59B38828F1E813670BCB7F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.Network.format.ps1xml" />
850853
</Component>
@@ -1411,6 +1414,9 @@
14111414
<Component Id="cmp58A842A5ABBE9598F160B1A7783AC260" Guid="*">
14121415
<File Id="fil1F921EEB0D64502700FB274014AFE039" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Network\Microsoft.Azure.Commands.Network.dll" />
14131416
</Component>
1417+
<Component Id="cmp8183D799D86557ABFB78C065A50D9FD0" Guid="*">
1418+
<File Id="fil01BC0341E1321B5BA0FAEB442B5F654C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Network\Microsoft.Azure.Commands.Network.dll-help.xml" />
1419+
</Component>
14141420
<Component Id="cmpFDA1F5A25A639A882EB28E3221AD7DE9" Guid="*">
14151421
<File Id="filD00F4DBD80CA97D9AEA81F8E8D382906" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Network\Microsoft.Azure.Commands.Network.format.ps1xml" />
14161422
</Component>
@@ -2723,6 +2729,7 @@
27232729
<ComponentRef Id="cmpC6750DE6908003A036E7C24FF3978D57" />
27242730
<ComponentRef Id="cmp40C1DC009EF95E711F9B291AC3B7156A" />
27252731
<ComponentRef Id="cmp54514D36BA8821CF1149D4647C9F34BA" />
2732+
<ComponentRef Id="cmp40C5FD8B583CA05AA7EC5F1FCF0E3E92" />
27262733
<ComponentRef Id="cmp92D521CCBFF0A4064A70115D4DBE13C4" />
27272734
<ComponentRef Id="cmp9DBA37B38077942A2856B006B0D29A0A" />
27282735
<ComponentRef Id="cmp0C0FC77DAEF2A45138590D65DCDD21B8" />
@@ -2909,6 +2916,7 @@
29092916
<ComponentRef Id="cmp3ECF10DC0D89D53F9C58C6794E6EABE8" />
29102917
<ComponentRef Id="cmpE289BCE74F52452A2522D76B6503B3BC" />
29112918
<ComponentRef Id="cmp58A842A5ABBE9598F160B1A7783AC260" />
2919+
<ComponentRef Id="cmp8183D799D86557ABFB78C065A50D9FD0" />
29122920
<ComponentRef Id="cmpFDA1F5A25A639A882EB28E3221AD7DE9" />
29132921
<ComponentRef Id="cmp8450A5374E428359E5093D5FE7CC360F" />
29142922
<ComponentRef Id="cmp55E09008CE2E015C4494C6502B515922" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</Reference>
117117
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118118
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
119+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
120120
</Reference>
121121
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122122
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="9.0.0" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.0.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.1" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
110110
</Reference>
111111
<Reference Include="Microsoft.WindowsAzure.Management.Network">
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
112+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
115115
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="9.0.0" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.0.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.1" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
2222
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</Reference>
119119
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
120120
<SpecificVersion>False</SpecificVersion>
121-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
121+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
122122
</Reference>
123123
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124124
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="9.0.0" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.0.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.1" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
9696
</Reference>
9797
<Reference Include="Microsoft.WindowsAzure.Management.Network">
98-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
98+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
9999
</Reference>
100100
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
101101
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.0.0" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.1" targetFramework="net45" />
2020
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2121
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2222
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

‎src/ServiceManagement/Network/Commands.Network/ApplicationGateway/AddApplicationGatewaySslCertificate.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
16+
using System.Collections.Generic;
17+
using System.Management.Automation;
18+
using Microsoft.Azure.Commands.Network.Properties;
19+
using Microsoft.WindowsAzure.Management.Network.Models;
20+
21+
namespace Microsoft.Azure.Commands.Network.ApplicationGateway
22+
{
23+
[Cmdlet(VerbsCommon.Add, "AzureApplicationGatewaySslCertificate"), OutputType(typeof(ApplicationGatewayOperationResponse))]
24+
public class AddApplicationGatewayCertificateCommand : NetworkCmdletBase
25+
{
26+
[Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true,
27+
HelpMessage = "Application Gateway Name representing the Application Gateway")]
28+
[ValidateNotNullOrEmpty]
29+
public string Name { get; set; }
30+
31+
[Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true,
32+
HelpMessage = "Certificate Name")]
33+
[ValidateNotNullOrEmpty]
34+
public string CertificateName { get; set; }
35+
36+
[Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true,
37+
HelpMessage = "Certificate Password")]
38+
[ValidateNotNullOrEmpty]
39+
public string Password { get; set; }
40+
41+
[Parameter(Position = 3, Mandatory = true, ValueFromPipelineByPropertyName = true,
42+
HelpMessage = "Path of Certificate File")]
43+
[ValidateNotNullOrEmpty]
44+
public string CertificateFile { get; set; }
45+
public override void ExecuteCmdlet()
46+
{
47+
WriteVerboseWithTimestamp(string.Format(Resources.AddAzureApplicationGatewaySslCertificateBeginOperation, CommandRuntime.ToString()));
48+
var responseObject = Client.AddApplicationGatewayCertificate(Name, CertificateName, Password, CertificateFile);
49+
WriteVerboseWithTimestamp(string.Format(Resources.AddAzureApplicationGatewaySslCertificateCompletedOperation, CommandRuntime.ToString()));
50+
51+
WriteObject(responseObject);
52+
}
53+
}
54+
}

0 commit comments

Comments
 (0)