summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-07-23 16:55:25 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-07-23 16:55:25 +0900
commit1f55e116adbf00a0a5bd990f99a680e9d6b1618e (patch)
treed476bd802604d7addc997d350c361454bce0d3ea /nova/tests
parent1a18ea6d738b513e03e3f0eddfb9f01dff9addca (diff)
ec2utils: factor generic helper function into generic place
This patch moves out a helper function, properties_root_device_name(), into generic file nova/block_device.py.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_api.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index 26ac5ff24..d5f653bc6 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -27,6 +27,7 @@ import random
import StringIO
import webob
+from nova import block_device
from nova import context
from nova import exception
from nova import test
@@ -147,10 +148,12 @@ class Ec2utilsTestCase(test.TestCase):
properties0 = {'mappings': mappings}
properties1 = {'root_device_name': '/dev/sdb', 'mappings': mappings}
- root_device_name = ec2utils.properties_root_device_name(properties0)
+ root_device_name = block_device.properties_root_device_name(
+ properties0)
self.assertEqual(root_device_name, '/dev/sda1')
- root_device_name = ec2utils.properties_root_device_name(properties1)
+ root_device_name = block_device.properties_root_device_name(
+ properties1)
self.assertEqual(root_device_name, '/dev/sdb')
def test_mapping_prepend_dev(self):