Skip to content

Commit 1138ff5

Browse files
ogailogail
committed
Merge pull request #111 from dud5/ipforwarding
Add IPForwarding
2 parents 4313f24 + 03a3f29 commit 1138ff5

File tree

50 files changed

+4354
-127
lines changed

Some content is hidden

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

50 files changed

+4354
-127
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 402 additions & 12 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@
106106
<Reference Include="Microsoft.WindowsAzure.Management">
107107
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
109+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110110
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111112
</Reference>
112113
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
113114
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/Common/Commands.Common.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.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2121
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/Common/Commands.Common/ServiceManagementTypes.cs

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,21 @@ public AssignPublicIPCollection PublicIPs
863863
this.SetValue("PublicIPs", value);
864864
}
865865
}
866-
[DataMember(Name = "NetworkSecurityGroup", EmitDefaultValue = false, Order = 7)]
866+
867+
[DataMember(Name = "NetworkInterfaces", EmitDefaultValue = false, Order = 7)]
868+
public AssignNetworkInterfaceCollection NetworkInterfaces
869+
{
870+
get
871+
{
872+
return this.GetValue<AssignNetworkInterfaceCollection>("NetworkInterfaces");
873+
}
874+
set
875+
{
876+
this.SetValue("NetworkInterfaces", value);
877+
}
878+
}
879+
880+
[DataMember(Name = "NetworkSecurityGroup", EmitDefaultValue = false, Order = 8)]
867881
public string NetworkSecurityGroup
868882
{
869883
get
@@ -876,16 +890,16 @@ public string NetworkSecurityGroup
876890
}
877891
}
878892

879-
[DataMember(Name = "NetworkInterfaces", EmitDefaultValue = false, Order = 7)]
880-
public AssignNetworkInterfaceCollection NetworkInterfaces
893+
[DataMember(Name = "IPForwarding", EmitDefaultValue = false, Order = 9)]
894+
public string IPForwarding
881895
{
882896
get
883897
{
884-
return this.GetValue<AssignNetworkInterfaceCollection>("NetworkInterfaces");
898+
return this.GetValue<string>("IPForwarding");
885899
}
886900
set
887901
{
888-
this.SetValue("NetworkInterfaces", value);
902+
this.SetValue("IPForwarding", value);
889903
}
890904
}
891905
}
@@ -948,6 +962,8 @@ public AssignIPConfigurationCollection IPConfigurations
948962
}
949963
}
950964

965+
[DataMember(Name = "IPForwarding", EmitDefaultValue = false, Order = 4)]
966+
public string IPForwarding { get; set; }
951967
}
952968

953969
[CollectionDataContract(Name = "IPConfigurations", ItemName = "IPConfiguration", Namespace = Constants.ServiceManagementNS)]

