Skip to content

Commit cf1f8e0

Browse files
markcowlmarkcowl
committed
Merge pull request #2170 from hyonholee/dev
[Release 1.4.0] [AzureRT] Sprint 59
2 parents 24eebc9 + 841f3df commit cf1f8e0

File tree

146 files changed

+199377
-69365
lines changed

Some content is hidden

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

146 files changed

+199377
-69365
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</Reference>
110110
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111111
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.6.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
112+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<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
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.Rest.ClientRuntime" version="2.1.0" targetFramework="net45" />
1818
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.6.0" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.8.0" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="xunit" version="2.1.0" 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
@@ -109,7 +109,7 @@
109109
</Reference>
110110
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111111
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.6.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
112+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<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
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.Rest.ClientRuntime" version="2.1.0" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.6.0" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.8.0" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="xunit" version="2.1.0" targetFramework="net45" />

‎src/ResourceManager/Compute/AzureRM.Compute.psd1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ ScriptsToProcess = @()
5555

5656
# Type files (.ps1xml) to be loaded when importing this module
5757
TypesToProcess = @(
58-
'.\Microsoft.Azure.Commands.Compute.Types.ps1xml'
58+
'.\Microsoft.Azure.Commands.Compute.Types.ps1xml'
5959
)
6060

6161
# Format files (.ps1xml) to be loaded when importing this module
6262
FormatsToProcess = @(
63-
'.\Microsoft.Azure.Commands.Compute.format.ps1xml',
64-
'.\Microsoft.Azure.Commands.Compute.format.generated.ps1xml'
63+
'.\Microsoft.Azure.Commands.Compute.format.ps1xml',
64+
'.\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
65+
'.\Generated\Microsoft.Azure.Commands.Compute.Automation.format.generated.ps1xml'
6566
)
6667

