Repository: jclouds-labs Updated Branches: refs/heads/master 036c68f2d -> ac03bac4d
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualmachines.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachines.json b/azurecompute-arm/src/test/resources/virtualmachines.json deleted file mode 100644 index e77e58b..0000000 --- a/azurecompute-arm/src/test/resources/virtualmachines.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "value": [ - { - "properties": { - "vmId": "27ee085b-d707-xxxx-yyyy-2370e2eb1cc1", - "licenseType": "Windows_Server", - "availabilitySet":{ - "id":"/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/availabilitySets/myAVSet" - }, - "hardwareProfile": { - "vmSize": "Standard_D1" - }, - "storageProfile": { - "imageReference": { - "publisher": "publisher", - "offer": "OFFER", - "sku": "sku", - "version": "ver", - "id": "/subscriptions/SUBSCRIPTIONID/providers/Microsoft.Compute/locations/westus/publishers/MicrosoftWindowsServerEssentials/artifactype/vmimage/offers/OFFER/skus/OFFER/versions/latest" - }, - "osDisk": { - "osType": "Windows", - "name": "windowsmachine", - "createOption": "FromImage", - "managedDisk": { - "id": "/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk", - "storageAccountType": "Standard_LRS" - }, - "caching": "ReadWrite" - }, - "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, - "enableAutomaticUpdates": true, - "winRM": { - "listeners":[{ - "protocol": "https", - "certificateUrl": "url-to-certificate" - }] - }, - "additionalUnattendContent":[ - { - "passName":"oobesystem", - "componentName":"Microsoft-Windows-Shell-Setup", - "settingName":"FirstLogonCommands", - "content":"<XML unattend content>" - } - ] - }, - "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" - } - ] - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": true, - "storageUri": "https://groupname2760.blob.core.windows.net/"; - } - }, - "provisioningState": "Creating" - }, - "id": "/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Compute/virtualMachines/windowsmachine", - "name": "windowsmachine", - "type": "Microsoft.Compute/virtualMachines", - "location": "westus" - }, - { - "properties": { - "vmId": "27ee085b-d707-xxxx-yyyy-2370e2eb1cc1", - "licenseType": "Windows_Server", - "availabilitySet":{ - "id":"/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/availabilitySets/myAVSet" - }, - "hardwareProfile": { - "vmSize": "Standard_D1" - }, - "storageProfile": { - "imageReference": { - "publisher": "publisher", - "offer": "OFFER", - "sku": "sku", - "version": "ver", - "id": "/subscriptions/SUBSCRIPTIONID/providers/Microsoft.Compute/locations/westus/publishers/MicrosoftWindowsServerEssentials/artifactype/vmimage/offers/OFFER/skus/OFFER/versions/latest" - }, - "osDisk": { - "osType": "Windows", - "name": "windowsmachine", - "createOption": "FromImage", - "managedDisk": { - "id": "/subscriptions/SUBSCRIPTIONID/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk", - "storageAccountType": "Standard_LRS" - }, - "vhd": { - "uri": "https://groupname2760.blob.core.windows.net/vhds/windowsmachine201624102936.vhd"; - }, - "caching": "ReadWrite" - }, - "dataDisks":[ - { - "name":"mydatadisk1", - "diskSizeGB":"1", - "lun": 0, - "vhd": { - "uri" : "http://mystorage1.blob.core.windows.net/vhds/mydatadisk1.vhd"; - }, - "createOption":"Empty" - } - ] - }, - "osProfile": { - "computerName": "windowsmachine", - "adminUsername": "azureuser", - "adminPassword":"password", - "customData":"", - "windowsConfiguration": { - "provisionVMAgent": false, - "enableAutomaticUpdates": true, - "winRM": { - "listeners":[{ - "protocol": "https", - "certificateUrl": "url-to-certificate" - }] - }, - "additionalUnattendContent":[ - { - "passName":"oobesystem", - "componentName":"Microsoft-Windows-Shell-Setup", - "settingName":"FirstLogonCommands", - "content":"<XML unattend content>" - } - ] - }, - "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" - } - ] - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": true, - "storageUri": "https://groupname2760.blob.core.windows.net/"; - } - }, - "provisioningState": "Creating" - }, - "id": "/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Compute/virtualMachines/windowsmachine", - "name": "windowsmachine", - "type": "Microsoft.Compute/virtualMachines", - "location": "westus" - } - ] -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualmachinescalesetget.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachinescalesetget.json b/azurecompute-arm/src/test/resources/virtualmachinescalesetget.json deleted file mode 100644 index c99eb39..0000000 --- a/azurecompute-arm/src/test/resources/virtualmachinescalesetget.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "sku": { - "name": "Standard_A1", - "tier": "Standard", - "capacity": 4 - }, - "properties": { - "singlePlacementGroup": true, - "upgradePolicy": { - "mode": "Manual" - }, - "virtualMachineProfile": { - "osProfile": { - "computerNamePrefix": "vmmsprefix", - "adminUsername": "jclouds", - "linuxConfiguration": { - "disablePasswordAuthentication": false - }, - "secrets": [] - }, - "storageProfile": { - "osDisk": { - "createOption": "FromImage", - "caching": "None", - "managedDisk": { - "storageAccountType": "Standard_LRS" - } - }, - "imageReference": { - "publisher": "Canonical", - "offer": "UbuntuServer", - "sku": "16.04-LTS", - "version": "latest" - } - }, - "networkProfile": {"networkInterfaceConfigurations":[{"name":"nicconfig1","properties":{"primary":true,"enableAcceleratedNetworking":false,"dnsSettings":{"dnsServers":["8.8.8.8"]},"ipConfigurations":[{"name":"ipconfig1","properties":{"publicIPAddressConfiguration":{"name":"pub1","properties":{"idleTimeoutInMinutes":15}},"subnet":{"id":"/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxx/resourceGroups/jcloud-eastus/providers/Microsoft.Network/virtualNetworks/jclouds-eastus-virtualNetworkName/subnets/jclouds-eastus-subnet"},"privateIPAddressVersion":"IPv4"}}]}}]}, - "extensionProfile": { - "extensions": [ - { - "properties": { - "publisher": "Microsoft.compute", - "type": "CustomScriptExtension", - "typeHandlerVersion": "1.1", - "autoUpgradeMinorVersion": false, - "settings": {"fileUris":["https://mystorage1.blob.core.windows.net/winvmextekfacnt/SampleCmd_1.cmd"],"commandToExecute":"SampleCmd_1.cmd"} - }, - "name": "extensionName" - } - ] - } - }, - "provisioningState": "Creating", - "overprovision": true, - "uniqueId": "xxxxx-xxxx-xxxx-xxxx-xxxxxx" - }, - "type": "Microsoft.Compute/virtualMachineScaleSets", - "location": "eastus", - "tags": { - "test": "test" - }, - "id": "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxx/resourceGroups/jcloud-eastus/providers/Microsoft.Compute/virtualMachineScaleSets/jclouds-vmssname", - "name": "jclouds-vmssname" -} - http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualmachinescalesetgetwhen404.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachinescalesetgetwhen404.json b/azurecompute-arm/src/test/resources/virtualmachinescalesetgetwhen404.json deleted file mode 100644 index b6fbeaa..0000000 --- a/azurecompute-arm/src/test/resources/virtualmachinescalesetgetwhen404.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "error": { - "code": "ResourceNotFound", - "message": "The Resource 'Microsoft.Compute/virtualMachineScaleSets/jclouds-vmssname1' under resource group 'jcloud-eastus' was not found." - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualmachinescalesetlist.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachinescalesetlist.json b/azurecompute-arm/src/test/resources/virtualmachinescalesetlist.json deleted file mode 100644 index b5bd063..0000000 --- a/azurecompute-arm/src/test/resources/virtualmachinescalesetlist.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "value": [{ - "sku": { - "name": "Standard_A1", - "tier": "Standard", - "capacity": 4 - }, - "properties": { - "singlePlacementGroup": true, - "upgradePolicy": { - "mode": "Manual", - "automaticOSUpgrade": false - }, - "virtualMachineProfile": { - "osProfile": { - "computerNamePrefix": "vmmsprefix", - "adminUsername": "jclouds", - "linuxConfiguration": { - "disablePasswordAuthentication": false - }, - "secrets": [] - }, - "storageProfile": { - "osDisk": { - "createOption": "FromImage", - "caching": "None", - "managedDisk": { - "storageAccountType": "Standard_LRS" - } - }, - "imageReference": { - "publisher": "Canonical", - "offer": "UbuntuServer", - "sku": "16.04-LTS", - "version": "latest" - } - }, - "networkProfile": { - "networkInterfaceConfigurations": [{ - "name": "nicconfig1", - "properties": { - "primary": true, - "enableAcceleratedNetworking": false, - "dnsSettings": { - "dnsServers": ["8.8.8.8"] - }, - "ipConfigurations": [{ - "name": "ipconfig1", - "properties": { - "publicIPAddressConfiguration": { - "name": "pub1", - "properties": { - "idleTimeoutInMinutes": 15 - } - }, - "subnet": { - "id": "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxx/resourceGroups/jcloud-eastus/providers/Microsoft.Network/virtualNetworks/jclouds-eastus-virtualNetworkName/subnets/jclouds-eastus-subnet" - }, - "privateIPAddressVersion": "IPv4" - } - }] - } - }] - }, - "extensionProfile": { - "extensions": [{ - "properties": { - "publisher": "Microsoft.compute", - "type": "CustomScriptExtension", - "typeHandlerVersion": "1.1", - "autoUpgradeMinorVersion": false, - "settings": { - "fileUris": ["https://mystorage1.blob.core.windows.net/winvmextekfacnt/SampleCmd_1.cmd";], - "commandToExecute": "SampleCmd_1.cmd" - } - }, - "name": "extensionName" - }] - } - }, - "provisioningState": "Failed", - "overprovision": true, - "uniqueId": "xxxxx-xxxx-xxxx-xxxx-xxxxxx" - }, - "type": "Microsoft.Compute/virtualMachineScaleSets", - "location": "eastus", - "tags": { - "test": "test" - }, - "id": "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxx/resourceGroups/jcloud-eastus/providers/Microsoft.Compute/virtualMachineScaleSets/jclouds-vmssname", - "name": "jclouds-vmssname" - }] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualmachinescalesetlistwhen404.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachinescalesetlistwhen404.json b/azurecompute-arm/src/test/resources/virtualmachinescalesetlistwhen404.json deleted file mode 100644 index 635083c..0000000 --- a/azurecompute-arm/src/test/resources/virtualmachinescalesetlistwhen404.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "error": { - "code": "ResourceGroupNotFound", - "message": "Resource group 'jcloud-eastus1' could not be found." - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualmachinescalesetresponsecreateorupdate.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachinescalesetresponsecreateorupdate.json b/azurecompute-arm/src/test/resources/virtualmachinescalesetresponsecreateorupdate.json deleted file mode 100644 index 20ecd71..0000000 --- a/azurecompute-arm/src/test/resources/virtualmachinescalesetresponsecreateorupdate.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "location": "eastus", - "sku": { - "name": "Standard_A1", - "tier": "Standard", - "capacity": 10 - }, - "properties": { - "singlePlacementGroup": true, - "overProvision": true, - "upgradePolicy": { - "mode": "Manual" - }, - "virtualMachineProfile": { - "storageProfile": { - "imageReference": { - "publisher": "Canonical", - "offer": "UbuntuServer", - "sku": "16.04-LTS", - "version": "latest" - }, - "osDisk": { - "osType": "Windows", - "createOption": "FromImage", - "managedDisk": { - "storageAccountType": "Standard_LRS" - } - }, - "dataDisks": [{ - "diskSizeGB": "10", - "lun": 1, - "createOption": "Unrecognized", - "caching": "None", - "managedDisk": { - "storageAccountType": "Standard_LRS" - } - } - ] - }, - "osProfile": { - "computerNamePrefix": "jclouds-vmssname", - "adminUsername": "jclouds", - "adminPassword": "jClouds1!", - "linuxConfiguration": { - "disablePasswordAuthentication": "False" - }, - "secrets": [] - }, - "networkProfile": { - "networkInterfaceConfigurations": [{ - "name": "nicconfig1", - "properties": { - "primary": true, - "enableAcceleratedNetworking": false, - "dnsSettings": { - "dnsServers": ["8.8.8.8"] - }, - "ipConfigurations": [{ - "name": "ipconfig1", - "properties": { - "publicIPAddressConfiguration": { - "name": "pub1", - "properties": { - "idleTimeoutInMinutes": 15 - } - }, - "subnet": { - "name": "virtualNetworkName", - "id": "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxx/resourceGroups/jcloud-eastus/providers/Microsoft.Network/virtualNetworks/jclouds-eastus-virtualNetworkName/subnets/jclouds-eastus-subnet", - "properties": {} - }, - "privateIPAddressVersion": "IPv4", - "loadBalancerBackendAddressPools": [], - "loadBalancerInboundNatPools": [] - } - } - ] - } - } - ] - }, - "extensionProfile": { - "extensions": [{ - "name": "extensionName", - "properties": { - "publisher": "Microsoft.compute", - "type": "CustomScriptExtension", - "typeHandlerVersion": "1.1", - "autoUpgradeMinorVersion": false, - "settings": { - "fileUris": ["https://mystorage1.blob.core.windows.net/winvmextekfacnt/SampleCmd_1.cmd";], - "commandToExecute": "SampleCmd_1.cmd" - }, - "protectedSettings": { - "StorageAccountKey": "jclouds-accountkey" - } - } - } - ] - } - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/virtualnetwork.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualnetwork.json b/azurecompute-arm/src/test/resources/virtualnetwork.json deleted file mode 100644 index 924c79c..0000000 --- a/azurecompute-arm/src/test/resources/virtualnetwork.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "mockvirtualnetwork", - "id": "/subscriptions/SUBSCRIPTIONID/resourceGroups/azurearmtesting/providers/Microsoft.Network/virtualNetworks/mockvirtualnetwork", - "etag": "W/\"0dcd223f-670c-49ca-abe7-5978d127c131\"", - "type": "Microsoft.Network/virtualNetworks", - "location": "northeurope", - "tags": { - "tagkey": "tagvalue" - }, - "properties": { - "provisioningState": "Succeeded", - "resourceGuid": "1568c76a-73a4-4a60-8dfb-53b823197ccb", - "addressSpace": { - "addressPrefixes": [ - "10.2.0.0/16" - ] - }, - "subnets": [] - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/test/resources/vmsizes.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/vmsizes.json b/azurecompute-arm/src/test/resources/vmsizes.json deleted file mode 100644 index 19ec780..0000000 --- a/azurecompute-arm/src/test/resources/vmsizes.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "value": [ - { - "name": "Standard_A0", - "numberOfCores": 1, - "osDiskSizeInMB": 1047552, - "resourceDiskSizeInMB": 20480, - "memoryInMB": 768, - "maxDataDiskCount": 1 - }, - { - "name": "Standard_A1", - "numberOfCores": 1, - "osDiskSizeInMB": 1047552, - "resourceDiskSizeInMB": 71680, - "memoryInMB": 1792, - "maxDataDiskCount": 2 - }, - { - "name": "Standard_A2", - "numberOfCores": 2, - "osDiskSizeInMB": 1047552, - "resourceDiskSizeInMB": 138240, - "memoryInMB": 3584, - "maxDataDiskCount": 4 - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f660072..2904e46 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,6 @@ </repositories> <modules> - <module>azurecompute-arm</module> <module>azurecompute</module> <module>cdmi</module> <module>cloudsigma2</module>
