summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-07-29 10:51:50 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-07-29 10:51:50 +0900
commita52b643b18e1bac18b642ecfd781809eb5612763 (patch)
tree21e9260fe0c8c1167286a31b3542f70045441f57 /nova/tests
parent916231fd945c5e726a21decdf1b6370b2fcefe70 (diff)
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.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_cloud.py6
1 files changed, 4 insertions, 2 deletions
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):