‎src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@
102102
<Reference Include="Microsoft.WindowsAzure.Management">
103103
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
104104
</Reference>
105-
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
106-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107-
<Private>True</Private>
105+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106+
<SpecificVersion>False</SpecificVersion>
107+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
110110
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/Common/Commands.ScenarioTest/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@
7979
<Reference Include="Microsoft.WindowsAzure.Management">
8080
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8181
</Reference>
82-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
82+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
83+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
8584
</Reference>
8685
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
8786
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
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.Compute" version="11.2.1" targetFramework="net45" />
14+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
1515
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1616
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
1717
</packages>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@
111111
<Reference Include="Microsoft.WindowsAzure.Management">
112112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113113
</Reference>
114+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<SpecificVersion>False</SpecificVersion>
116+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
117+
</Reference>
114118
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115119
<SpecificVersion>False</SpecificVersion>
116120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" 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/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@
111111
<Reference Include="Microsoft.WindowsAzure.Management">
112112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113113
</Reference>
114-
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
115-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
114+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
116116
</Reference>
117-
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<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.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
119+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.2" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" 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: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,11 @@
106106
<Reference Include="Microsoft.WindowsAzure.Management">
107107
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110-
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
109+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
112111
</Reference>
113-
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114-
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
112+
<Reference Include="Microsoft.WindowsAzure.Management.Network">
113+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
116114
</Reference>
117115
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
118116
<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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.2" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" 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: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,12 @@
113113
<Reference Include="Microsoft.WindowsAzure.Management">
114114
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
115115
</Reference>
116-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117-
<SpecificVersion>False</SpecificVersion>
118-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
116+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
119118
</Reference>
120-
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119+
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
121120
<SpecificVersion>False</SpecificVersion>
122-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
121+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
123122
</Reference>
124123
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
125124
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -239,7 +238,6 @@
239238
<Compile Include="IaaS\Network\AddAzureNetworkInterfaceConfig.cs" />
240239
<Compile Include="IaaS\Network\GetAzureInternalLoadBalancer.cs" />
241240
<Compile Include="IaaS\Network\GetAzureNetworkInterfaceConfig.cs" />
242-
<Compile Include="IaaS\Network\GetAzureNetworkSecurityGroupConfig.cs" />
243241
<Compile Include="IaaS\Network\NewAzureInternalLoadBalancerConfig.cs" />
244242
<Compile Include="IaaS\Network\RemoveAzureDns.cs" />
245243
<Compile Include="IaaS\Network\RemoveAzureInternalLoadBalancer.cs" />
@@ -528,10 +526,6 @@
528526
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
529527
<Name>Commands.Common</Name>
530528
</ProjectReference>
531-
<ProjectReference Include="..\..\Network\Commands.Network\Commands.Network.csproj">
532-
<Project>{40fee0bb-fd45-4efc-85bc-0d602a6892c4}</Project>
533-
<Name>Commands.Network</Name>
534-
</ProjectReference>
535529
<ProjectReference Include="..\..\Services\Commands.Utilities\Commands.Utilities.csproj">
536530
<Project>{4900ec4e-8deb-4412-9108-0bc52f81d457}</Project>
537531
<Name>Commands.Utilities</Name>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ public class AddAzureNetworkInterfaceConfig : VirtualMachineConfigurationCmdletB
3333
[Parameter(Position = 3, Mandatory = false, HelpMessage = "The static ip address.")]
3434
public string StaticVNetIPAddress { get; set; }
3535

36+
[Parameter(Position = 5, Mandatory = false, HelpMessage = "The IP Forwarding state for this network interface.")]
37+
[ValidateSet("Enabled", "Disabled", IgnoreCase = false)]
38+
public string IPForwarding { get; set; }
39+
3640
protected override void ProcessRecord()
3741
{
3842
base.ProcessRecord();
@@ -72,7 +76,8 @@ protected override void ProcessRecord()
7276
IPConfigurations = new AssignIPConfigurationCollection()
7377
{
7478
ipConfig
75-
}
79+
},
80+
IPForwarding = this.IPForwarding,
7681
});
7782
WriteObject(VM);
7883
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public class SetAzureNetworkInterfaceConfig : VirtualMachineConfigurationCmdletB
3434
[Parameter(Position = 3, Mandatory = false, HelpMessage = "The Subnet Name.")]
3535
public string StaticVNetIPAddress { get; set; }
3636

37+
[Parameter(Position = 5, Mandatory = false, HelpMessage = "The IP Forwarding state for this network interface.")]
38+
[ValidateSet("Enabled", "Disabled", IgnoreCase = false)]
39+
public string IPForwarding { get; set; }
40+
3741
protected override void ProcessRecord()
3842
{
3943
base.ProcessRecord();
@@ -60,6 +64,7 @@ protected override void ProcessRecord()
6064
{
6165
interfaces.IPConfigurations.First().SubnetName = this.SubnetName;
6266
interfaces.IPConfigurations.First().StaticVirtualNetworkIPAddress = this.StaticVNetIPAddress;
67+
interfaces.IPForwarding = this.IPForwarding;
6368
}
6469
}
6570

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Network" version="6.1.2" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" 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" />

0 commit comments

Comments
 (0)