From c19ea390ecbe045728444d49f40920329a1d0743 Mon Sep 17 00:00:00 2001 From: Simon Chang Date: Sat, 1 Mar 2014 17:14:38 -0500 Subject: [PATCH] Added os-security-groups prefix Added os-security-groups prefix to the security_groups attribute in json response. Change-Id: Id2a4a92da0c9751abc5c37f06fc2484ba80a8a09 Closes-Bug: #1223309 --- doc/v3/api_samples/all_extensions/server-get-resp.json | 2 +- doc/v3/api_samples/all_extensions/server-post-resp.json | 2 +- .../api_samples/all_extensions/servers-details-resp.json | 2 +- doc/v3/api_samples/os-security-groups/server-get-resp.json | 2 +- .../api_samples/os-security-groups/server-post-resp.json | 2 +- .../os-security-groups/servers-detail-resp.json | 2 +- nova/api/openstack/compute/plugins/v3/security_groups.py | 7 ++++--- .../openstack/compute/plugins/v3/test_security_groups.py | 2 +- .../v3/api_samples/all_extensions/server-get-resp.json.tpl | 2 +- .../api_samples/all_extensions/server-post-resp.json.tpl | 2 +- .../all_extensions/servers-details-resp.json.tpl | 2 +- .../os-security-groups/server-get-resp.json.tpl | 2 +- .../os-security-groups/server-post-resp.json.tpl | 2 +- .../os-security-groups/servers-detail-resp.json.tpl | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) diff --git a/doc/v3/api_samples/all_extensions/server-get-resp.json b/doc/v3/api_samples/all_extensions/server-get-resp.json index 4d42e45eeada..8826f360dc53 100644 --- a/doc/v3/api_samples/all_extensions/server-get-resp.json +++ b/doc/v3/api_samples/all_extensions/server-get-resp.json @@ -66,7 +66,7 @@ "os-server-usage:launched_at": "2013-09-23T13:37:00.880302", "os-server-usage:terminated_at": null, "progress": 0, - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "default" } diff --git a/doc/v3/api_samples/all_extensions/server-post-resp.json b/doc/v3/api_samples/all_extensions/server-post-resp.json index fbc0737e2dee..495c2a9c7db8 100644 --- a/doc/v3/api_samples/all_extensions/server-post-resp.json +++ b/doc/v3/api_samples/all_extensions/server-post-resp.json @@ -14,7 +14,7 @@ ], "os-access-ips:access_ip_v4": "", "os-access-ips:access_ip_v6": "", - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "default" } diff --git a/doc/v3/api_samples/all_extensions/servers-details-resp.json b/doc/v3/api_samples/all_extensions/servers-details-resp.json index d47c655e1372..9467fb4a401b 100644 --- a/doc/v3/api_samples/all_extensions/servers-details-resp.json +++ b/doc/v3/api_samples/all_extensions/servers-details-resp.json @@ -67,7 +67,7 @@ "os-server-usage:launched_at": "2013-09-23T13:53:12.774549", "os-server-usage:terminated_at": null, "progress": 0, - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "default" } diff --git a/doc/v3/api_samples/os-security-groups/server-get-resp.json b/doc/v3/api_samples/os-security-groups/server-get-resp.json index 3384537e8a0b..c25a140d2a4b 100644 --- a/doc/v3/api_samples/os-security-groups/server-get-resp.json +++ b/doc/v3/api_samples/os-security-groups/server-get-resp.json @@ -47,7 +47,7 @@ }, "name": "new-server-test", "progress": 0, - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "test" } diff --git a/doc/v3/api_samples/os-security-groups/server-post-resp.json b/doc/v3/api_samples/os-security-groups/server-post-resp.json index 43a751cf24f9..4f1d6b752c68 100644 --- a/doc/v3/api_samples/os-security-groups/server-post-resp.json +++ b/doc/v3/api_samples/os-security-groups/server-post-resp.json @@ -12,7 +12,7 @@ "rel": "bookmark" } ], - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "test" } diff --git a/doc/v3/api_samples/os-security-groups/servers-detail-resp.json b/doc/v3/api_samples/os-security-groups/servers-detail-resp.json index b4d2790efb7e..49463446ef69 100644 --- a/doc/v3/api_samples/os-security-groups/servers-detail-resp.json +++ b/doc/v3/api_samples/os-security-groups/servers-detail-resp.json @@ -48,7 +48,7 @@ }, "name": "new-server-test", "progress": 0, - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "test" } diff --git a/nova/api/openstack/compute/plugins/v3/security_groups.py b/nova/api/openstack/compute/plugins/v3/security_groups.py index 6df43cb6464d..9d807a52981c 100644 --- a/nova/api/openstack/compute/plugins/v3/security_groups.py +++ b/nova/api/openstack/compute/plugins/v3/security_groups.py @@ -58,7 +58,8 @@ class SecurityGroupsOutputController(wsgi.Controller): instance = req.get_db_instance(server['id']) groups = instance.get(key) if groups: - server[key] = [{"name": group["name"]} for group in groups] + server[ATTRIBUTE_NAME] = [{"name": group["name"]} + for group in groups] else: # If method is a POST we get the security groups intended for an # instance from the request. The reason for this is if using @@ -72,7 +73,7 @@ class SecurityGroupsOutputController(wsgi.Controller): for server in servers: groups = sg_instance_bindings.get(server['id']) if groups: - server[key] = groups + server[ATTRIBUTE_NAME] = groups # In this section of code len(servers) == 1 as you can only POST # one server in an API request. @@ -81,7 +82,7 @@ class SecurityGroupsOutputController(wsgi.Controller): req_obj = json.loads(req.body) # Add security group to server, if no security group was in # request add default since that is the group it is part of - servers[0][key] = req_obj['server'].get( + servers[0][ATTRIBUTE_NAME] = req_obj['server'].get( ATTRIBUTE_NAME, [{'name': 'default'}]) def _show(self, req, resp_obj): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py b/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py index a29001a9331d..41842add51a7 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py @@ -134,7 +134,7 @@ class SecurityGroupsOutputTest(test.TestCase): return jsonutils.loads(body).get('servers') def _get_groups(self, server): - return server.get('security_groups') + return server.get('os-security-groups:security_groups') def test_create(self): url = '/v3/servers' diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl index 9a2c4c7efb44..dc33f789defd 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl @@ -62,7 +62,7 @@ "os-server-usage:launched_at": "%(timestamp)s", "os-server-usage:terminated_at": null, "progress": 0, - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "default" } diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl index a3044a0c2014..740c3909b970 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" } ], - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "default" } diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl index 83120f1818f5..b307bc6c2098 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl @@ -63,7 +63,7 @@ "os-server-usage:launched_at": "%(timestamp)s", "os-server-usage:terminated_at": null, "progress": 0, - "security_groups": [ + "os-security-groups:security_groups": [ { "name": "default" } diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl index d5f2afceb193..537ec397ff62 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl @@ -50,7 +50,7 @@ "tenant_id": "openstack", "updated": "%(timestamp)s", "user_id": "fake", - "security_groups": [{"name": "test"}], + "os-security-groups:security_groups": [{"name": "test"}], "key_name": null } } diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl index 9991d66ff798..7f9843c5056f 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl @@ -12,6 +12,6 @@ "rel": "bookmark" } ], - "security_groups": [{"name": "test"}] + "os-security-groups:security_groups": [{"name": "test"}] } } diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl index 4aa73ee26c44..de35aa4b0b68 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl @@ -51,7 +51,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "user_id": "fake", - "security_groups": [{"name": "test"}], + "os-security-groups:security_groups": [{"name": "test"}], "key_name": null }] }