diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-15 17:35:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-15 17:35:40 +0000 |
| commit | f14cd697c005f946886f90f7af8379c58e062ed1 (patch) | |
| tree | 5f7992b43577dd5bf7636d93c256593b4ab7b038 | |
| parent | d802d807049478d1fe30dedcbcdae28f666e61b3 (diff) | |
| parent | 1759d5825c8207492c8960711130d9eb85e5d631 (diff) | |
Merge "Fix OS-DCF:diskconfig XML handling"
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 4 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index ce40e087b..ef1ab23ca 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -222,11 +222,11 @@ class CommonDeserializer(wsgi.MetadataXMLDeserializer): # anyone that might be using it. auto_disk_config = server_node.getAttribute('auto_disk_config') if auto_disk_config: - server['OS-DCF:diskConfig'] = utils.bool_from_str(auto_disk_config) + server['OS-DCF:diskConfig'] = auto_disk_config auto_disk_config = server_node.getAttribute('OS-DCF:diskConfig') if auto_disk_config: - server['OS-DCF:diskConfig'] = utils.bool_from_str(auto_disk_config) + server['OS-DCF:diskConfig'] = auto_disk_config config_drive = server_node.getAttribute('config_drive') if config_drive: diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 2dfefc541..decf5a817 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -2191,11 +2191,11 @@ class ServersControllerCreateTest(test.TestCase): # NOTE(vish): the extension converts OS-DCF:disk_config into # auto_disk_config, so we are testing with # the_internal_value - params = {'auto_disk_config': True} + params = {'auto_disk_config': 'AUTO'} old_create = compute_api.API.create def create(*args, **kwargs): - self.assertEqual(kwargs['auto_disk_config'], True) + self.assertEqual(kwargs['auto_disk_config'], 'AUTO') return old_create(*args, **kwargs) self.stubs.Set(compute_api.API, 'create', create) @@ -3762,14 +3762,14 @@ class TestServerCreateRequestXMLDeserializer(test.TestCase): <server xmlns="http://docs.openstack.org/compute/api/v2" xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" name="new-server-test" imageRef="1" flavorRef="1" - OS-DCF:diskConfig="True"> + OS-DCF:diskConfig="AUTO"> </server>""" request = self.deserializer.deserialize(serial_request) expected = {"server": { "name": "new-server-test", "imageRef": "1", "flavorRef": "1", - "OS-DCF:diskConfig": True, + "OS-DCF:diskConfig": "AUTO", }} self.assertEquals(request['body'], expected) |