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 f9112ec14307..eba4f74f6f47 100644 --- a/doc/v3/api_samples/all_extensions/server-get-resp.json +++ b/doc/v3/api_samples/all_extensions/server-get-resp.json @@ -46,8 +46,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "config_drive": "", "os-extended-availability-zone:availability_zone": "nova", "os-extended-server-attributes:host": "b8b357f7100d4391828f2177c922ef93", 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 1557202de07c..58750fbfd88c 100644 --- a/doc/v3/api_samples/all_extensions/server-post-resp.json +++ b/doc/v3/api_samples/all_extensions/server-post-resp.json @@ -12,8 +12,8 @@ "rel": "bookmark" } ], - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "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 f200c99d0eba..cd1fffae8b42 100644 --- a/doc/v3/api_samples/all_extensions/servers-details-resp.json +++ b/doc/v3/api_samples/all_extensions/servers-details-resp.json @@ -47,8 +47,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "config_drive": "", "os-extended-availability-zone:availability_zone": "nova", "os-extended-server-attributes:host": "c3f14e9812ad496baf92ccfb3c61e15f", diff --git a/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json b/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json index 22e09b6f7b14..7d1034dc6d7b 100644 --- a/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json +++ b/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json @@ -46,8 +46,8 @@ "meta_var": "meta_val" }, "name": "new-server-test", - "os-access-ips:access_ip_v4": "4.3.2.1", - "os-access-ips:access_ip_v6": "80fe::", + "accessIPv4": "4.3.2.1", + "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", diff --git a/doc/v3/api_samples/os-access-ips/server-action-rebuild.json b/doc/v3/api_samples/os-access-ips/server-action-rebuild.json index 92850714785e..73d6207c63a4 100644 --- a/doc/v3/api_samples/os-access-ips/server-action-rebuild.json +++ b/doc/v3/api_samples/os-access-ips/server-action-rebuild.json @@ -1,7 +1,7 @@ { "rebuild" : { - "os-access-ips:access_ip_v4": "4.3.2.1", - "os-access-ips:access_ip_v6": "80fe::", + "accessIPv4": "4.3.2.1", + "accessIPv6": "80fe::", "imageRef" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "name" : "new-server-test", "metadata" : { @@ -14,4 +14,4 @@ } ] } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-access-ips/server-get-resp.json b/doc/v3/api_samples/os-access-ips/server-get-resp.json index 5810f469ad98..7df82b0ec944 100644 --- a/doc/v3/api_samples/os-access-ips/server-get-resp.json +++ b/doc/v3/api_samples/os-access-ips/server-get-resp.json @@ -45,8 +45,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "os-access-ips:access_ip_v4": "1.2.3.4", - "os-access-ips:access_ip_v6": "fe80::", + "accessIPv4": "1.2.3.4", + "accessIPv6": "fe80::", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", diff --git a/doc/v3/api_samples/os-access-ips/server-post-req.json b/doc/v3/api_samples/os-access-ips/server-post-req.json index 5bd3781f3e97..aa4b65590281 100644 --- a/doc/v3/api_samples/os-access-ips/server-post-req.json +++ b/doc/v3/api_samples/os-access-ips/server-post-req.json @@ -1,7 +1,7 @@ { "server" : { - "os-access-ips:access_ip_v4": "1.2.3.4", - "os-access-ips:access_ip_v6": "fe80::", + "accessIPv4": "1.2.3.4", + "accessIPv6": "fe80::", "name" : "new-server-test", "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "flavorRef" : "http://openstack.example.com/openstack/flavors/1", diff --git a/doc/v3/api_samples/os-access-ips/server-post-resp.json b/doc/v3/api_samples/os-access-ips/server-post-resp.json index a756cde26e29..8ecf3b2f972d 100644 --- a/doc/v3/api_samples/os-access-ips/server-post-resp.json +++ b/doc/v3/api_samples/os-access-ips/server-post-resp.json @@ -12,7 +12,7 @@ "rel": "bookmark" } ], - "os-access-ips:access_ip_v4": "1.2.3.4", - "os-access-ips:access_ip_v6": "fe80::" + "accessIPv4": "1.2.3.4", + "accessIPv6": "fe80::" } } \ No newline at end of file diff --git a/doc/v3/api_samples/os-access-ips/server-put-req.json b/doc/v3/api_samples/os-access-ips/server-put-req.json index bb3e1ce91f63..e0af5a9e49c6 100644 --- a/doc/v3/api_samples/os-access-ips/server-put-req.json +++ b/doc/v3/api_samples/os-access-ips/server-put-req.json @@ -1,6 +1,6 @@ { "server": { - "os-access-ips:access_ip_v4": "4.3.2.1", - "os-access-ips:access_ip_v6": "80fe::" + "accessIPv4": "4.3.2.1", + "accessIPv6": "80fe::" } } \ No newline at end of file diff --git a/doc/v3/api_samples/os-access-ips/server-put-resp.json b/doc/v3/api_samples/os-access-ips/server-put-resp.json index 620574c5c609..f57a8f74e366 100644 --- a/doc/v3/api_samples/os-access-ips/server-put-resp.json +++ b/doc/v3/api_samples/os-access-ips/server-put-resp.json @@ -45,8 +45,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "os-access-ips:access_ip_v4": "4.3.2.1", - "os-access-ips:access_ip_v6": "80fe::", + "accessIPv4": "4.3.2.1", + "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", diff --git a/doc/v3/api_samples/os-access-ips/servers-details-resp.json b/doc/v3/api_samples/os-access-ips/servers-details-resp.json index c757662332b5..6ff8e85b5375 100644 --- a/doc/v3/api_samples/os-access-ips/servers-details-resp.json +++ b/doc/v3/api_samples/os-access-ips/servers-details-resp.json @@ -46,8 +46,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "os-access-ips:access_ip_v4": "1.2.3.4", - "os-access-ips:access_ip_v6": "fe80::", + "accessIPv4": "1.2.3.4", + "accessIPv6": "fe80::", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", diff --git a/nova/api/openstack/compute/plugins/v3/access_ips.py b/nova/api/openstack/compute/plugins/v3/access_ips.py index 3eca0d555d3e..7ee7e90e8eed 100644 --- a/nova/api/openstack/compute/plugins/v3/access_ips.py +++ b/nova/api/openstack/compute/plugins/v3/access_ips.py @@ -28,9 +28,9 @@ class AccessIPsController(wsgi.Controller): db_instance = req.get_db_instance(server['id']) ip_v4 = db_instance.get('access_ip_v4') ip_v6 = db_instance.get('access_ip_v6') - server['%s:access_ip_v4' % ALIAS] = ( + server['accessIPv4'] = ( str(ip_v4) if ip_v4 is not None else '') - server['%s:access_ip_v6' % ALIAS] = ( + server['accessIPv6'] = ( str(ip_v6) if ip_v6 is not None else '') @wsgi.extends @@ -76,8 +76,8 @@ class AccessIPs(extensions.V3APIExtensionBase): name = "AccessIPs" alias = ALIAS version = 1 - v4_key = '%s:access_ip_v4' % ALIAS - v6_key = '%s:access_ip_v6' % ALIAS + v4_key = 'accessIPv4' + v6_key = 'accessIPv6' def get_controller_extensions(self): controller = AccessIPsController() @@ -115,10 +115,10 @@ class AccessIPs(extensions.V3APIExtensionBase): def _validate_access_ipv4(self, address): if not utils.is_valid_ipv4(address): - expl = _('access_ip_v4 is not proper IPv4 format') + expl = _('%s is not proper IPv4 format') % AccessIPs.v4_key raise exc.HTTPBadRequest(explanation=expl) def _validate_access_ipv6(self, address): if not utils.is_valid_ipv6(address): - expl = _('access_ip_v6 is not proper IPv6 format') + expl = _('%s is not proper IPv6 format') % AccessIPs.v6_key raise exc.HTTPBadRequest(explanation=expl) 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 d33b6b99a58d..d9646c37d6b5 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 @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { 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 7f18b0677eed..851af97c169e 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 @@ -17,7 +17,7 @@ "name": "default" } ], - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "" + "accessIPv4": "", + "accessIPv6": "" } } 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 1d37aca1c127..e5b8ce42e287 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 @@ -1,8 +1,8 @@ { "servers": [ { - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl index 7f9a09d0df5e..e576893b47e7 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl @@ -51,7 +51,7 @@ "tenant_id": "openstack", "updated": "%(isotime)s", "user_id": "fake", - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s" + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s" } } diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl index f1f7ed03c212..603363b4094d 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl @@ -1,7 +1,7 @@ { "rebuild" : { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "imageRef" : "%(glance_host)s/images/%(image_id)s", "name" : "new-server-test", "metadata" : { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl index 24b097f18f25..a113e006d6a8 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl index d99d2562aad0..780f764cf5fe 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl @@ -1,7 +1,7 @@ { "server" : { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", "imageRef" : "%(host)s/openstack/images/%(image_id)s", "flavorRef" : "%(host)s/openstack/flavors/1", diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl index 495b3188fad8..fb0c23b504bd 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "adminPass": "%(password)s", "id": "%(id)s", "links": [ diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl index 8a24a79dfafa..d38d96704235 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl @@ -1,6 +1,6 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s" + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s" } } diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl index 925a162c302f..770dbd74d7b7 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl index 7a14faf6f069..c88e03ad67cf 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "addresses": { "private": [ {