Skip to content

Commit eaa6b13

Browse files
huangpfhuangpf
committed
Merge pull request #46 from Azure/dev
.
2 parents b255e1b + 1719993 commit eaa6b13

File tree

41 files changed

+22553
-46
lines changed

Some content is hidden

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

41 files changed

+22553
-46
lines changed

‎ChangeLog.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
2015.07.10 version 1.0.0
1+
2015.07.16 version 0.9.5
2+
*Azure Network cmdlets
3+
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
4+
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
5+
6+
2015.07.10 version 1.0.0
27
* Azure Backup cmdlets
38
*Added New-AzureBackupVault cmdlets
49
*Added Get-AzureBackupVault cmdlets

‎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=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
118118
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
119+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
120120
</Reference>
121121
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
122122
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎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.1.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.2.0-preview" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.3" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" 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
@@ -110,7 +110,7 @@
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.WindowsAzure.Management.Network">
113-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
113+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
114114
</Reference>
115115
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
116116
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\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.1.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.2.0-preview" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.3" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" 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=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
120120
<SpecificVersion>False</SpecificVersion>
121-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
121+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
122122
</Reference>
123123
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
124124
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/AddAzureVirtualIP.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Network
2424
[Cmdlet(VerbsCommon.Add, "AzureVirtualIP"), OutputType(typeof(ManagementOperationContext))]
2525
public class AddAzureVirtualIP : ServiceManagementBaseCmdlet
2626
{
27+
public AddAzureVirtualIP()
28+
{
29+
}
30+
31+
public AddAzureVirtualIP(IClientProvider provider) : base(provider)
32+
{
33+
}
34+
2735
[Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = false)]
2836
[ValidateNotNullOrEmpty]
2937
public string ServiceName { get; set; }

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/NewAzureReservedIP.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,17 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
2626
[Cmdlet(VerbsCommon.New, ReservedIPConstants.CmdletNoun, DefaultParameterSetName = ReserveNewIPParamSet), OutputType(typeof(ManagementOperationContext))]
2727
public class NewAzureReservedIPCmdlet : ServiceManagementBaseCmdlet
2828
{
29-
protected const string ReserveNewIPParamSet = "CreateNewReservedIP";
30-
protected const string ReserveInUseIPUsingSlotParamSet = "CreateInUseReservedIPUsingSlot";
31-
protected const string ReserveInUseIPParamSet = "CreateInUseReservedIP";
29+
public const string ReserveNewIPParamSet = "CreateNewReservedIP";
30+
public const string ReserveInUseIPUsingSlotParamSet = "CreateInUseReservedIPUsingSlot";
31+
public const string ReserveInUseIPParamSet = "CreateInUseReservedIP";
32+
33+
public NewAzureReservedIPCmdlet()
34+
{
35+
}
36+
37+
public NewAzureReservedIPCmdlet(IClientProvider provider) : base(provider)
38+
{
39+
}
3240

3341
[Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = ReserveNewIPParamSet, HelpMessage = "Reserved IP Name.")]
3442
[Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = ReserveInUseIPUsingSlotParamSet, HelpMessage = "Reserved IP Name.")]
@@ -85,7 +93,7 @@ public string Slot
8593
set;
8694
}
8795

