fix domain object - fix VirtuaMachineMockTest
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/bc520cfd Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/bc520cfd Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/bc520cfd Branch: refs/heads/master Commit: bc520cfdf2ab1977356502fa2d97c30d1bc177e8 Parents: e1e89b5 Author: Andrea Turli <[email protected]> Authored: Wed Oct 11 17:26:14 2017 +0100 Committer: Andrea Turli <[email protected]> Committed: Wed Oct 25 15:55:06 2017 +0200 ---------------------------------------------------------------------- .../jclouds/azurecompute/arm/domain/OSProfile.java | 6 +++--- .../arm/features/VirtualMachineApiMockTest.java | 16 ++++++++-------- .../resources/createvirtualmachineresponse.json | 4 ++-- .../src/test/resources/virtualmachine.json | 4 ++-- .../src/test/resources/virtualmachines.json | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/bc520cfd/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/OSProfile.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/OSProfile.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/OSProfile.java index b77dc9e..3f5a0bc 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/OSProfile.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/OSProfile.java @@ -150,13 +150,13 @@ public abstract class OSProfile { public abstract String content(); - @SerializedNames({"pass", "component", "settingName", "content"}) - public static AdditionalUnattendContent create(final String pass, final String component, + @SerializedNames({"passName", "componentName", "settingName", "content"}) + public static AdditionalUnattendContent create(final String passName, final String componentName, final String settingName, final String content) { return new AutoValue_OSProfile_WindowsConfiguration_AdditionalUnattendContent( - pass, component, settingName, content); + passName, componentName, settingName, content); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bc520cfd/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java index 258ae1a..372b303 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java @@ -16,12 +16,6 @@ */ package org.jclouds.azurecompute.arm.features; -import static com.google.common.collect.Iterables.isEmpty; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - import java.net.URI; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -59,6 +53,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.squareup.okhttp.mockwebserver.MockResponse; +import static com.google.common.collect.Iterables.isEmpty; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + @Test(groups = "unit", testName = "VirtualMachineApiMockTest", singleThreaded = true) public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { @@ -141,7 +141,7 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { + "\"managedDisk\":{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk\",\"storageAccountType\":\"Standard_LRS\"}}," + "\"dataDisks\":[{\"name\":\"mydatadisk1\",\"diskSizeGB\":\"1\",\"lun\":0,\"createOption\":\"Empty\",\"caching\":\"ReadWrite\",\"managedDisk\":{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk\",\"storageAccountType\":\"Standard_LRS\"}}]}," + "\"osProfile\":{\"computerName\":\"windowsmachine\",\"adminUsername\":\"azureuser\",\"adminPassword\":\"password\",\"customData\":\"\",\"windowsConfiguration\":{\"provisionVMAgent\":false," - + "\"winRM\":{\"listeners\":[{\"protocol\":\"https\",\"certificateUrl\":\"url-to-certificate\"}]},\"additionalUnattendContent\":[{\"pass\":\"oobesystem\",\"component\":\"Microsoft-Windows-Shell-Setup\",\"settingName\":\"FirstLogonCommands\",\"content\":\"<XML unattend content>\"}]," + + "\"winRM\":{\"listeners\":[{\"protocol\":\"https\",\"certificateUrl\":\"url-to-certificate\"}]},\"additionalUnattendContent\":[{\"passName\":\"oobesystem\",\"componentName\":\"Microsoft-Windows-Shell-Setup\",\"settingName\":\"FirstLogonCommands\",\"content\":\"<XML unattend content>\"}]," + "\"enableAutomaticUpdates\":true}," + "\"secrets\":[{\"sourceVault\":{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/myresourcegroup1/providers/Microsoft.KeyVault/vaults/myvault1\"},\"vaultCertificates\":[{\"certificateUrl\":\"https://myvault1.vault.azure.net/secrets/SECRETNAME/SECRETVERSION\",\"certificateStore\":\"CERTIFICATESTORENAME\"}]}]},"; + "\"networkProfile\":{\"networkInterfaces\":[{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Network/networkInterfaces/windowsmachine167\"}]}," @@ -176,7 +176,7 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { + "\"managedDisk\":{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk\",\"storageAccountType\":\"Standard_LRS\"}}," + "\"dataDisks\":[{\"name\":\"mydatadisk1\",\"diskSizeGB\":\"1\",\"lun\":0,\"createOption\":\"Empty\",\"caching\":\"ReadWrite\",\"managedDisk\":{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk\",\"storageAccountType\":\"Standard_LRS\"}}]}," + "\"osProfile\":{\"computerName\":\"windowsmachine\",\"adminUsername\":\"azureuser\",\"adminPassword\":\"password\",\"customData\":\"\",\"windowsConfiguration\":{\"provisionVMAgent\":false," - + "\"winRM\":{\"listeners\":[{\"protocol\":\"https\",\"certificateUrl\":\"url-to-certificate\"}]},\"additionalUnattendContent\":[{\"pass\":\"oobesystem\",\"component\":\"Microsoft-Windows-Shell-Setup\",\"settingName\":\"FirstLogonCommands\",\"content\":\"<XML unattend content>\"}]," + + "\"winRM\":{\"listeners\":[{\"protocol\":\"https\",\"certificateUrl\":\"url-to-certificate\"}]},\"additionalUnattendContent\":[{\"passName\":\"oobesystem\",\"componentName\":\"Microsoft-Windows-Shell-Setup\",\"settingName\":\"FirstLogonCommands\",\"content\":\"<XML unattend content>\"}]," + "\"enableAutomaticUpdates\":true}," + "\"secrets\":[{\"sourceVault\":{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/myresourcegroup1/providers/Microsoft.KeyVault/vaults/myvault1\"},\"vaultCertificates\":[{\"certificateUrl\":\"https://myvault1.vault.azure.net/secrets/SECRETNAME/SECRETVERSION\",\"certificateStore\":\"CERTIFICATESTORENAME\"}]}]},"; + "\"networkProfile\":{\"networkInterfaces\":[{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Network/networkInterfaces/windowsmachine167\"}]}," http://git-wip-us.apache.org/repos/asf/jclouds/blob/bc520cfd/providers/azurecompute-arm/src/test/resources/createvirtualmachineresponse.json ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/resources/createvirtualmachineresponse.json b/providers/azurecompute-arm/src/test/resources/createvirtualmachineresponse.json index 4279f83..7402e14 100644 --- a/providers/azurecompute-arm/src/test/resources/createvirtualmachineresponse.json +++ b/providers/azurecompute-arm/src/test/resources/createvirtualmachineresponse.json @@ -58,8 +58,8 @@ }, "additionalUnattendContent": [ { - "pass":"oobesystem", - "component":"Microsoft-Windows-Shell-Setup", + "passName":"oobesystem", + "componentName":"Microsoft-Windows-Shell-Setup", "settingName":"FirstLogonCommands", "content":"<XML unattend content>" } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bc520cfd/providers/azurecompute-arm/src/test/resources/virtualmachine.json ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/resources/virtualmachine.json b/providers/azurecompute-arm/src/test/resources/virtualmachine.json index 51ad1fb..17d89b5 100644 --- a/providers/azurecompute-arm/src/test/resources/virtualmachine.json +++ b/providers/azurecompute-arm/src/test/resources/virtualmachine.json @@ -57,8 +57,8 @@ }, "additionalUnattendContent":[ { - "pass":"oobesystem", - "component":"Microsoft-Windows-Shell-Setup", + "passName":"oobesystem", + "componentName":"Microsoft-Windows-Shell-Setup", "settingName":"FirstLogonCommands", "content":"<XML unattend content>" } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bc520cfd/providers/azurecompute-arm/src/test/resources/virtualmachines.json ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/resources/virtualmachines.json b/providers/azurecompute-arm/src/test/resources/virtualmachines.json index 27ee602..e77e58b 100644 --- a/providers/azurecompute-arm/src/test/resources/virtualmachines.json +++ b/providers/azurecompute-arm/src/test/resources/virtualmachines.json @@ -58,8 +58,8 @@ }, "additionalUnattendContent":[ { - "pass":"oobesystem", - "component":"Microsoft-Windows-Shell-Setup", + "passName":"oobesystem", + "componentName":"Microsoft-Windows-Shell-Setup", "settingName":"FirstLogonCommands", "content":"<XML unattend content>" } @@ -158,8 +158,8 @@ }, "additionalUnattendContent":[ { - "pass":"oobesystem", - "component":"Microsoft-Windows-Shell-Setup", + "passName":"oobesystem", + "componentName":"Microsoft-Windows-Shell-Setup", "settingName":"FirstLogonCommands", "content":"<XML unattend content>" }