6768
# Modules to import as nested modules of the module specified in ModuleToProcess

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Compute">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -168,6 +168,7 @@
168168
<Compile Include="ScenarioTests\AddVhdTests.cs" />
169169
<Compile Include="ScenarioTests\AEMExtensionTests.cs" />
170170
<Compile Include="ScenarioTests\ComputeCloudExceptionTests.cs" />
171+
<Compile Include="ScenarioTests\ContainerServiceTests.cs" />
171172
<Compile Include="ScenarioTests\DiagnosticsExtensionTests.cs" />
172173
<Compile Include="ScenarioTests\SqlIaaSExtensionTests.cs">
173174
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -240,6 +241,9 @@
240241
<None Include="ScenarioTests\ComputeCloudExceptionTests.ps1">
241242
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
242243
</None>
244+
<None Include="ScenarioTests\ContainerServiceTests.ps1">
245+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
246+
</None>
243247
<None Include="ScenarioTests\DscExtensionTests.ps1">
244248
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
245249
</None>
@@ -305,6 +309,12 @@
305309
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.ComputeCloudExceptionTests\RunComputeCloudExceptionTests.json">
306310
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
307311
</None>
312+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.ContainerServiceTests\TestContainerService.json">
313+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
314+
</None>
315+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.ContainerServiceTests\TestContainerServiceUpdate.json">
316+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
317+
</None>
308318
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests\TestDiagnosticsExtensionBasic.json">
309319
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
310320
</None>

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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 Microsoft.WindowsAzure.Commands.ScenarioTest;
16+
using Xunit;
17+
18+
namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
19+
{
20+
public partial class ContainerServiceTests
21+
{
22+
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestContainerService()
25+
{
26+
ComputeTestController.NewInstance.RunPsTest("Test-ContainerService");
27+
}
28+
29+
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
public void TestContainerServiceUpdate()
32+
{
33+
ComputeTestController.NewInstance.RunPsTest("Test-ContainerServiceUpdate");
34+
}
35+
}
36+
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.ps1

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
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+
<#
16+
.SYNOPSIS
17+
Test Container Service
18+
#>
19+
function Test-ContainerService
20+
{
21+
# Setup
22+
$rgname = Get-ComputeTestResourceName
23+
24+
try
25+
{
26+
# Common
27+
$loc = 'australiasoutheast';
28+
New-AzureRMResourceGroup -Name $rgname -Location $loc -Force;
29+
30+
31+
$csName = 'cs' + $rgname;
32+
$masterDnsPrefixName = 'master' + $rgname;
33+
$agentPoolDnsPrefixName = 'ap' + $rgname;
34+
$agentPoolProfileName = 'AgentPool1';
35+
$vmSize = 'Standard_A1';
36+
37+
$orchestratorType = 'DCOS';
38+
$adminUserName = 'acsLinuxAdmin';
39+
$sshPublicKey =
40+
"MIIDszCCApugAwIBAgIJALBV9YJCF/tAMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV" +
41+
"BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX" +
42+
"aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzIyMjI1NDQ5WhcNMTYwMzIxMjI1NDQ5WjBF" +
43+
"MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50" +
44+
"ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIDANBgkqhkiG9w0BAQEFAAOCAQ0AMIIB" +
45+
"CAKCAQEAxDC+OfmB+tQ+P1MLmuuW2hJLdcK8m4DLgAk5l8bQDNBcVezt+bt/ZFMs" +
46+
"CHBhfTZG9O9yqMn8IRUh7/7jfQm6DmXCgtxj/uFiwT+F3out5uWvMV9SjFYvu9kJ" +
47+
"NXiDC2u3l4lHV8eHde6SbKiZB9Jji9FYQV4YiWrBa91j9I3hZzbTL0UCiJ+1PPoL" +
48+
"Rx/T1s9KT5Wn8m/z2EDrHWpetYu45OA7nzyIFOyQup5oWadWNnpk6HkCGutl9t9b" +
49+
"cLdjXjXPm9wcy1yxIB3Dj/Y8Hnulr80GJlUtUboDm8TExGc4YaPJxdn0u5igo5gZ" +
50+
"c6qnqH/BMd1nsyICx6AZnKBXBycoSQIBI6OBpzCBpDAdBgNVHQ4EFgQUzWhrCCDs" +
51+
"ClANCGlKZ64rHp2BDn0wdQYDVR0jBG4wbIAUzWhrCCDsClANCGlKZ64rHp2BDn2h" +
52+
"SaRHMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQK" +
53+
"ExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGSCCQCwVfWCQhf7QDAMBgNVHRMEBTAD" +
54+
"AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCUaJnX0aBzwBkbJrBS5YvkZnNKLdc4oHgC" +
55+
"/Nsr/9pwXzFYYXkdqpTw2nygH0C0WuPVVrG3Y3EGx/UIGDtLbwMvZJhQN9mZH3oX" +
56+
"+c3HGqBnXGuDRrtsfsK1ywAofx9amZfKNk/04/Rt3POdbyD1/AOADw2zMokbIapX" +
57+
"+nMDUtD/Tew9+0qU9+dcFMrFE1N4utlrFHlrLFbiCA/eSegP6gOeu9mqZv7UHIz2" +
58+
"oe6IQTw7zJF7xuBIzTYwjOCM197GKW7xc4GU4JZIN+faZ7njl/fxfUNdlqvgZUUn" +
59+
"kfdrzU3PZPl0w9NuncgEje/PZ+YtZvIsnH7MLSPeIGNQwW6V2kc8";
60+
61+
$container = New-AzureRmContainerServiceConfig -Location $loc -OrchestratorType $orchestratorType `
62+
-MasterDnsPrefix $masterDnsPrefixName -AdminUsername $adminUserName -SshPublicKey $sshPublicKey `
63+
| Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName -VmSize $vmSize -DnsPrefix $agentPoolDnsPrefixName `
64+
| New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
65+
66+
67+
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
68+
69+
$cslist = Get-AzureRmContainerService -ResourceGroupName $rgname;
70+
71+
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
72+
}
73+
finally
74+
{
75+
# Cleanup
76+
Clean-ResourceGroup $rgname
77+
}
78+
}
79+
80+
<#
81+
.SYNOPSIS
82+
Test Container Service Update
83+
#>
84+
function Test-ContainerServiceUpdate
85+
{
86+
# Setup
87+
$rgname = Get-ComputeTestResourceName
88+
89+
try
90+
{
91+
# Common
92+
$loc = 'australiasoutheast';
93+
New-AzureRMResourceGroup -Name $rgname -Location $loc -Force;
94+
95+
96+
$csName = 'cs' + $rgname;
97+
$masterDnsPrefixName = 'master' + $rgname;
98+
$agentPoolDnsPrefixName = 'ap' + $rgname;
99+
$agentPoolProfileName = 'AgentPool1';
100+
$vmSize = 'Standard_A1';
101+
102+
$orchestratorType = 'DCOS';
103+
$adminUserName = 'acsLinuxAdmin';
104+
$sshPublicKey =
105+
"MIIDszCCApugAwIBAgIJALBV9YJCF/tAMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV" +
106+
"BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX" +
107+
"aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzIyMjI1NDQ5WhcNMTYwMzIxMjI1NDQ5WjBF" +
108+
"MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50" +
109+
"ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIDANBgkqhkiG9w0BAQEFAAOCAQ0AMIIB" +
110+
"CAKCAQEAxDC+OfmB+tQ+P1MLmuuW2hJLdcK8m4DLgAk5l8bQDNBcVezt+bt/ZFMs" +
111+
"CHBhfTZG9O9yqMn8IRUh7/7jfQm6DmXCgtxj/uFiwT+F3out5uWvMV9SjFYvu9kJ" +
112+
"NXiDC2u3l4lHV8eHde6SbKiZB9Jji9FYQV4YiWrBa91j9I3hZzbTL0UCiJ+1PPoL" +
113+
"Rx/T1s9KT5Wn8m/z2EDrHWpetYu45OA7nzyIFOyQup5oWadWNnpk6HkCGutl9t9b" +
114+
"cLdjXjXPm9wcy1yxIB3Dj/Y8Hnulr80GJlUtUboDm8TExGc4YaPJxdn0u5igo5gZ" +
115+
"c6qnqH/BMd1nsyICx6AZnKBXBycoSQIBI6OBpzCBpDAdBgNVHQ4EFgQUzWhrCCDs" +
116+
"ClANCGlKZ64rHp2BDn0wdQYDVR0jBG4wbIAUzWhrCCDsClANCGlKZ64rHp2BDn2h" +
117+
"SaRHMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQK" +
118+
"ExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGSCCQCwVfWCQhf7QDAMBgNVHRMEBTAD" +
119+
"AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCUaJnX0aBzwBkbJrBS5YvkZnNKLdc4oHgC" +
120+
"/Nsr/9pwXzFYYXkdqpTw2nygH0C0WuPVVrG3Y3EGx/UIGDtLbwMvZJhQN9mZH3oX" +
121+
"+c3HGqBnXGuDRrtsfsK1ywAofx9amZfKNk/04/Rt3POdbyD1/AOADw2zMokbIapX" +
122+
"+nMDUtD/Tew9+0qU9+dcFMrFE1N4utlrFHlrLFbiCA/eSegP6gOeu9mqZv7UHIz2" +
123+
"oe6IQTw7zJF7xuBIzTYwjOCM197GKW7xc4GU4JZIN+faZ7njl/fxfUNdlqvgZUUn" +
124+
"kfdrzU3PZPl0w9NuncgEje/PZ+YtZvIsnH7MLSPeIGNQwW6V2kc8";
125+
126+
$container = New-AzureRmContainerServiceConfig -Location $loc `
127+
-OrchestratorType $orchestratorType `
128+
-MasterDnsPrefix $masterDnsPrefixName `
129+
-MasterCount 1 `
130+
-AdminUsername $adminUserName `
131+
-SshPublicKey $sshPublicKey `
132+
| Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName `
133+
-VmSize $vmSize `
134+
-DnsPrefix $agentPoolDnsPrefixName `
135+
-Count 1 `
136+
| New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
137+
138+
Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName `
139+
| Remove-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName `
140+
| Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName `
141+
-VmSize $vmSize `
142+
-DnsPrefix $agentPoolDnsPrefixName `
143+
-Count 2 `
144+
| Update-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
145+
146+
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
147+
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
148+
}
149+
finally
150+
{
151+
# Cleanup
152+
Clean-ResourceGroup $rgname
153+
}
154+
}
155+

0 commit comments

Comments
 (0)