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.
This commit is contained in:
@@ -27,6 +27,7 @@ import random
|
|||||||
import StringIO
|
import StringIO
|
||||||
import webob
|
import webob
|
||||||
|
|
||||||
|
from nova import block_device
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import test
|
from nova import test
|
||||||
@@ -147,10 +148,12 @@ class Ec2utilsTestCase(test.TestCase):
|
|||||||
properties0 = {'mappings': mappings}
|
properties0 = {'mappings': mappings}
|
||||||
properties1 = {'root_device_name': '/dev/sdb', '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')
|
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')
|
self.assertEqual(root_device_name, '/dev/sdb')
|
||||||
|
|
||||||
def test_mapping_prepend_dev(self):
|
def test_mapping_prepend_dev(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user