Updated XML generation for parts added for handling VMImages
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ef5b24f2 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ef5b24f2 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ef5b24f2 Branch: refs/heads/trunk Commit: ef5b24f28d1890c744a79b448ca71330f03dfe53 Parents: 086ad18 Author: Michael Bennett <[email protected]> Authored: Mon Nov 24 09:42:33 2014 -0500 Committer: Michael Bennett <[email protected]> Committed: Mon Nov 24 09:42:33 2014 -0500 ---------------------------------------------------------------------- libcloud/compute/drivers/azure.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ef5b24f2/libcloud/compute/drivers/azure.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/azure.py b/libcloud/compute/drivers/azure.py index 9804814..65cd0aa 100644 --- a/libcloud/compute/drivers/azure.py +++ b/libcloud/compute/drivers/azure.py @@ -70,7 +70,7 @@ From http://msdn.microsoft.com/en-us/library/windowsazure/dn197896.aspx """ AZURE_COMPUTE_INSTANCE_TYPES = { 'A0': { - 'id': 'extra small', + 'id': 'ExtraSmall', 'name': 'Extra Small Instance', 'ram': 768, 'disk': 127, @@ -80,7 +80,7 @@ AZURE_COMPUTE_INSTANCE_TYPES = { 'cores': 'Shared' }, 'A1': { - 'id': 'small', + 'id': 'Small', 'name': 'Small Instance', 'ram': 1792, 'disk': 127, @@ -90,7 +90,7 @@ AZURE_COMPUTE_INSTANCE_TYPES = { 'cores': 1 }, 'A2': { - 'id': 'medium', + 'id': 'Medium', 'name': 'Medium Instance', 'ram': 3584, 'disk': 127, @@ -100,7 +100,7 @@ AZURE_COMPUTE_INSTANCE_TYPES = { 'cores': 2 }, 'A3': { - 'id': 'large', + 'id': 'Large', 'name': 'Large Instance', 'ram': 7168, 'disk': 127, @@ -110,7 +110,7 @@ AZURE_COMPUTE_INSTANCE_TYPES = { 'cores': 4 }, 'A4': { - 'id': 'extra large', + 'id': 'ExtraLarge', 'name': 'Extra Large Instance', 'ram': 14336, 'disk': 127, @@ -2326,8 +2326,9 @@ class AzureXmlSerializer(object): ) if vm_image_name is not None: - xml += AzureXmlSerializer.data_to_xml( - [('VMImageName', vm_image_name)] + AzureXmlSerializer.data_to_xml( + [('VMImageName', vm_image_name)], + xml ) if role_size is not None:
