libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject git commit: Move network interface and network interface attachment extra attributes map from inline to a top-level constant.
Date Sun, 05 Jan 2014 01:26:33 GMT
Updated Branches:
  refs/heads/trunk 7c0720aec -> 411877f45


Move network interface and network interface attachment extra attributes map
from inline to a top-level constant.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/411877f4
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/411877f4
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/411877f4

Branch: refs/heads/trunk
Commit: 411877f45662cdd344e15ef3add8169efde63020
Parents: 7c0720a
Author: Tomaz Muraus <tomaz@apache.org>
Authored: Sat Jan 4 18:02:10 2014 +0100
Committer: Tomaz Muraus <tomaz@apache.org>
Committed: Sat Jan 4 18:02:10 2014 +0100

----------------------------------------------------------------------
 libcloud/compute/drivers/ec2.py | 139 +++++++++++++++++------------------
 1 file changed, 69 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/411877f4/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index c116ea5..ebeae25 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -571,6 +571,70 @@ RESOURCE_EXTRA_ATTRIBUTES_MAP = {
             'transform_func': str
         }
     },
+    'network_interface': {
+        'subnet_id': {
+            'xpath': 'subnetId',
+            'transform_func': str
+        },
+        'vpc_id': {
+            'xpath': 'vpcId',
+            'transform_func': str
+        },
+        'zone': {
+            'xpath': 'availabilityZone',
+            'transform_func': str
+        },
+        'description': {
+            'xpath': 'description',
+            'transform_func': str
+        },
+        'owner_id': {
+            'xpath': 'ownerId',
+            'transform_func': str
+        },
+        'mac_address': {
+            'xpath': 'macAddress',
+            'transform_func': str
+        },
+        'private_dns_name': {
+            'xpath': 'privateIpAddressesSet/privateDnsName',
+            'transform_func': str
+        },
+        'source_dest_check': {
+            'xpath': 'sourceDestCheck',
+            'transform_func': str
+        }
+    },
+    'network_interface_attachment': {
+        'attachment_id': {
+            'xpath': 'attachment/attachmentId',
+            'transform_func': str
+        },
+        'instance_id': {
+            'xpath': 'attachment/instanceId',
+            'transform_func': str
+        },
+        'owner_id': {
+            'xpath': 'attachment/instanceOwnerId',
+            'transform_func': str
+        },
+        'device_index': {
+            'xpath': 'attachment/deviceIndex',
+            'transform_func': int
+        },
+        'status': {
+            'xpath': 'attachment/status',
+            'transform_func': str
+        },
+        'attach_time': {
+            'xpath': 'attachment/attachTime',
+            'transform_func': parse_date
+        },
+        'delete': {
+            'xpath': 'attachment/deleteOnTermination',
+            'transform_func': str
+        }
+    },
     'reserved_node': {
         'instance_type': {
             'xpath': 'instanceType',
@@ -1262,79 +1326,14 @@ class BaseEC2NodeDriver(NodeDriver):
                                                 xpath='primary',
                                                 namespace=NAMESPACE)})
 
-        # Build our attachment extra attributes map
-        attachment_attributes_map = {
-            'attachment_id': {
-                'xpath': 'attachment/attachmentId',
-                'transform_func': str
-            },
-            'instance_id': {
-                'xpath': 'attachment/instanceId',
-                'transform_func': str
-            },
-            'owner_id': {
-                'xpath': 'attachment/instanceOwnerId',
-                'transform_func': str
-            },
-            'device_index': {
-                'xpath': 'attachment/deviceIndex',
-                'transform_func': int
-            },
-            'status': {
-                'xpath': 'attachment/status',
-                'transform_func': str
-            },
-            'attach_time': {
-                'xpath': 'attachment/attachTime',
-                'transform_func': parse_date
-            },
-            'delete': {
-                'xpath': 'attachment/deleteOnTermination',
-                'transform_func': str
-            },
-        }
-
         # Build our attachment dictionary which we will add into extra later
-        attachment = self._get_extra_dict(element, attachment_attributes_map)
-
-        # Build our extra attributes map
-        extra_attributes_map = {
-            'subnet_id': {
-                'xpath': 'subnetId',
-                'transform_func': str
-            },
-            'vpc_id': {
-                'xpath': 'vpcId',
-                'transform_func': str
-            },
-            'zone': {
-                'xpath': 'availabilityZone',
-                'transform_func': str
-            },
-            'description': {
-                'xpath': 'description',
-                'transform_func': str
-            },
-            'owner_id': {
-                'xpath': 'ownerId',
-                'transform_func': str
-            },
-            'mac_address': {
-                'xpath': 'macAddress',
-                'transform_func': str
-            },
-            'private_dns_name': {
-                'xpath': 'privateIpAddressesSet/privateDnsName',
-                'transform_func': str
-            },
-            'source_dest_check': {
-                'xpath': 'sourceDestCheck',
-                'transform_func': str
-            }
-        }
+        attributes_map = \
+            RESOURCE_EXTRA_ATTRIBUTES_MAP['network_interface_attachment']
+        attachment = self._get_extra_dict(element, attributes_map)
 
         # Build our extra dict
-        extra = self._get_extra_dict(element, extra_attributes_map)
+        attributes_map = RESOURCE_EXTRA_ATTRIBUTES_MAP['network_interface']
+        extra = self._get_extra_dict(element, attributes_map)
 
         # Include our previously built items as well
         extra['tags'] = tags


Mime
View raw message