Skip to content

Commit baf4e41

Browse files
huangpfhuangpf
committed
Merge pull request #62 from Azure/dev
.
2 parents 3a747ed + 894bbb4 commit baf4e41

File tree

104 files changed

+9928
-1210
lines changed

Some content is hidden

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

104 files changed

+9928
-1210
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
110-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
113113
<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="12.2.0-preview" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" 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.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +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.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
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.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107108
</Reference>
108109
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109110
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.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="12.2.0-preview" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2323
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</Reference>
102102
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
104+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
105105
</Reference>
106106
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107107
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
18-
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.2.0-preview" targetFramework="net45" />
18+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2020
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2121
<package id="xunit" version="1.9.2" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</Reference>
102102
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
104+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
105105
</Reference>
106106
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107107
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
18-
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.2.0-preview" targetFramework="net45" />
18+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2020
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2121
<package id="xunit" version="1.9.2" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Extension/CustomScript/SetAzureVMCustomScriptExtensionCommand.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Common.Authentication;
1516
using Microsoft.Azure.Common.Authentication.Models;
1617
using Microsoft.Azure.Commands.Compute.Common;
1718
using Microsoft.Azure.Commands.Compute.Models;
@@ -208,14 +209,7 @@ public override void ExecuteCmdlet()
208209
Hashtable publicSettings = new Hashtable();
209210
publicSettings.Add(commandToExecuteKey, commandToExecute ?? "");
210211
publicSettings.Add(fileUrisKey, FileUri ?? new string[] { });
211-
212-
Hashtable privateSettings = new Hashtable();
213-
privateSettings.Add(storageAccountNameKey, StorageAccountName ?? "");
214-
privateSettings.Add(storageAccountKeyKey, StorageAccountKey ?? "");
215-
216212
var SettingString = JsonConvert.SerializeObject(publicSettings);
217-
var ProtectedSettingString = JsonConvert.SerializeObject(privateSettings);
218-
219213

220214
var parameters = new VirtualMachineExtension
221215
{
@@ -226,7 +220,7 @@ public override void ExecuteCmdlet()
226220
ExtensionType = VirtualMachineCustomScriptExtensionContext.ExtensionDefaultName,
227221
TypeHandlerVersion = (this.TypeHandlerVersion) ?? VirtualMachineCustomScriptExtensionContext.ExtensionDefaultVersion,
228222
Settings = SettingString,
229-
ProtectedSettings = ProtectedSettingString,
223+
ProtectedSettings = GetPrivateConfiguration(),
230224
};
231225

232226
var op = this.VirtualMachineExtensionClient.CreateOrUpdate(
@@ -292,5 +286,19 @@ protected string GetSasUrlStr(string storageName, string storageKey, string cont
292286
return cloudBlob.Uri + sasToken;
293287
}
294288

289+
protected string GetPrivateConfiguration()
290+
{
291+
if (string.IsNullOrEmpty(this.StorageAccountName) || string.IsNullOrEmpty(this.StorageAccountKey))
292+
{
293+
return string.Empty;
294+
}
295+
else
296+
{
297+
var privateSettings = new Hashtable();
298+
privateSettings.Add(storageAccountNameKey, StorageAccountName);
299+
privateSettings.Add(storageAccountKeyKey, StorageAccountKey);
300+
return JsonUtilities.TryFormatJson(JsonConvert.SerializeObject(privateSettings));
301+
}
302+
}
295303
}
296304
}

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ApplicationGatewayTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ function Test-ApplicationGatewayCRUD
5656
$poolSetting = New-AzureApplicationGatewayBackendHttpSettings -Name $poolSettingName -Port 80 -Protocol HTTP -CookieBasedAffinity Disabled
5757
$fp = New-AzureApplicationGatewayFrontendPort -Name $frontendPortName -Port 80
5858
$fipconfig = New-AzureApplicationGatewayFrontendIPConfig -Name $fipconfigName -PublicIPAddress $publicip
59-
$listener = New-AzureApplicationGatewayHttpListener -Name $listenerName -Protocol http -FrontendIpConfiguration $fipconfig -FrontendPort $fp
59+
$listener = New-AzureApplicationGatewayHttpListener -Name $listenerName -Protocol http -FrontendIPConfiguration $fipconfig -FrontendPort $fp
6060
$rule = New-AzureApplicationGatewayRequestRoutingRule -Name $ruleName -RuleType basic -BackendHttpSettings $poolSetting -HttpListener $listener -BackendAddressPool $pool
6161
$sku = New-AzureApplicationGatewaySku -Name Standard_Small -Tier Standard -Capacity 2
6262

63-
# $actual = New-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname -Location $location -BackendAddressPools $pool -BackendHttpSettingsCollection $poolSetting -FrontendIpConfigurations $fipconfig -GatewayIpConfigurations $gipconfig -FrontendPorts $fp -HttpListeners $listener -RequestRoutingRules $rule -Sku $sku
64-
# $expected = Get-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname
65-
# Compare-AzureApplicationGateway $actual $expected
63+
$actual = New-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname -Location $location -BackendAddressPools $pool -BackendHttpSettingsCollection $poolSetting -FrontendIpConfigurations $fipconfig -GatewayIpConfigurations $gipconfig -FrontendPorts $fp -HttpListeners $listener -RequestRoutingRules $rule -Sku $sku
64+
$expected = Get-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname
65+
Compare-AzureApplicationGateway $actual $expected
6666

67-
# Stop-AzureApplicationGateway -ApplicationGateway $expected
68-
# Remove-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname
67+
Stop-AzureApplicationGateway -ApplicationGateway $expected
68+
Remove-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname -Force
6969
}
7070
finally
7171
{

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUD.json

Lines changed: 8147 additions & 277 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/BackendAddressPool/AddAzureApplicationGatewayBackendAddressPoolCommand.cs

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,46 +41,7 @@ public override void ExecuteCmdlet()
4141
throw new ArgumentException("Backend address pool with the specified name already exists");
4242
}
4343

44-
backendAddressPool = new PSApplicationGatewayBackendAddressPool();
45-
46-
backendAddressPool.Name = this.Name;
47-
48-
if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByResourceId))
49-
{
50-
backendAddressPool.BackendIpConfigurations = new System.Collections.Generic.List<PSResourceId>();
51-
foreach (string id in this.BackendIPConfigurationIds)
52-
{
53-
var backendIpConfig = new PSResourceId();
54-
backendIpConfig.Id = id;
55-
backendAddressPool.BackendIpConfigurations.Add(backendIpConfig);
56-
}
57-
}
58-
else if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByIP))
59-
{
60-
backendAddressPool.BackendAddresses = new System.Collections.Generic.List<PSApplicationGatewayBackendAddress>();
61-
foreach (string ip in this.BackendIPAddresses)
62-
{
63-
var backendAddress = new PSApplicationGatewayBackendAddress();
64-
backendAddress.IpAddress = ip;
65-
backendAddressPool.BackendAddresses.Add(backendAddress);
66-
}
67-
}
68-
else
69-
{
70-
backendAddressPool.BackendAddresses = new System.Collections.Generic.List<PSApplicationGatewayBackendAddress>();
71-
foreach (string fqdn in this.BackendFqdns)
72-
{
73-
var backendAddress = new PSApplicationGatewayBackendAddress();
74-
backendAddress.Fqdn = fqdn;
75-
backendAddressPool.BackendAddresses.Add(backendAddress);
76-
}
77-
}
78-
79-
backendAddressPool.Id = ApplicationGatewayChildResourceHelper.GetResourceNotSetId(
80-
this.NetworkClient.NetworkResourceProviderClient.Credentials.SubscriptionId,
81-
Microsoft.Azure.Commands.Network.Properties.Resources.ApplicationGatewayBackendAddressPoolName,
82-
this.Name);
83-
44+
backendAddressPool = base.NewObject();
8445
this.ApplicationGateway.BackendAddressPools.Add(backendAddressPool);
8546