88-
protected override void OnProcessRecord()
96+
public override void ExecuteCmdlet()
8997
{
9098
ServiceManagementProfile.Initialize();
9199
string deploymentName = string.Empty;

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/RemoveAzureReservedIP.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
2323
[Cmdlet(VerbsCommon.Remove, ReservedIPConstants.CmdletNoun, DefaultParameterSetName = RemoveReservedIPParamSet), OutputType(typeof(ManagementOperationContext))]
2424
public class RemoveAzureReservedIPCmdlet : ServiceManagementBaseCmdlet
2525
{
26+
public RemoveAzureReservedIPCmdlet()
27+
{
28+
}
29+
30+
public RemoveAzureReservedIPCmdlet(IClientProvider provider)
31+
: base(provider)
32+
{
33+
}
34+
2635
protected const string RemoveReservedIPParamSet = "RemoveReservedIP";
2736

2837
[Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, HelpMessage = "Reserved IP Name.")]
@@ -32,7 +41,7 @@ public class RemoveAzureReservedIPCmdlet : ServiceManagementBaseCmdlet
3241
[Parameter(Position = 1, HelpMessage = "Do not confirm deletion of deployment")]
3342
public SwitchParameter Force { get; set; }
3443

35-
protected override void OnProcessRecord()
44+
public override void ExecuteCmdlet()
3645
{
3746
ServiceManagementProfile.Initialize();
3847

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/RemoveAzureVirtualIP.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
2323
[Cmdlet(VerbsCommon.Remove, "AzureVirtualIP"), OutputType(typeof(ManagementOperationContext))]
2424
public class RemoveAzureVirtualIP : ServiceManagementBaseCmdlet
2525
{
26+
public RemoveAzureVirtualIP()
27+
{
28+
}
29+
30+
public RemoveAzureVirtualIP(IClientProvider provider) : base(provider)
31+
{
32+
}
33+
2634
[Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = false)]
2735
[ValidateNotNullOrEmpty]
2836
public string ServiceName { get; set; }

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/SetAzureReservedIPAssociation.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
2626
[Cmdlet(VerbsCommon.Set, ReservedIPConstants.AssociationCmdletNoun), OutputType(typeof(ManagementOperationContext))]
2727
public class SetAzureReservedIPAssociationCmdlet : ServiceManagementBaseCmdlet
2828
{
29+
public SetAzureReservedIPAssociationCmdlet()
30+
{
31+
}
32+
33+
public SetAzureReservedIPAssociationCmdlet(IClientProvider provider)
34+
: base(provider)
35+
{
36+
}
37+
2938
[Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, HelpMessage = "Reserved IP Name.")]
3039
[ValidateNotNullOrEmpty]
3140
public string ReservedIPName
@@ -58,7 +67,7 @@ public string Slot
5867
set;
5968
}
6069

61-
protected override void OnProcessRecord()
70+
public override void ExecuteCmdlet()
6271
{
6372
ServiceManagementProfile.Initialize();
6473

‎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.1.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.2.0-preview" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.3" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" 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.ServiceManagement.Network.Test.csproj

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,11 @@
9999
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
100100
</Reference>
101101
<Reference Include="Microsoft.WindowsAzure.Management.Network">
102+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
103+
</Reference>
104+
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102105
<SpecificVersion>False</SpecificVersion>
103-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
106+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
104107
</Reference>
105108
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
106109
<SpecificVersion>False</SpecificVersion>
@@ -145,10 +148,12 @@
145148
<ItemGroup>
146149
<Compile Include="IPForwarding\GetIPForwardingTests.cs" />
147150
<Compile Include="IPForwarding\SetIPForwardingTests.cs" />
151+
<Compile Include="Multivip\MultivipTests.cs" />
148152
<Compile Include="NetworkSecurityGroups\GetNetworkSecurityGroupAssociationTests.cs" />
149153
<Compile Include="NetworkSecurityGroups\RemoveNetworkSecurityGroupAssociationTests.cs" />
150154
<Compile Include="NetworkSecurityGroups\SetNetworkSecurityGroupAssociationTests.cs" />
151155
<Compile Include="Properties\AssemblyInfo.cs" />
156+
<Compile Include="ReservedIP\ReservedIPTest.cs" />
152157
<Compile Include="Routes\GetEffectiveRouteTests.cs" />
153158
<Compile Include="Routes\GetRouteTableTests.cs" />
154159
<Compile Include="Routes\GetSubnetRouteTableTests.cs" />
@@ -159,16 +164,22 @@
159164
<Compile Include="Routes\SetRouteTests.cs" />
160165
<Compile Include="Routes\SetSubnetRouteTableTests.cs" />
161166
<Compile Include="ScenarioTests\IPForwarding\IPForwardingScenarioTests.cs" />
167+
<Compile Include="ScenarioTests\MultiVip\MultiVip.cs" />
162168
<Compile Include="ScenarioTests\NetworkSecurityGroup\NSGScenarioTests.cs" />
163169
<Compile Include="ScenarioTests\NetworkTests.cs" />
164170
<Compile Include="ScenarioTests\NetworkTestsBase.cs" />
171+
<Compile Include="ScenarioTests\ReservedIPs\ReservedIP.cs" />
172+
<Compile Include="TestInterfaces\TestClientProvider.cs" />
165173
</ItemGroup>
166174
<ItemGroup>
167175
<None Include="MSSharedLibKey.snk" />
168176
<None Include="packages.config" />
169177
<None Include="ScenarioTests\IPForwarding\IPForwardingTests.ps1">
170178
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
171179
</None>
180+
<None Include="ScenarioTests\MultiVip\MultiVipTests.ps1">
181+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
182+
</None>
172183
<None Include="ScenarioTests\NetworkSecurityGroup\Common.ps1">
173184
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
174185
</None>
@@ -187,6 +198,10 @@
187198
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
188199
<Name>Commands.Common</Name>
189200
</ProjectReference>
201+
<ProjectReference Include="..\..\..\Common\Commands.Profile\Commands.Profile.csproj">
202+
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
203+
<Name>Commands.Profile</Name>
204+
</ProjectReference>
190205
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
191206
<Project>{C1BDA476-A5CC-4394-914D-48B0EC31A710}</Project>
192207
<Name>Commands.ScenarioTests.Common</Name>
@@ -203,12 +218,31 @@
203218
<Project>{E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}</Project>
204219
<Name>Commands.ServiceManagement</Name>
205220
</ProjectReference>
221+
<ProjectReference Include="..\..\Services\Commands.Utilities\Commands.Utilities.csproj">
222+
<Project>{4900ec4e-8deb-4412-9108-0bc52f81d457}</Project>
223+
<Name>Commands.Utilities</Name>
224+
</ProjectReference>
206225
<ProjectReference Include="..\Commands.Network\Commands.ServiceManagement.Network.csproj">
207226
<Project>{40fee0bb-fd45-4efc-85bc-0d602a6892c4}</Project>
208227
<Name>Commands.ServiceManagement.Network</Name>
209228
</ProjectReference>
210229
</ItemGroup>
211230
<ItemGroup>
231+
<None Include="ScenarioTests\ReservedIPs\ReservedIPTests.ps1">
232+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
233+
</None>
234+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip\ExtraVipLifecycle.json">
235+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
236+
</None>
237+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip\ExtraVipMobility.json">
238+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
239+
</None>
240+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip\ReserveMultivipDepIP.json">
241+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
242+
</None>
243+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip\SetLbEpMultivipDep.json">
244+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
245+
</None>
212246
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.NSGScenarioTests\CreateAndRemoveNSG.json">
213247
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
214248
</None>
@@ -236,6 +270,21 @@
236270
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.NSGScenarioTests\SetNSRWithInvalidParameter.json">
237271
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
238272
</None>
273+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\AzureReservedIPSimpleOps.json">
274+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
275+
</None>
276+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\CreateVMWithReservedIP.json">
277+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
278+
</None>
279+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\RemoveReservedIPAssocSimple.json">
280+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
281+
</None>
282+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\ReserveExistingDepIP.json">
283+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
284+
</None>
285+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\SetReservedIPAssocSimple.json">
286+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
287+
</None>
239288
<None Include="TestData\EmptyNetworkConfiguration.xml">
240289
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
241290
</None>

0 commit comments

Comments
 (0)