diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-07-29 10:51:50 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-07-29 10:51:50 +0900 |
| commit | a52b643b18e1bac18b642ecfd781809eb5612763 (patch) | |
| tree | 21e9260fe0c8c1167286a31b3542f70045441f57 | |
| parent | 916231fd945c5e726a21decdf1b6370b2fcefe70 (diff) | |
| download | nova-a52b643b18e1bac18b642ecfd781809eb5612763.tar.gz nova-a52b643b18e1bac18b642ecfd781809eb5612763.tar.xz nova-a52b643b18e1bac18b642ecfd781809eb5612763.zip | |
api/ec2: rename CloudController._get_instance_mapping into _format_instance_mapping
This patch renames nova.api.ec2.cloud.CouldController._get_instance_mapping
to _format_instance_mapping in order to make it clear that the method is
for API formatting, not for internal use.
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_cloud.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 65f18ddbf..9b0ec2fde 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -237,7 +237,7 @@ class CloudController(object): state = 'available' return image['properties'].get('image_state', state) - def _get_instance_mapping(self, ctxt, instance_ref): + def _format_instance_mapping(self, ctxt, instance_ref): root_device_name = instance_ref['root_device_name'] if root_device_name is None: return _DEFAULT_MAPPINGS @@ -287,7 +287,7 @@ class CloudController(object): security_groups = db.security_group_get_by_instance(ctxt, instance_ref['id']) security_groups = [x['name'] for x in security_groups] - mappings = self._get_instance_mapping(ctxt, instance_ref) + mappings = self._format_instance_mapping(ctxt, instance_ref) data = { 'user-data': self._format_user_data(instance_ref), 'meta-data': { diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index 507b35d22..ac959bd63 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -1505,9 +1505,11 @@ class CloudTestCase(test.TestCase): 'ephemeral1': '/dev/sdd', 'ephemeral2': '/dev/sd3'} - self.assertEqual(self.cloud._get_instance_mapping(ctxt, instance_ref0), + self.assertEqual(self.cloud._format_instance_mapping(ctxt, + instance_ref0), cloud._DEFAULT_MAPPINGS) - self.assertEqual(self.cloud._get_instance_mapping(ctxt, instance_ref1), + self.assertEqual(self.cloud._format_instance_mapping(ctxt, + instance_ref1), expected) def test_describe_instance_attribute(self): |