Skip to content

Commit 34eccb9

Browse files
finiteattractorfiniteattractor
committed
- Updated to latest SDK
- Re-recorded few tests and updated code based on live data - Fixed an issue found while recording
1 parent c04f432 commit 34eccb9

File tree

9 files changed

+170
-94
lines changed

9 files changed

+170
-94
lines changed

‎src/ResourceManager/Automation/Commands.Automation.Test/ScenarioTests/UpdateManagement/UpdateManagementTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void CreateLinuxOneTimeSUCNonAzureOnly()
6565
RunPowerShellTest("Test-CreateLinuxOneTimeSoftwareUpdateConfigurationNonAzureOnly");
6666
}
6767

68-
[Fact]
68+
[Fact(Skip = "No recording generated")]
6969
[Trait(Category.AcceptanceType, Category.CheckIn)]
7070
[Trait(Category.Service, Category.Automation)]
7171
public void CreateLinuxOneTimeSUCNoTarget()

‎src/ResourceManager/Automation/Commands.Automation.Test/ScenarioTests/UpdateManagement/UpdateManagementTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function Test-CreateWindowsOneTimeSoftwareUpdateConfigurationWithAllOption {
105105
-AutomationAccountName $aa `
106106
-Schedule $s `
107107
-Windows `
108-
-AzureVMResourceIds $azureVMIdsL `
108+
-AzureVMResourceIds $azureVMIdsW `
109109
-NonAzureComputers $nonAzurecomputers `
110110
-Duration (New-TimeSpan -Hours 2) `
111111
-IncludedUpdateClassifications Security,UpdateRollup `
@@ -266,7 +266,7 @@ function Test-GetAllSoftwareUpdateRuns {
266266
$runs = Get-AzureRmAutomationSoftwareUpdateRun -ResourceGroupName $rg `
267267
-AutomationAccountName $aa
268268

269-
Assert-AreEqual $runs.Count 10 "Get software update configurations runs didn't return expected number of items"
269+
Assert-AreEqual $runs.Count 13 "Get software update configurations runs didn't return expected number of items"
270270
}
271271

272272

‎src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/CreateLinuxOneTimeSUCWithDefaults.json

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

‎src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/CreateWindowsOneTimeSUCWithAllOption.json

Lines changed: 91 additions & 19 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/GetAllRuns.json

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

‎src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/GetAllSUCs.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"9dac7989-820a-4fda-9c81-7ea85fc5b19b"
10+
"a0078fd9-1bde-4011-8149-9082ae21ac0f"
1111
],
1212
"accept-language": [
1313
"en-US"
@@ -19,13 +19,13 @@
1919
"Microsoft.Azure.Management.Automation.AutomationClient/3.0.2.0"
2020
],
2121
"x-ms-activity-id": [
22-
"6e75d87f-fc70-4505-a09f-f57b9c94a353"
22+
"8d2de1ae-9d4c-4017-b109-bc9e46c5a1dc"
2323
]
2424
},
25-
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-05\",\r\n \"name\": \"mo-onetime-05\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Linux\",\r\n \"windows\": null,\r\n \"linux\": {\r\n \"includedPackageClassifications\": \"Critical, Security\",\r\n \"excludedPackageNameMasks\": null\r\n },\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": null,\r\n \"nonAzureComputerNames\": [\r\n \"server-01\",\r\n \"server-02\"\r\n ]\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-23T02:24:00-07:00\",\r\n \"creationTime\": \"2018-05-23T02:14:50.377-07:00\",\r\n \"lastModifiedTime\": \"2018-05-23T02:15:00.783-07:00\",\r\n \"provisioningState\": \"Failed\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-04\",\r\n \"name\": \"mo-onetime-04\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Linux\",\r\n \"windows\": null,\r\n \"linux\": {\r\n \"includedPackageClassifications\": \"Critical, Security\",\r\n \"excludedPackageNameMasks\": null\r\n },\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-01\",\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-02\"\r\n ],\r\n \"nonAzureComputerNames\": [\r\n \"server-01\",\r\n \"server-02\"\r\n ]\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-23T02:20:00-07:00\",\r\n \"creationTime\": \"2018-05-23T02:10:55.507-07:00\",\r\n \"lastModifiedTime\": \"2018-05-23T02:11:07.163-07:00\",\r\n \"provisioningState\": \"Failed\",\r\n \"nextRun\": null\r\n }\r\n }\r\n ]\r\n}",
25+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-03\",\r\n \"name\": \"mo-onetime-03\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Windows\",\r\n \"windows\": {\r\n \"includedUpdateClassifications\": \"Security, UpdateRollup\",\r\n \"excludedKbNumbers\": null\r\n },\r\n \"linux\": null,\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-01\",\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-02\"\r\n ],\r\n \"nonAzureComputerNames\": [\r\n \"server-01\",\r\n \"server-02\"\r\n ]\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-25T03:06:00-07:00\",\r\n \"creationTime\": \"2018-05-25T02:56:19.06-07:00\",\r\n \"lastModifiedTime\": \"2018-05-25T02:56:32.233-07:00\",\r\n \"provisioningState\": \"Failed\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-01\",\r\n \"name\": \"mo-onetime-01\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Windows\",\r\n \"windows\": {\r\n \"includedUpdateClassifications\": \"Unclassified\",\r\n \"excludedKbNumbers\": null\r\n },\r\n \"linux\": null,\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-w-01\",\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-w-02\"\r\n ],\r\n \"nonAzureComputerNames\": null\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-25T03:05:00-07:00\",\r\n \"creationTime\": \"2018-05-25T02:55:20.45-07:00\",\r\n \"lastModifiedTime\": \"2018-05-25T02:55:31.73-07:00\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-02\",\r\n \"name\": \"mo-onetime-02\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Linux\",\r\n \"windows\": null,\r\n \"linux\": {\r\n \"includedPackageClassifications\": \"Unclassified\",\r\n \"excludedPackageNameMasks\": null\r\n },\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-01\",\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-02\"\r\n ],\r\n \"nonAzureComputerNames\": null\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-25T03:04:00-07:00\",\r\n \"creationTime\": \"2018-05-25T02:54:50.29-07:00\",\r\n \"lastModifiedTime\": \"2018-05-25T02:55:01.337-07:00\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-05\",\r\n \"name\": \"mo-onetime-05\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Linux\",\r\n \"windows\": null,\r\n \"linux\": {\r\n \"includedPackageClassifications\": \"Critical, Security\",\r\n \"excludedPackageNameMasks\": null\r\n },\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": null,\r\n \"nonAzureComputerNames\": [\r\n \"server-01\",\r\n \"server-02\"\r\n ]\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-23T02:24:00-07:00\",\r\n \"creationTime\": \"2018-05-23T02:14:50.377-07:00\",\r\n \"lastModifiedTime\": \"2018-05-25T02:54:31.1-07:00\",\r\n \"provisioningState\": \"Failed\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/mo-onetime-04\",\r\n \"name\": \"mo-onetime-04\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Linux\",\r\n \"windows\": null,\r\n \"linux\": {\r\n \"includedPackageClassifications\": \"Critical, Security\",\r\n \"excludedPackageNameMasks\": null\r\n },\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-01\",\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-compute/providers/Microsoft.Compute/virtualMachines/mo-vm-l-02\"\r\n ],\r\n \"nonAzureComputerNames\": [\r\n \"server-01\",\r\n \"server-02\"\r\n ]\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-23T02:20:00-07:00\",\r\n \"creationTime\": \"2018-05-23T02:10:55.507-07:00\",\r\n \"lastModifiedTime\": \"2018-05-25T02:53:52.02-07:00\",\r\n \"provisioningState\": \"Failed\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/tst2\",\r\n \"name\": \"tst2\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Windows\",\r\n \"windows\": {\r\n \"includedUpdateClassifications\": \"Critical, Security, UpdateRollup, FeaturePack, ServicePack, Definition, Tools, Updates\",\r\n \"excludedKbNumbers\": null\r\n },\r\n \"linux\": null,\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourcegroups/mo-compute/providers/microsoft.compute/virtualmachines/mo-vm-w-01\"\r\n ],\r\n \"nonAzureComputerNames\": null\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-24T01:21:00-07:00\",\r\n \"creationTime\": \"2018-05-24T00:51:45.707-07:00\",\r\n \"lastModifiedTime\": \"2018-05-24T00:51:46.097-07:00\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"nextRun\": null\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/mo-resources-eus/providers/Microsoft.Automation/automationAccounts/mo-aaa-eus2/softwareUpdateConfigurations/tst\",\r\n \"name\": \"tst\",\r\n \"properties\": {\r\n \"updateConfiguration\": {\r\n \"operatingSystem\": \"Windows\",\r\n \"windows\": {\r\n \"includedUpdateClassifications\": \"Critical, Security, UpdateRollup, FeaturePack, ServicePack, Definition, Tools, Updates\",\r\n \"excludedKbNumbers\": null\r\n },\r\n \"linux\": null,\r\n \"duration\": \"PT2H\",\r\n \"azureVirtualMachines\": [\r\n \"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourcegroups/mo-compute/providers/microsoft.compute/virtualmachines/mo-vm-w-01\"\r\n ],\r\n \"nonAzureComputerNames\": null\r\n },\r\n \"frequency\": \"OneTime\",\r\n \"startTime\": \"2018-05-24T01:19:00-07:00\",\r\n \"creationTime\": \"2018-05-24T00:50:18.11-07:00\",\r\n \"lastModifiedTime\": \"2018-05-24T00:50:18.44-07:00\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"nextRun\": null\r\n }\r\n }\r\n ]\r\n}",
2626
"ResponseHeaders": {
2727
"Content-Length": [
28-
"1672"
28+
"6207"
2929
],
3030
"Content-Type": [
3131
"application/json; charset=utf-8"
@@ -37,19 +37,19 @@
3737
"no-cache"
3838
],
3939
"x-ms-request-id": [
40-
"6e75d87f-fc70-4505-a09f-f57b9c94a353"
40+
"8d2de1ae-9d4c-4017-b109-bc9e46c5a1dc"
4141
],
4242
"Strict-Transport-Security": [
4343
"max-age=31536000; includeSubDomains"
4444
],
4545
"x-ms-ratelimit-remaining-subscription-reads": [
46-
"14980"
46+
"14984"
4747
],
4848
"x-ms-correlation-request-id": [
49-
"266af53f-5974-42a1-9250-530e4f6eed96"
49+
"63b4c5af-9fc9-481c-9b91-ba56c976abb1"
5050
],
5151
"x-ms-routing-request-id": [
52-
"WESTUS2:20180524T074611Z:266af53f-5974-42a1-9250-530e4f6eed96"
52+
"WESTUS2:20180526T084407Z:63b4c5af-9fc9-481c-9b91-ba56c976abb1"
5353
],
5454
"X-Content-Type-Options": [
5555
"nosniff"
@@ -58,7 +58,7 @@
5858
"no-cache"
5959
],
6060
"Date": [
61-
"Thu, 24 May 2018 07:46:10 GMT"
61+
"Sat, 26 May 2018 08:44:06 GMT"
6262
],
6363
"Server": [
6464
"Microsoft-IIS/8.5"

‎src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,10 @@
241241
</ProjectReference>
242242
</ItemGroup>
243243
<ItemGroup>
244-
<Reference Include="Microsoft.Azure.Management.Automation, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
244+
<Reference Include="Microsoft.Azure.Management.Automation, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
245245
<SpecificVersion>False</SpecificVersion>
246-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Automation.3.0.2-preview\lib\net452\Microsoft.Azure.Management.Automation.dll</HintPath>
246+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Automation.3.0.3-preview\lib\net452\Microsoft.Azure.Management.Automation.dll</HintPath>
247+
<Private>True</Private>
247248
</Reference>
248249
</ItemGroup>
249250
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/ResourceManager/Automation/Commands.Automation/Model/UpdateManagement/SoftwareUpdateConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ internal SoftwareUpdateConfiguration(string resourceGroupName, string automation
110110
};
111111
}
112112

113-
private static IList<T> StringToEnumList<T>(string includedPackageClassifications)
113+
private static IList<T> StringToEnumList<T>(string classes)
114114
{
115-
return includedPackageClassifications.Split(new[] { ',' })
115+
return classes.Split(new[] { ',' })
116116
.Select(p => p.Trim())
117-
.Select(p => (T)Enum.Parse(typeof(LinuxPackageClasses), p, true))
117+
.Select(p => (T)Enum.Parse(typeof(T), p, true))
118118
.ToList();
119119
}
120120
}

‎src/ResourceManager/Automation/Commands.Automation/packages.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.Management.Automation" version="3.0.2-preview" targetFramework="net45" />
4-
</packages>
3+
<package id="Microsoft.Azure.Management.Automation" version="3.0.3-preview" targetFramework="net452" />
4+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.11" targetFramework="net452" />
5+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.12" targetFramework="net452" />
6+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
7+
</packages>

0 commit comments

Comments
 (0)