diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-27 21:49:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-27 21:49:22 +0000 |
| commit | 0a797d50dbe62d8ddebcd56bec2ffbc4ba07a3e2 (patch) | |
| tree | 92e73a384face0a2164ced83af24c91df6e21160 | |
| parent | 5a2a1aee498d1501f3fdf6df25990ecc73e47a02 (diff) | |
| parent | f7ef2b09a195f853cecaa28db710d643a8e30f78 (diff) | |
| download | nova-0a797d50dbe62d8ddebcd56bec2ffbc4ba07a3e2.tar.gz | |
Merge "Fix 'os-interface' resource name for Nova V2.1"
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/attach_interfaces.py | 2 | ||||
| -rw-r--r-- | nova/tests/integrated/v3/test_attach_interfaces.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/openstack/compute/plugins/v3/attach_interfaces.py b/nova/api/openstack/compute/plugins/v3/attach_interfaces.py index cb414d78ca..e8ffc8afd2 100644 --- a/nova/api/openstack/compute/plugins/v3/attach_interfaces.py +++ b/nova/api/openstack/compute/plugins/v3/attach_interfaces.py @@ -188,7 +188,7 @@ class AttachInterfaces(extensions.V3APIExtensionBase): version = 1 def get_resources(self): - res = [extensions.ResourceExtension(ALIAS, + res = [extensions.ResourceExtension('os-interface', InterfaceAttachmentController(), parent=dict( member_name='server', diff --git a/nova/tests/integrated/v3/test_attach_interfaces.py b/nova/tests/integrated/v3/test_attach_interfaces.py index dad4bdf232..24a35b5783 100644 --- a/nova/tests/integrated/v3/test_attach_interfaces.py +++ b/nova/tests/integrated/v3/test_attach_interfaces.py @@ -103,7 +103,7 @@ class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): def test_list_interfaces(self): instance_uuid = self._post_server() - response = self._do_get('servers/%s/os-attach-interfaces' + response = self._do_get('servers/%s/os-interface' % instance_uuid) subs = { 'ip_address': '192.168.1.3', @@ -125,7 +125,7 @@ class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): instance_uuid = self._post_server() port_id = 'ce531f90-199f-48c0-816c-13e38010b442' self._stub_show_for_instance(instance_uuid, port_id) - response = self._do_get('servers/%s/os-attach-interfaces/%s' % + response = self._do_get('servers/%s/os-interface/%s' % (instance_uuid, port_id)) subs = { 'ip_address': '192.168.1.3', @@ -150,7 +150,7 @@ class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): 'mac_addr': 'fa:16:3e:4c:2c:30', } self._stub_show_for_instance(instance_uuid, subs['port_id']) - response = self._do_post('servers/%s/os-attach-interfaces' + response = self._do_post('servers/%s/os-interface' % instance_uuid, 'attach-interfaces-create-req', subs) subs.update(self._get_regexes()) @@ -160,7 +160,7 @@ class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): def test_delete_interfaces(self): instance_uuid = self._post_server() port_id = 'ce531f90-199f-48c0-816c-13e38010b442' - response = self._do_delete('servers/%s/os-attach-interfaces/%s' % + response = self._do_delete('servers/%s/os-interface/%s' % (instance_uuid, port_id)) self.assertEqual(response.status, 202) self.assertEqual(response.read(), '') |