Skip to content

Commit 1b3176a

Browse files
yaakoviyunyaakoviyun
committed
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
2 parents ce4f7e5 + 5cb4d2a commit 1b3176a

File tree

51 files changed

+37544
-16449
lines changed

Some content is hidden

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

51 files changed

+37544
-16449
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,8 +1346,8 @@
13461346
<Component Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" Guid="*">
13471347
<File Id="fil0BC58752DC9792178625EA842D496953" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
13481348
</Component>
1349-
<Component Id="cmpDE07060F7C404EB0947D0711C6A05ABA" Guid="*">
1350-
<File Id="fil7F437FF8C0784CA7B8438C683AE09BC4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.Azure.dll" />
1349+
<Component Id="cmpE389288C5CA88334DBFAA1A298DFDC57" Guid="*">
1350+
<File Id="fil3D9EA2F20E6C186138C8614E1378739F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.Azure.dll" />
13511351
</Component>
13521352
<Component Id="cmpE0A4360ECC0B00A74E3D29F280B2FD2E" Guid="*">
13531353
<File Id="fil1FB9B7667782F24EAC7BB0B862A44410" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.dll" />
@@ -1949,6 +1949,9 @@
19491949
<Component Id="cmp02101C8205A10465A009DD2D2D0F1390" Guid="*">
19501950
<File Id="fil4CA8F0CA63F798A22950895A16A78B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
19511951
</Component>
1952+
<Component Id="cmp0D0D795C52AF8527E2B92C491C447906" Guid="*">
1953+
<File Id="filD8614F896FBB93824122EB840C9A88F0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Rest.ClientRuntime.Azure.dll" />
1954+
</Component>
19521955
<Component Id="cmp70EF4B668BAC168FD29981CF127B86C5" Guid="*">
19531956
<File Id="fil624F3BFD8FC0BFE924EF19BDF7C3C26B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Rest.ClientRuntime.dll" />
19541957
</Component>
@@ -1978,9 +1981,6 @@
19781981
<Component Id="cmp17459EC3296F82D03FEF8C426C8DA7EA" Guid="*">
19791982
<File Id="filF30732FD3174ABEC7D2103467F25E8E5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\AzureRM.OperationalInsights.psd1" />
19801983
</Component>
1981-
<Component Id="cmpC77B4F6D332144EDAE5C8E2997F313F1" Guid="*">
1982-
<File Id="filD2FB04719F134FB9BF2BC1EE41908381" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\OperationalInsightsStartup.ps1" />
1983-
</Component>
19841984
<Component Id="cmp7CE9821E11931CE1140ACA06CF2D38B4" Guid="*">
19851985
<File Id="filD490745C6F4007A53448F93D7655F3D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Hyak.Common.dll" />
19861986
</Component>
@@ -2044,6 +2044,9 @@
20442044
<Component Id="cmpFD405A18E2A1C755986CD15E7976CCD9" Guid="*">
20452045
<File Id="filD7B6812AB9810AD6C0DE6904B4262D96" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Newtonsoft.Json.dll" />
20462046
</Component>
2047+
<Component Id="cmpD40FCB9017580E2042019CEA18C95507" Guid="*">
2048+
<File Id="fil2725AD41AD388A79C41F93ADF90AADE3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\OperationalInsightsStartup.ps1" />
2049+
</Component>
20472050
<Component Id="cmpD895804B1147D0DB74C81C5C228D8CFA" Guid="*">
20482051
<File Id="filA2326E206A682358A6CBA550FA21A25E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\System.Net.Http.Extensions.dll" />
20492052
</Component>
@@ -5953,7 +5956,7 @@
59535956
<ComponentRef Id="cmp95FB8932F45A41F4AF974FB6F565B75C" />
59545957
<ComponentRef Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" />
59555958
<ComponentRef Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" />
5956-
<ComponentRef Id="cmpDE07060F7C404EB0947D0711C6A05ABA" />
5959+
<ComponentRef Id="cmpE389288C5CA88334DBFAA1A298DFDC57" />
59575960
<ComponentRef Id="cmpE0A4360ECC0B00A74E3D29F280B2FD2E" />
59585961
<ComponentRef Id="cmpE2B4EA9CCA75508B10345C79226A99BF" />
59595962
<ComponentRef Id="cmp545597FAE11FE5F91F4BDCD56D1DFE83" />
@@ -6150,6 +6153,7 @@
61506153
<ComponentRef Id="cmp00A626BF687C0B839638474C372F830C" />
61516154
<ComponentRef Id="cmp775CB6B7D1F3AD4D55497F602D74AECF" />
61526155
<ComponentRef Id="cmp02101C8205A10465A009DD2D2D0F1390" />
6156+
<ComponentRef Id="cmp0D0D795C52AF8527E2B92C491C447906" />
61536157
<ComponentRef Id="cmp70EF4B668BAC168FD29981CF127B86C5" />
61546158
<ComponentRef Id="cmpB094102F26151D0A1F6097A8CEE8CF40" />
61556159
<ComponentRef Id="cmpE727598EA987F9F9AC37355BE178AE99" />
@@ -6159,7 +6163,6 @@
61596163
<ComponentRef Id="cmp275E5D23204FF3DB5A484691FFA2C6F5" />
61606164
<ComponentRef Id="cmp5E9A44B7330C75772463CB17D6D24AA6" />
61616165
<ComponentRef Id="cmp17459EC3296F82D03FEF8C426C8DA7EA" />
6162-
<ComponentRef Id="cmpC77B4F6D332144EDAE5C8E2997F313F1" />
61636166
<ComponentRef Id="cmp7CE9821E11931CE1140ACA06CF2D38B4" />
61646167
<ComponentRef Id="cmp6D68CAF3787D43356F3C2CB592699D2D" />
61656168
<ComponentRef Id="cmp20FBC1203D91D529F69E519C9C2F78B8" />
@@ -6181,6 +6184,7 @@
61816184
<ComponentRef Id="cmp6B49CE5195722BC055BE51FA1070592A" />
61826185
<ComponentRef Id="cmpF98A2CCD736EDBCB2C21E170C3EB8FC9" />
61836186
<ComponentRef Id="cmpFD405A18E2A1C755986CD15E7976CCD9" />
6187+
<ComponentRef Id="cmpD40FCB9017580E2042019CEA18C95507" />
61846188
<ComponentRef Id="cmpD895804B1147D0DB74C81C5C228D8CFA" />
61856189
<ComponentRef Id="cmpBBEEE168902DFD205E35F47468881929" />
61866190
<ComponentRef Id="cmp07ACD4A07ADD8A358045C237522DA4C4" />

‎src/ResourceManager/Common/Commands.ResourceManager.Common/Tags/TagsConversionHelper.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using System.Collections;
1717
using System.Collections.Generic;
1818
using System.Linq;
19+
using System.Management.Automation;
1920
using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Common.Properties.Resources;
2021

2122
namespace Microsoft.Azure.Commands.ResourceManager.Common.Tags
@@ -93,5 +94,20 @@ public static Hashtable CreateTagHashtable(IDictionary<string, string> dictionar
9394
}
9495
return tagsHashtable;
9596
}
97+
98+
public static Dictionary<string, string> ReadOrFetchTags(PSCmdlet cmdlet, Dictionary<string,string> tagsFromModel)
99+
{
100+
object tagsFromCli;
101+
if (cmdlet.MyInvocation.BoundParameters.TryGetValue("Tags", out tagsFromCli))
102+
{
103+
Hashtable tags = tagsFromCli as Hashtable;
104+
return TagsConversionHelper.CreateTagDictionary(tags, validate: true);
105+
}
106+
else
107+
{
108+
return tagsFromModel;
109+
}
110+
}
111+
96112
}
97113
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
<Compile Include="Common\ComputeTestController.cs" />
167167
<Compile Include="ScenarioTests\AddVhdTests.cs" />
168168
<Compile Include="ScenarioTests\AEMExtensionTests.cs" />
169+
<Compile Include="ScenarioTests\ChefExtensionTests.cs" />
169170
<Compile Include="ScenarioTests\ComputeCloudExceptionTests.cs" />
170171
<Compile Include="ScenarioTests\ContainerServiceTests.cs" />
171172
<Compile Include="ScenarioTests\DiagnosticsExtensionTests.cs" />
@@ -243,6 +244,9 @@
243244
<None Include="ScenarioTests\AEMExtensionTests.ps1">
244245
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
245246
</None>
247+
<None Include="ScenarioTests\ChefExtensionTests.ps1">
248+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
249+
</None>
246250
<None Include="ScenarioTests\ComputeCloudExceptionTests.ps1">
247251
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
248252
</None>
@@ -355,6 +359,9 @@
355359
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DscExtensionTests\TestGetAzureRmVMDscExtension.json">
356360
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
357361
</None>
362+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.ChefExtensionTests\TestSetChefExtensionBasic.json">
363+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
364+
</None>
358365
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests\TestSqlIaaSAKVExtension.json">
359366
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
360367
</None>
@@ -523,6 +530,12 @@
523530
<None Include="Templates\azuredeploy.json">
524531
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
525532
</None>
533+
<None Include="Templates\client.rb">
534+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
535+
</None>
536+
<None Include="Templates\tstorgnztn-validator.pem">
537+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
538+
</None>
526539
</ItemGroup>
527540
<ItemGroup>
528541
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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 class ChefExtensionTests
21+
{
22+
public ChefExtensionTests(Xunit.Abstractions.ITestOutputHelper output)
23+
{
24+
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
25+
}
26+
27+
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
29+
public void TestSetChefExtensionBasic()
30+
{
31+
ComputeTestController.NewInstance.RunPsTest("Test-SetChefExtensionBasic");
32+
}
33+
}
34+
}

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

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
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+
#
17+
# ChefExtensionTests.ps1
18+
#
19+
20+
<#
21+
.SYNOPSIS
22+
Test the usage of the Set virtual machine chef extension command
23+
#>
24+
function Test-SetChefExtensionBasic
25+
{
26+
$rgname = Get-ComputeTestResourceName
27+
$loc = Get-ComputeVMLocation
28+
$TestOutputRoot = [System.AppDomain]::CurrentDomain.BaseDirectory;
29+
30+
try
31+
{
32+
############ Create Virtual Machine #############
33+
# Common
34+
New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
35+
36+
# VM Profile & Hardware
37+
$vmsize = 'Standard_A2';
38+
$vmname = 'vm' + $rgname;
39+
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
40+
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
41+
42+
# NRP
43+
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
44+
$vnet = New-AzureRmVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
45+
$vnet = Get-AzureRmVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
46+
$subnetId = $vnet.Subnets[0].Id;
47+
$pubip = New-AzureRmPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
48+
$pubip = Get-AzureRmPublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
49+
$pubipId = $pubip.Id;
50+
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
51+
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
52+
$nicId = $nic.Id;
53+
54+
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
55+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
56+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
57+
58+
# Storage Account
59+
$stoname = 'sto' + $rgname;
60+
$stotype = 'Standard_GRS';
61+
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
62+
Retry-IfException { $global:stoaccount = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
63+
64+
$osDiskName = 'osDisk';
65+
$osDiskCaching = 'ReadWrite';
66+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
67+
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
68+
69+
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
70+
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
71+
72+
# OS & Image
73+
$user = "localadmin";
74+
$password = $PLACEHOLDER;
75+
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
76+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
77+
$computerName = 'test';
78+
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
79+
80+
$p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
81+
$p = Set-AzureRmVMSourceImage -VM $p -PublisherName MicrosoftWindowsServer -Offer WindowsServer -Skus 2012-R2-Datacenter -Version "latest"
82+
83+
# Virtual Machine
84+
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
85+
86+
############ Created Virtual Machine #############
87+
88+
############ Test Chef Extension #################
89+
$version = "1210.12"
90+
$client_rb = "$TestOutputRoot\Templates\client.rb";
91+
$validationPemFile = "$TestOutputRoot\Templates\tstorgnztn-validator.pem";
92+
93+
# Set Chef extension
94+
Set-AzureRmVMChefExtension -ResourceGroupName $rgname -VMName $vmname -TypeHandlerVersion $version -ClientRb $client_rb -ValidationPem $validationPemFile -Windows
95+
$extension = Get-AzureRmVMChefExtension -ResourceGroupName $rgname -VMName $vmname -Windows
96+
97+
Assert-NotNull $extension
98+
Assert-AreEqual $extension.Publisher 'Chef.Bootstrap.WindowsAzure'
99+
Assert-AreEqual $extension.ExtensionType 'ChefClient'
100+
Assert-AreEqual $extension.Name 'ChefClient'
101+
102+
# Test Remove command.
103+
Remove-AzureRmVMChefExtension -ResourceGroupName $rgname -VMName $vmname -Windows
104+
}
105+
finally
106+
{
107+
# Cleanup
108+
Clean-ResourceGroup $rgname
109+
}
110+
}

0 commit comments

Comments
 (0)