8647
WriteObject(this.ApplicationGateway);

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/BackendAddressPool/AzureApplicationGatewayBackendAddressPoolBase.cs

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,51 @@ public class AzureApplicationGatewayBackendAddressPoolBase : NetworkBaseCmdlet
4343
ParameterSetName = "SetByFqdn",
4444
HelpMessage = "FQDNs of application gateway backend servers")]
4545
[ValidateNotNullOrEmpty]
46-
public List<string> BackendFqdns { get; set; }
47-
public override void ExecuteCmdlet()
46+
public List<string> BackendFqdns { get; set; }
47+
48+
public PSApplicationGatewayBackendAddressPool NewObject()
4849
{
49-
base.ExecuteCmdlet();
50+
var backendAddressPool = new PSApplicationGatewayBackendAddressPool();
51+
52+
backendAddressPool.Name = this.Name;
53+
54+
if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByResourceId))
55+
{
56+
backendAddressPool.BackendIpConfigurations = new System.Collections.Generic.List<PSResourceId>();
57+
foreach (string id in this.BackendIPConfigurationIds)
58+
{
59+
var backendIpConfig = new PSResourceId();
60+
backendIpConfig.Id = id;
61+
backendAddressPool.BackendIpConfigurations.Add(backendIpConfig);
62+
}
63+
}
64+
else if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByIP))
65+
{
66+
backendAddressPool.BackendAddresses = new System.Collections.Generic.List<PSApplicationGatewayBackendAddress>();
67+
foreach (string ip in this.BackendIPAddresses)
68+
{
69+
var backendAddress = new PSApplicationGatewayBackendAddress();
70+
backendAddress.IpAddress = ip;
71+
backendAddressPool.BackendAddresses.Add(backendAddress);
72+
}
73+
}
74+
else
75+
{
76+
backendAddressPool.BackendAddresses = new System.Collections.Generic.List<PSApplicationGatewayBackendAddress>();
77+
foreach (string fqdn in this.BackendFqdns)
78+
{
79+
var backendAddress = new PSApplicationGatewayBackendAddress();
80+
backendAddress.Fqdn = fqdn;
81+
backendAddressPool.BackendAddresses.Add(backendAddress);
82+
}
83+
}
84+
85+
backendAddressPool.Id = ApplicationGatewayChildResourceHelper.GetResourceNotSetId(
86+
this.NetworkClient.NetworkResourceProviderClient.Credentials.SubscriptionId,
87+
Microsoft.Azure.Commands.Network.Properties.Resources.ApplicationGatewayBackendAddressPoolName,
88+
this.Name);
89+
90+
return backendAddressPool;
5091
}
5192
}
5293
}

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/BackendAddressPool/NewAzureApplicationGatewayBackendAddressPoolCommand.cs

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -24,48 +24,7 @@ public class NewAzureApplicationGatewayBackendAddressPoolCommand : AzureApplicat
2424
public override void ExecuteCmdlet()
2525
{
2626
base.ExecuteCmdlet();
27-
28-
var backendAddressPool = new PSApplicationGatewayBackendAddressPool();
29-
30-
backendAddressPool.Name = this.Name;
31-
32-
if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByResourceId))
33-
{
34-
backendAddressPool.BackendIpConfigurations = new System.Collections.Generic.List<PSResourceId>();
35-
foreach (string id in this.BackendIPConfigurationIds)
36-
{
37-
var backendIpConfig = new PSResourceId();
38-
backendIpConfig.Id = id;
39-
backendAddressPool.BackendIpConfigurations.Add(backendIpConfig);
40-
}
41-
}
42-
else if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByIP))
43-
{
44-
backendAddressPool.BackendAddresses = new System.Collections.Generic.List<PSApplicationGatewayBackendAddress>();
45-
foreach (string ip in this.BackendIPAddresses)
46-
{
47-
var backendAddress = new PSApplicationGatewayBackendAddress();
48-
backendAddress.IpAddress = ip;
49-
backendAddressPool.BackendAddresses.Add(backendAddress);
50-
}
51-
}
52-
else
53-
{
54-
backendAddressPool.BackendAddresses = new System.Collections.Generic.List<PSApplicationGatewayBackendAddress>();
55-
foreach (string fqdn in this.BackendFqdns)
56-
{
57-
var backendAddress = new PSApplicationGatewayBackendAddress();
58-
backendAddress.Fqdn = fqdn;
59-
backendAddressPool.BackendAddresses.Add(backendAddress);
60-
}
61-
}
62-
63-
backendAddressPool.Id = ApplicationGatewayChildResourceHelper.GetResourceNotSetId(
64-
this.NetworkClient.NetworkResourceProviderClient.Credentials.SubscriptionId,
65-
Microsoft.Azure.Commands.Network.Properties.Resources.ApplicationGatewayBackendAddressPoolName,
66-
this.Name);
67-
68-
WriteObject(backendAddressPool);
27+
WriteObject(base.NewObject());
6928
}
7029
}
7130
}

0 commit comments

Comments
 (0)