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 8824d46a814a..568bdabacdd2 100644 --- a/doc/v3/api_samples/all_extensions/server-get-resp.json +++ b/doc/v3/api_samples/all_extensions/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -48,6 +46,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "os-access-ips:access_ip_v4": "", + "os-access-ips:access_ip_v6": "", "os-config-drive:config_drive": "", "os-disk-config:disk_config": "AUTO", "os-extended-availability-zone:availability_zone": "nova", @@ -72,4 +72,4 @@ "updated": "2013-09-23T13:37:00Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/all_extensions/server-get-resp.xml b/doc/v3/api_samples/all_extensions/server-get-resp.xml index 60e5ef8a77ce..815ce4568cb5 100644 --- a/doc/v3/api_samples/all_extensions/server-get-resp.xml +++ b/doc/v3/api_samples/all_extensions/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -19,4 +19,4 @@ - \ No newline at end of file + 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 2e57c09e6330..2875b71b1d6f 100644 --- a/doc/v3/api_samples/all_extensions/server-post-resp.json +++ b/doc/v3/api_samples/all_extensions/server-post-resp.json @@ -12,6 +12,8 @@ "rel": "bookmark" } ], + "os-access-ips:access_ip_v4": "", + "os-access-ips:access_ip_v6": "", "os-disk-config:disk_config": "AUTO", "security_groups": [ { @@ -19,4 +21,4 @@ } ] } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/all_extensions/server-post-resp.xml b/doc/v3/api_samples/all_extensions/server-post-resp.xml index acf4cefbc66b..709fd371ba3a 100644 --- a/doc/v3/api_samples/all_extensions/server-post-resp.xml +++ b/doc/v3/api_samples/all_extensions/server-post-resp.xml @@ -1,9 +1,9 @@ - + - \ No newline at end of file + 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 5b8d38410799..c7b8f75076b9 100644 --- a/doc/v3/api_samples/all_extensions/servers-details-resp.json +++ b/doc/v3/api_samples/all_extensions/servers-details-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -49,6 +47,8 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "os-access-ips:access_ip_v4": "", + "os-access-ips:access_ip_v6": "", "os-config-drive:config_drive": "", "os-disk-config:disk_config": "AUTO", "os-extended-availability-zone:availability_zone": "nova", @@ -74,4 +74,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/all_extensions/servers-details-resp.xml b/doc/v3/api_samples/all_extensions/servers-details-resp.xml index 60ec3df69012..ebd3044d37c6 100644 --- a/doc/v3/api_samples/all_extensions/servers-details-resp.xml +++ b/doc/v3/api_samples/all_extensions/servers-details-resp.xml @@ -1,6 +1,6 @@ - - + + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json b/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json index 4a516b579ec3..f5fa9280af50 100644 --- a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json +++ b/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.xml b/doc/v3/api_samples/os-disk-config/list-servers-detail-get.xml index 41257fd7c42e..492837becab2 100644 --- a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.xml +++ b/doc/v3/api_samples/os-disk-config/list-servers-detail-get.xml @@ -1,6 +1,6 @@ - + diff --git a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json b/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json index a2e9357e7aab..683afc6e5457 100644 --- a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml b/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml index 66d961d33807..3484446bae68 100644 --- a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml +++ b/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml @@ -1,5 +1,5 @@ - + diff --git a/doc/v3/api_samples/os-disk-config/server-get-resp.json b/doc/v3/api_samples/os-disk-config/server-get-resp.json index 91cb6a815ce6..c05e9f6d23d5 100644 --- a/doc/v3/api_samples/os-disk-config/server-get-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/doc/v3/api_samples/os-disk-config/server-get-resp.xml b/doc/v3/api_samples/os-disk-config/server-get-resp.xml index f4204f97bb75..081ce184a185 100644 --- a/doc/v3/api_samples/os-disk-config/server-get-resp.xml +++ b/doc/v3/api_samples/os-disk-config/server-get-resp.xml @@ -1,5 +1,5 @@ - + diff --git a/doc/v3/api_samples/os-disk-config/server-update-put-resp.json b/doc/v3/api_samples/os-disk-config/server-update-put-resp.json index 70c5e38b7dd2..d478c321965e 100644 --- a/doc/v3/api_samples/os-disk-config/server-update-put-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-update-put-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/doc/v3/api_samples/os-disk-config/server-update-put-resp.xml b/doc/v3/api_samples/os-disk-config/server-update-put-resp.xml index 1c0c48915688..2416dcb62828 100644 --- a/doc/v3/api_samples/os-disk-config/server-update-put-resp.xml +++ b/doc/v3/api_samples/os-disk-config/server-update-put-resp.xml @@ -1,5 +1,5 @@ - + diff --git a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json b/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json index d2cde22f52b7..940f125cf9c1 100644 --- a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json +++ b/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -55,4 +53,4 @@ "updated": "2013-09-16T02:54:57Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.xml b/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.xml index 24865f0cc1b0..0ee2995d10e1 100644 --- a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.xml +++ b/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json b/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json index 125ecf5152d5..9563a0acde68 100644 --- a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json +++ b/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -57,4 +55,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml b/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml index 4584514151ba..639379132557 100644 --- a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml +++ b/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml @@ -1,6 +1,6 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json b/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json index 769826a0149a..24c54d9c5d81 100644 --- a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json +++ b/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -57,4 +55,4 @@ "updated": "2013-09-16T02:55:08Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.xml b/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.xml index 3e919b803568..2b2ba8107248 100644 --- a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.xml +++ b/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json b/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json index 4c36d7d09c8d..7236315943a3 100644 --- a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json +++ b/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -59,4 +57,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml b/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml index 7f7625eb1b06..9156d28422e1 100644 --- a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml +++ b/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml @@ -1,6 +1,6 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-status/server-get-resp.json b/doc/v3/api_samples/os-extended-status/server-get-resp.json index ce3ed978f10c..640209494959 100644 --- a/doc/v3/api_samples/os-extended-status/server-get-resp.json +++ b/doc/v3/api_samples/os-extended-status/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -58,4 +56,4 @@ "updated": "2013-09-16T03:07:07Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-status/server-get-resp.xml b/doc/v3/api_samples/os-extended-status/server-get-resp.xml index 1aa585e388e7..5f80ddf7822b 100644 --- a/doc/v3/api_samples/os-extended-status/server-get-resp.xml +++ b/doc/v3/api_samples/os-extended-status/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-status/servers-detail-resp.json b/doc/v3/api_samples/os-extended-status/servers-detail-resp.json index 49f3feb0c1be..77fd2afa728c 100644 --- a/doc/v3/api_samples/os-extended-status/servers-detail-resp.json +++ b/doc/v3/api_samples/os-extended-status/servers-detail-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -60,4 +58,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-status/servers-detail-resp.xml b/doc/v3/api_samples/os-extended-status/servers-detail-resp.xml index acc110fdb50d..99f6f5e15d54 100644 --- a/doc/v3/api_samples/os-extended-status/servers-detail-resp.xml +++ b/doc/v3/api_samples/os-extended-status/servers-detail-resp.xml @@ -1,6 +1,6 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-volumes/server-get-resp.json b/doc/v3/api_samples/os-extended-volumes/server-get-resp.json index a5ae6177f0cd..9f972cb8d177 100644 --- a/doc/v3/api_samples/os-extended-volumes/server-get-resp.json +++ b/doc/v3/api_samples/os-extended-volumes/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -62,4 +60,4 @@ "updated": "2013-09-16T03:22:29Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-volumes/server-get-resp.xml b/doc/v3/api_samples/os-extended-volumes/server-get-resp.xml index 28ca929bd3fe..9ddd3a53f83e 100644 --- a/doc/v3/api_samples/os-extended-volumes/server-get-resp.xml +++ b/doc/v3/api_samples/os-extended-volumes/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json b/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json index 395942f2b761..e03394fcd387 100644 --- a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json +++ b/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -64,4 +62,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.xml b/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.xml index e978335234a9..c0405d6889d0 100644 --- a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.xml +++ b/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.xml @@ -1,6 +1,6 @@ - + @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json index fdd83c47afe2..15c89f5499ec 100644 --- a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json +++ b/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": {}, "created": "2013-09-24T14:39:00Z", "flavor": { @@ -45,4 +43,4 @@ "updated": "2013-09-24T14:39:01Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.xml b/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.xml index 485359235109..111400b15414 100644 --- a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.xml +++ b/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json index 3d1b4baae07a..6a911ccd0413 100644 --- a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json +++ b/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": {}, "created": "2013-09-24T14:44:01Z", "flavor": { @@ -47,4 +45,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml b/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml index 76fab82f5dfd..8c3338460bc9 100644 --- a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml +++ b/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml @@ -1,6 +1,6 @@ - + @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json b/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json index 0c3f8ed9248b..1fa15ecfc96a 100644 --- a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json +++ b/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -53,4 +51,4 @@ "updated": "2013-09-18T07:22:11Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.xml b/doc/v3/api_samples/os-rescue/server-get-resp-rescue.xml index caee2ab1bdf2..8c826a5d497a 100644 --- a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.xml +++ b/doc/v3/api_samples/os-rescue/server-get-resp-rescue.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json index dc6db89d3004..ebed3eeb8d07 100644 --- a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json +++ b/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -54,4 +52,4 @@ "updated": "2013-09-18T07:22:12Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.xml b/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.xml index b9fd05dd0d15..afc3d736b0a2 100644 --- a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.xml +++ b/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + 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 a3d005dd0cab..3384537e8a0b 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 @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -59,4 +57,4 @@ "updated": "2013-09-25T03:29:14Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-security-groups/server-get-resp.xml b/doc/v3/api_samples/os-security-groups/server-get-resp.xml index 6515f482da91..916994b10164 100644 --- a/doc/v3/api_samples/os-security-groups/server-get-resp.xml +++ b/doc/v3/api_samples/os-security-groups/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -19,4 +19,4 @@ - \ No newline at end of file + 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 5affdf890e9e..b4d2790efb7e 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 @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -61,4 +59,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-security-groups/servers-detail-resp.xml b/doc/v3/api_samples/os-security-groups/servers-detail-resp.xml index 9563bc5bc6c3..2a1393a6b65d 100644 --- a/doc/v3/api_samples/os-security-groups/servers-detail-resp.xml +++ b/doc/v3/api_samples/os-security-groups/servers-detail-resp.xml @@ -1,6 +1,6 @@ - + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-server-usage/server-get-resp.json b/doc/v3/api_samples/os-server-usage/server-get-resp.json index 3525c5db59c0..06f977d3c7a4 100644 --- a/doc/v3/api_samples/os-server-usage/server-get-resp.json +++ b/doc/v3/api_samples/os-server-usage/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -56,4 +54,4 @@ "updated": "2013-08-15T08:12:40Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-server-usage/server-get-resp.xml b/doc/v3/api_samples/os-server-usage/server-get-resp.xml index 3c8dd4ded728..7a04d54c62e9 100644 --- a/doc/v3/api_samples/os-server-usage/server-get-resp.xml +++ b/doc/v3/api_samples/os-server-usage/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/os-server-usage/servers-detail-resp.json b/doc/v3/api_samples/os-server-usage/servers-detail-resp.json index 39a8c8472c1a..ad4008e90b5b 100644 --- a/doc/v3/api_samples/os-server-usage/servers-detail-resp.json +++ b/doc/v3/api_samples/os-server-usage/servers-detail-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -58,4 +56,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-server-usage/servers-detail-resp.xml b/doc/v3/api_samples/os-server-usage/servers-detail-resp.xml index 40a415269e08..a16688ca3d9d 100644 --- a/doc/v3/api_samples/os-server-usage/servers-detail-resp.xml +++ b/doc/v3/api_samples/os-server-usage/servers-detail-resp.xml @@ -1,6 +1,6 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/servers/server-get-resp.json b/doc/v3/api_samples/servers/server-get-resp.json index b7bbfa031fb5..03ec3a924598 100644 --- a/doc/v3/api_samples/servers/server-get-resp.json +++ b/doc/v3/api_samples/servers/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -54,4 +52,4 @@ "updated": "2013-09-03T04:01:33Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/servers/server-get-resp.xml b/doc/v3/api_samples/servers/server-get-resp.xml index 437132be18ee..79a7b19c6698 100644 --- a/doc/v3/api_samples/servers/server-get-resp.xml +++ b/doc/v3/api_samples/servers/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/doc/v3/api_samples/servers/servers-details-resp.json b/doc/v3/api_samples/servers/servers-details-resp.json index 07995f2b75f0..f478ac8fa7d3 100644 --- a/doc/v3/api_samples/servers/servers-details-resp.json +++ b/doc/v3/api_samples/servers/servers-details-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { @@ -56,4 +54,4 @@ "user_id": "fake" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/servers/servers-details-resp.xml b/doc/v3/api_samples/servers/servers-details-resp.xml index 5a89018f2a27..ad880a9ec4f3 100644 --- a/doc/v3/api_samples/servers/servers-details-resp.xml +++ b/doc/v3/api_samples/servers/servers-details-resp.xml @@ -1,6 +1,6 @@ - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index e69eda8b8e46..d37aecb98aba 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -73,8 +73,6 @@ def make_server(elem, detailed=False): elem.set('updated') elem.set('created') elem.set('host_id') - elem.set('access_ip_v4') - elem.set('access_ip_v6') elem.set('status') elem.set('progress') elem.set('reservation_id') @@ -160,7 +158,7 @@ class CommonDeserializer(wsgi.MetadataXMLDeserializer): server_node = self.find_first_child_named(node, 'server') attributes = ["name", "image_ref", "flavor_ref", "admin_pass", - "access_ip_v4", "access_ip_v6", "key_name"] + "key_name"] for attr in attributes: if server_node.getAttribute(attr): server[attr] = server_node.getAttribute(attr) @@ -250,12 +248,6 @@ class ActionDeserializer(CommonDeserializer): if node.hasAttribute("admin_pass"): rebuild["admin_pass"] = node.getAttribute("admin_pass") - if node.hasAttribute("access_ip_v4"): - rebuild["access_ip_v4"] = node.getAttribute("access_ip_v4") - - if node.hasAttribute("access_ip_v6"): - rebuild["access_ip_v6"] = node.getAttribute("access_ip_v6") - if self.controller: self.controller.server_rebuild_xml_deserialize(node, rebuild) return rebuild @@ -686,16 +678,6 @@ class ServersController(wsgi.Controller): except TypeError: return None - def _validate_access_ipv4(self, address): - if not utils.is_valid_ipv4(address): - expl = _('access_ip_v4 is not proper IPv4 format') - 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') - raise exc.HTTPBadRequest(explanation=expl) - @wsgi.serializers(xml=ServerTemplate) def show(self, req, id): """Returns server details by server id.""" @@ -769,14 +751,6 @@ class ServersController(wsgi.Controller): requested_networks = self._get_requested_networks( requested_networks) - (access_ip_v4, ) = server_dict.get('access_ip_v4'), - if access_ip_v4 is not None: - self._validate_access_ipv4(access_ip_v4) - - (access_ip_v6, ) = server_dict.get('access_ip_v6'), - if access_ip_v6 is not None: - self._validate_access_ipv6(access_ip_v6) - try: flavor_id = self._flavor_id_from_req_data(body) except ValueError as error: @@ -793,8 +767,6 @@ class ServersController(wsgi.Controller): display_name=name, display_description=name, metadata=server_dict.get('metadata', {}), - access_ip_v4=access_ip_v4, - access_ip_v6=access_ip_v6, admin_password=password, requested_networks=requested_networks, **create_kwargs) @@ -876,7 +848,6 @@ class ServersController(wsgi.Controller): def _update_extension_point(self, ext, update_dict, update_kwargs): handler = ext.obj LOG.debug(_("Running _update_extension_point for %s"), ext.obj) - handler.server_update(update_dict, update_kwargs) def _delete(self, context, req, instance_uuid): @@ -906,20 +877,6 @@ class ServersController(wsgi.Controller): self._validate_server_name(name) update_dict['display_name'] = name.strip() - if 'access_ip_v4' in body['server']: - access_ipv4 = body['server']['access_ip_v4'] - if access_ipv4: - self._validate_access_ipv4(access_ipv4) - update_dict['access_ip_v4'] = ( - access_ipv4 and access_ipv4.strip() or None) - - if 'access_ip_v6' in body['server']: - access_ipv6 = body['server']['access_ip_v6'] - if access_ipv6: - self._validate_access_ipv6(access_ipv6) - update_dict['access_ip_v6'] = ( - access_ipv6 and access_ipv6.strip() or None) - if 'host_id' in body['server']: msg = _("host_id cannot be updated.") raise exc.HTTPBadRequest(explanation=msg) @@ -1144,20 +1101,12 @@ class ServersController(wsgi.Controller): attr_map = { 'name': 'display_name', - 'access_ip_v4': 'access_ip_v4', - 'access_ip_v6': 'access_ip_v6', 'metadata': 'metadata', } if 'name' in rebuild_dict: self._validate_server_name(rebuild_dict['name']) - if 'access_ip_v4' in rebuild_dict: - self._validate_access_ipv4(rebuild_dict['access_ip_v4']) - - if 'access_ip_v6' in rebuild_dict: - self._validate_access_ipv6(rebuild_dict['access_ip_v6']) - rebuild_kwargs = {} if list(self.rebuild_extension_manager): self.rebuild_extension_manager.map(self._rebuild_extension_point, diff --git a/nova/api/openstack/compute/schemas/v3/server.rng b/nova/api/openstack/compute/schemas/v3/server.rng index 39b414f67dfb..181525c701e3 100644 --- a/nova/api/openstack/compute/schemas/v3/server.rng +++ b/nova/api/openstack/compute/schemas/v3/server.rng @@ -7,8 +7,6 @@ - - diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index 54886e1425c9..d2d38b49be50 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -234,8 +234,6 @@ class ViewBuilderV3(ViewBuilder): def show(self, request, instance): """Detailed view of a single instance.""" - ip_v4 = instance.get('access_ip_v4') - ip_v6 = instance.get('access_ip_v6') server = { "server": { "id": instance["uuid"], @@ -250,8 +248,6 @@ class ViewBuilderV3(ViewBuilder): "created": timeutils.isotime(instance["created_at"]), "updated": timeutils.isotime(instance["updated_at"]), "addresses": self._get_addresses(request, instance), - "access_ip_v4": str(ip_v4) if ip_v4 is not None else '', - "access_ip_v6": str(ip_v6) if ip_v6 is not None else '', "links": self._get_links(request, instance["uuid"], self._collection_name), diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py index eefd5c775f76..964f42522864 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py @@ -431,35 +431,6 @@ class ServerActionsControllerTest(test.TestCase): self.controller._action_rebuild, req, FAKE_UUID, body) - def test_rebuild_accessIP(self): - attributes = { - 'access_ip_v4': '172.19.0.1', - 'access_ip_v6': 'fe80::1', - } - - body = { - "rebuild": { - "image_ref": self._image_href, - "access_ip_v4": "172.19.0.1", - "access_ip_v6": "fe80::1", - }, - } - - update = self.mox.CreateMockAnything() - self.stubs.Set(compute_api.API, 'update', update) - req = fakes.HTTPRequestV3.blank(self.url) - context = req.environ['nova.context'] - update(context, mox.IgnoreArg(), - image_ref=self._image_href, - kernel_id="", ramdisk_id="", - task_state=task_states.REBUILDING, - expected_task_state=None, - progress=0, **attributes).AndReturn( - fakes.stub_instance(1, host='fake_host')) - self.mox.ReplayAll() - - self.controller._action_rebuild(req, FAKE_UUID, body) - def test_rebuild_when_kernel_not_exists(self): def return_image_meta(*args, **kwargs): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py index d35876b4d064..29089b131f80 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py @@ -306,8 +306,6 @@ class ServersControllerTest(ControllerTest): "progress": progress, "name": "server1", "status": status, - "access_ip_v4": "", - "access_ip_v6": "", "host_id": '', "image": { "id": "10", @@ -1183,19 +1181,7 @@ class ServersControllerRebuildInstanceTest(ControllerTest): self.req.method = 'POST' self.req.headers["content-type"] = "application/json" - def test_rebuild_instance_with_access_ipv4_bad_format(self): - # proper local hrefs must start with 'http://localhost/v2/' - self.body['rebuild']['access_ip_v4'] = 'bad_format' - self.body['rebuild']['access_ip_v6'] = 'fead::1234' - self.body['rebuild']['metadata']['hello'] = 'world' - self.req.body = jsonutils.dumps(self.body) - self.assertRaises(webob.exc.HTTPBadRequest, - self.controller._action_rebuild, - self.req, FAKE_UUID, self.body) - def test_rebuild_instance_with_blank_metadata_key(self): - self.body['rebuild']['access_ip_v4'] = '0.0.0.0' - self.body['rebuild']['access_ip_v6'] = 'fead::1234' self.body['rebuild']['metadata'][''] = 'world' self.req.body = jsonutils.dumps(self.body) self.assertRaises(webob.exc.HTTPBadRequest, @@ -1203,8 +1189,6 @@ class ServersControllerRebuildInstanceTest(ControllerTest): self.req, FAKE_UUID, self.body) def test_rebuild_instance_with_metadata_key_too_long(self): - self.body['rebuild']['access_ip_v4'] = '0.0.0.0' - self.body['rebuild']['access_ip_v6'] = 'fead::1234' self.body['rebuild']['metadata'][('a' * 260)] = 'world' self.req.body = jsonutils.dumps(self.body) @@ -1213,8 +1197,6 @@ class ServersControllerRebuildInstanceTest(ControllerTest): self.req, FAKE_UUID, self.body) def test_rebuild_instance_with_metadata_value_too_long(self): - self.body['rebuild']['access_ip_v4'] = '0.0.0.0' - self.body['rebuild']['access_ip_v6'] = 'fead::1234' self.body['rebuild']['metadata']['key1'] = ('a' * 260) self.req.body = jsonutils.dumps(self.body) @@ -1291,16 +1273,6 @@ class ServersControllerRebuildInstanceTest(ControllerTest): self.controller._action_rebuild, self.req, FAKE_UUID, self.body) - def test_rebuild_instance_with_access_ipv6_bad_format(self): - self.body['rebuild']['access_ip_v4'] = '1.2.3.4' - self.body['rebuild']['access_ip_v6'] = 'bad_format' - self.body['rebuild']['metadata']['hello'] = 'world' - self.req.body = jsonutils.dumps(self.body) - self.req.headers["content-type"] = "application/json" - self.assertRaises(webob.exc.HTTPBadRequest, - self.controller._action_rebuild, - self.req, FAKE_UUID, self.body) - def test_start(self): self.mox.StubOutWithMock(compute_api.API, 'start') compute_api.API.start(mox.IgnoreArg(), mox.IgnoreArg()) @@ -1379,18 +1351,12 @@ class ServersControllerUpdateTest(ControllerTest): def test_update_server_all_attributes(self): body = {'server': { 'name': 'server_test', - 'access_ip_v4': '0.0.0.0', - 'access_ip_v6': 'beef::0123', }} - req = self._get_request(body, {'name': 'server_test', - 'access_ipv4': '0.0.0.0', - 'access_ipv6': 'beef::0123'}) + req = self._get_request(body, {'name': 'server_test'}) res_dict = self.controller.update(req, FAKE_UUID, body) self.assertEqual(res_dict['server']['id'], FAKE_UUID) self.assertEqual(res_dict['server']['name'], 'server_test') - self.assertEqual(res_dict['server']['access_ip_v4'], '0.0.0.0') - self.assertEqual(res_dict['server']['access_ip_v6'], 'beef::123') def test_update_server_invalid_xml_raises_lookup(self): req = webob.Request.blank('/v3/servers/%s' % FAKE_UUID) @@ -1447,66 +1413,6 @@ class ServersControllerUpdateTest(ControllerTest): self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, req, FAKE_UUID, body) - def test_update_server_access_ipv4(self): - body = {'server': {'access_ip_v4': '0.0.0.0'}} - req = self._get_request(body, {'access_ipv4': '0.0.0.0'}) - res_dict = self.controller.update(req, FAKE_UUID, body) - - self.assertEqual(res_dict['server']['id'], FAKE_UUID) - self.assertEqual(res_dict['server']['access_ip_v4'], '0.0.0.0') - - def test_update_server_access_ipv4_bad_format(self): - body = {'server': {'access_ip_v4': 'bad_format'}} - req = self._get_request(body, {'access_ipv4': '0.0.0.0'}) - self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, - req, FAKE_UUID, body) - - def test_update_server_access_ipv4_none(self): - body = {'server': {'access_ip_v4': None}} - req = self._get_request(body, {'access_ipv4': '0.0.0.0'}) - res_dict = self.controller.update(req, FAKE_UUID, body) - - self.assertEqual(res_dict['server']['id'], FAKE_UUID) - self.assertEqual(res_dict['server']['access_ip_v4'], '') - - def test_update_server_access_ipv4_blank(self): - body = {'server': {'access_ip_v4': ''}} - req = self._get_request(body, {'access_ipv4': '0.0.0.0'}) - res_dict = self.controller.update(req, FAKE_UUID, body) - - self.assertEqual(res_dict['server']['id'], FAKE_UUID) - self.assertEqual(res_dict['server']['access_ip_v4'], '') - - def test_update_server_access_ipv6(self): - body = {'server': {'access_ip_v6': 'beef::0123'}} - req = self._get_request(body, {'access_ipv6': 'beef::0123'}) - res_dict = self.controller.update(req, FAKE_UUID, body) - - self.assertEqual(res_dict['server']['id'], FAKE_UUID) - self.assertEqual(res_dict['server']['access_ip_v6'], 'beef::123') - - def test_update_server_access_ipv6_bad_format(self): - body = {'server': {'access_ip_v6': 'bad_format'}} - req = self._get_request(body, {'access_ipv6': 'beef::0123'}) - self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, - req, FAKE_UUID, body) - - def test_update_server_access_ipv6_none(self): - body = {'server': {'access_ip_v6': None}} - req = self._get_request(body, {'access_ipv6': 'beef::0123'}) - res_dict = self.controller.update(req, FAKE_UUID, body) - - self.assertEqual(res_dict['server']['id'], FAKE_UUID) - self.assertEqual(res_dict['server']['access_ip_v6'], '') - - def test_update_server_access_ipv6_blank(self): - body = {'server': {'access_ip_v6': ''}} - req = self._get_request(body, {'access_ipv6': 'beef::0123'}) - res_dict = self.controller.update(req, FAKE_UUID, body) - - self.assertEqual(res_dict['server']['id'], FAKE_UUID) - self.assertEqual(res_dict['server']['access_ip_v6'], '') - def test_update_server_adminPass_ignored(self): inst_dict = dict(name='server_test', adminPass='bacon') body = dict(server=inst_dict) @@ -1687,8 +1593,6 @@ class ServersControllerCreateTest(test.TestCase): 'display_name': inst['display_name'] or 'test', 'uuid': FAKE_UUID, 'instance_type': dict(inst_type), - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': 'fead::1234', 'image_ref': inst.get('image_ref', def_image_ref), 'user_id': 'fake', 'project_id': 'fake', @@ -1981,20 +1885,7 @@ class ServersControllerCreateTest(test.TestCase): self.stubs.Set(compute_api.API, 'create', create) self._test_create_extra(params) - def test_create_instance_with_access_ip(self): - # proper local hrefs must start with 'http://localhost/v3/' - image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid - self.body['server']['image_ref'] = image_href - self.body['server']['access_ip_v4'] = '1.2.3.4' - self.body['server']['access_ip_v6'] = 'fead::1234' - - self.req.body = jsonutils.dumps(self.body) - res = self.controller.create(self.req, self.body).obj - server = res['server'] - self._check_admin_pass_len(server) - self.assertEqual(FAKE_UUID, server['id']) - - def test_create_instance_with_access_ip_pass_disabled(self): + def test_create_instance_with_pass_disabled(self): # test with admin passwords disabled See lp bug 921814 self.flags(enable_instance_password=False) @@ -2002,8 +1893,6 @@ class ServersControllerCreateTest(test.TestCase): self.flags(enable_instance_password=False) image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid self.body['server']['image_ref'] = image_href - self.body['server']['access_ip_v4'] = '1.2.3.4' - self.body['server']['access_ip_v6'] = 'fead::1234' self.req.body = jsonutils.dumps(self.body) res = self.controller.create(self.req, self.body).obj @@ -2011,26 +1900,6 @@ class ServersControllerCreateTest(test.TestCase): self._check_admin_pass_missing(server) self.assertEqual(FAKE_UUID, server['id']) - def test_create_instance_bad_format_access_ip_v4(self): - # proper local hrefs must start with 'http://localhost/v3/' - image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid - self.body['server']['image_ref'] = image_href - self.body['server']['access_ip_v4'] = 'bad_format' - self.body['server']['access_ip_v6'] = 'fead::1234' - self.req.body = jsonutils.dumps(self.body) - self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, - self.req, self.body) - - def test_create_instance_bad_format_access_ip_v6(self): - # proper local hrefs must start with 'http://localhost/v3/' - image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid - self.body['server']['image_ref'] = image_href - self.body['server']['access_ip_v4'] = '1.2.3.4' - self.body['server']['access_ip_v6'] = 'bad_format' - self.req.body = jsonutils.dumps(self.body) - self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, - self.req, self.body) - def test_create_instance_name_too_long(self): # proper local hrefs must start with 'http://localhost/v3/' image_href = 'http://localhost/v2/images/%s' % self.image_uuid @@ -2385,62 +2254,6 @@ class TestServerCreateRequestXMLDeserializer(test.TestCase): } self.assertEquals(request['body'], expected) - def test_access_ipv4(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "image_ref": "1", - "flavor_ref": "2", - "access_ip_v4": "1.2.3.4", - }, - } - self.assertEquals(request['body'], expected) - - def test_access_ipv6(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "image_ref": "1", - "flavor_ref": "2", - "access_ip_v6": "fead::1234", - }, - } - self.assertEquals(request['body'], expected) - - def test_access_ip(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "image_ref": "1", - "flavor_ref": "2", - "access_ip_v4": "1.2.3.4", - "access_ip_v6": "fead::1234", - }, - } - self.assertEquals(request['body'], expected) - def test_admin_pass(self): serial_request = """ + image_ref="http://localhost/images/1"> """ request = self.deserializer.deserialize(serial_request, 'action') expected = { "rebuild": { "name": "new-server-test", "image_ref": "http://localhost/images/1", - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': 'fe80::' }, } self.assertThat(request['body'], matchers.DictMatches(expected)) diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py index c90a3acfead2..ac1b5c2a0470 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/integrated/test_servers.py @@ -366,6 +366,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase): self._access_ipv6_parameter: "fe80::2", "metadata": {'some': 'thing'}, } + post['rebuild'].update(self._get_access_ips_params()) self.api.post_server_action(created_server_id, post) LOG.debug("rebuilt server: %s" % created_server) @@ -377,9 +378,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase): self.assertEqual('blah', found_server.get('name')) self.assertEqual(post['rebuild'][self._image_ref_parameter], found_server.get('image')['id']) - self.assertEqual('172.19.0.2', - found_server[self._access_ipv4_parameter]) - self.assertEqual('fe80::2', found_server[self._access_ipv6_parameter]) + self._verify_access_ips(found_server) # rebuild the server with empty metadata and nothing else post = {} @@ -398,13 +397,20 @@ class ServersTest(integrated_helpers._IntegratedTestBase): self.assertEqual('blah', found_server.get('name')) self.assertEqual(post['rebuild'][self._image_ref_parameter], found_server.get('image')['id']) - self.assertEqual('172.19.0.2', - found_server[self._access_ipv4_parameter]) - self.assertEqual('fe80::2', found_server[self._access_ipv6_parameter]) + self._verify_access_ips(found_server) # Cleanup self._delete_server(created_server_id) + def _get_access_ips_params(self): + return {self._access_ipv4_parameter: "172.19.0.2", + self._access_ipv6_parameter: "fe80::2"} + + def _verify_access_ips(self, server): + self.assertEqual('172.19.0.2', + server[self._access_ipv4_parameter]) + self.assertEqual('fe80::2', server[self._access_ipv6_parameter]) + def test_rename_server(self): # Test building and renaming a server. fake_network.set_stub_network_methods(self.stubs) @@ -508,7 +514,15 @@ class ServersTestV3(client.TestOpenStackClientV3Mixin, ServersTest): _api_version = 'v3' _image_ref_parameter = 'image_ref' _flavor_ref_parameter = 'flavor_ref' - _access_ipv4_parameter = 'access_ip_v4' - _access_ipv6_parameter = 'access_ip_v6' _return_resv_id_parameter = 'os-multiple-create:return_reservation_id' _min_count_parameter = 'os-multiple-create:min_count' + _access_ipv4_parameter = None + _access_ipv6_parameter = None + + def _get_access_ips_params(self): + return {} + + def _verify_access_ips(self, server): + # NOTE(alexxu): access_ips was demoted as extensions in v3 api. + # So skips verifying access_ips + pass 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 1eae95e9f995..da7d8c68dfd2 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": { - "access_ip_v4": "", - "access_ip_v6": "", + "os-access-ips:access_ip_v4": "", + "os-access-ips:access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.xml.tpl index b720299f12e6..15b3b89fdc0e 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + 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 0cfb0d2277f1..89c4f45dc858 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,6 +17,8 @@ { "name": "default" } - ] + ], + "os-access-ips:access_ip_v4": "", + "os-access-ips:access_ip_v6": "" } } diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.xml.tpl index cefabc673c89..d8160068b3bf 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.xml.tpl @@ -1,5 +1,5 @@ - + 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 55be016e8a2e..4d226bba8f6e 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": [ { - "access_ip_v4": "", - "access_ip_v6": "", + "os-access-ips:access_ip_v4": "", + "os-access-ips:access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.xml.tpl index fc2dff700d61..19eb3dc7c5cb 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ - - + + diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl index bc9009f3ba94..7f962259bcdd 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.xml.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.xml.tpl index 41b226cd4eac..405e19f2506b 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl index b4edcc6998f8..ff8736529651 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml.tpl index 70f99c2de9f9..fe1bfafa6574 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl index 64f42c285dc0..fbb7d13dcf73 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.xml.tpl index 7b0139d1926b..b2bb5fee2017 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl index b5180d535ee9..8b4f9101d11a 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.xml.tpl index f113f933b70c..9895d00b9780 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl index 9e1370437c6e..606d408ec38f 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl @@ -3,8 +3,6 @@ "updated": "%(timestamp)s", "created": "%(timestamp)s", "os-extended-availability-zone:availability_zone": "nova", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.xml.tpl index 4a05e0e67a16..b6bec97edb92 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl index cb8723262693..dcbfa9d2d7d4 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl @@ -4,8 +4,6 @@ "updated": "%(timestamp)s", "created": "%(timestamp)s", "os-extended-availability-zone:availability_zone": "nova", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml.tpl index 5695ef6453c5..222faabbe30e 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl index 7efc1d0cb291..f69436d021a4 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl @@ -5,8 +5,6 @@ "os-extended-server-attributes:instance_name": "%(instance_name)s", "updated": "%(timestamp)s", "created": "%(timestamp)s", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.xml.tpl index 15e676bec2c6..80374afcf6aa 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl index 8f2c195fa59d..d779cc12e9da 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl @@ -6,8 +6,6 @@ "os-extended-server-attributes:instance_name": "%(instance_name)s", "updated": "%(timestamp)s", "created": "%(timestamp)s", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml.tpl index 7e317166337c..a9965e7e3395 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl index 922e6b75ad1e..fe7561d57cfa 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl @@ -6,8 +6,6 @@ "os-extended-status:locked_by": null, "updated": "%(timestamp)s", "created": "%(timestamp)s", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.xml.tpl index a0d9dc52cf0d..980d7ab0b6ac 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl index d2b1b72d5aa9..15f9acc54a94 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl @@ -7,8 +7,6 @@ "os-extended-status:locked_by": null, "updated": "%(timestamp)s", "created": "%(timestamp)s", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.xml.tpl index 91505b0e8d0b..e5396cfe3a55 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl index a8af74c817e5..55dcf7f32b8d 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.xml.tpl index 3368c2b651d9..8b3164013b17 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl index b9bacf00fc77..0abd50f786c6 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl @@ -3,8 +3,6 @@ { "updated": "%(timestamp)s", "created": "%(timestamp)s", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl index 7d0ed6d5837e..33e8b6f0e84d 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl index bb38484c6f39..a18e0913fd8e 100644 --- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { }, "created": "%(timestamp)s", diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl index 81314ef57cee..6d1b00f29420 100644 --- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl index 39e56583c7ac..4e8cbc7ca457 100644 --- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": {}, "created": "%(timestamp)s", "flavor": { diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl index 7b184c6df0e8..d6a2c26b348a 100644 --- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl index e588fb751f31..9bdd2dec94f0 100644 --- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.xml.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.xml.tpl index 189083af8381..6bc2cd46d08b 100644 --- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl index 9d1ad33a0a18..dda3e9ea7287 100644 --- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl index e61add586ed7..ce22961c1b36 100644 --- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl @@ -1,5 +1,5 @@ - + 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 cb17028b48eb..d5f2afceb193 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 @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.xml.tpl index ba3bb9e11311..f8da8850024f 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + 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 6a78d42a7f2c..4aa73ee26c44 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 @@ -3,8 +3,6 @@ { "updated": "%(timestamp)s", "created": "%(timestamp)s", - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.xml.tpl index 29e440b6280c..bf20834b633e 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl index 357dd95cd6ce..5db0a0f065ce 100644 --- a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl @@ -2,8 +2,6 @@ "server": { "os-server-usage:launched_at": "%(timestamp)s", "os-server-usage:terminated_at": null, - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.xml.tpl index a32c0845fa9a..06dca6478a44 100644 --- a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl index 92d1b519d4f6..8e641405f720 100644 --- a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl @@ -38,8 +38,6 @@ ] }, "id": "%(uuid)s", - "access_ip_v4": "", - "access_ip_v6": "", "os-server-usage:terminated_at": null, "tenant_id": "openstack", "progress": 0, diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.xml.tpl index 58a099153e72..0cb4601a09c3 100644 --- a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl index afb281c5bd2a..b3ed6fabf5b9 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl @@ -1,7 +1,5 @@ { "server": { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl index 8286f6cedad1..8db15552b7e6 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl index cbbb57bc7d38..cf159e04489a 100644 --- a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl @@ -1,8 +1,6 @@ { "servers": [ { - "access_ip_v4": "", - "access_ip_v6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl index f7b5006ba652..6f52c6457006 100644 --- a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ - + diff --git a/setup.cfg b/setup.cfg index 0eb71da3dbf3..55b417394c8c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,6 +56,7 @@ console_scripts = nova-xvpvncproxy = nova.cmd.xvpvncproxy:main nova.api.v3.extensions = + access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs admin_actions = nova.api.openstack.compute.plugins.v3.admin_actions:AdminActions admin_password = nova.api.openstack.compute.plugins.v3.admin_password:AdminPassword agents = nova.api.openstack.compute.plugins.v3.agents:Agents @@ -111,6 +112,7 @@ nova.api.v3.extensions = versions = nova.api.openstack.compute.plugins.v3.versions:Versions nova.api.v3.extensions.server.create = + access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs availability_zone = nova.api.openstack.compute.plugins.v3.availability_zone:AvailabilityZone block_device_mapping = nova.api.openstack.compute.plugins.v3.block_device_mapping:BlockDeviceMapping config_drive = nova.api.openstack.compute.plugins.v3.config_drive:ConfigDrive @@ -123,6 +125,7 @@ nova.api.v3.extensions.server.create = user_data = nova.api.openstack.compute.plugins.v3.user_data:UserData nova.api.v3.extensions.server.create.deserialize = + access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs availability_zone = nova.api.openstack.compute.plugins.v3.availability_zone:AvailabilityZone block_device_mapping = nova.api.openstack.compute.plugins.v3.block_device_mapping:BlockDeviceMapping config_drive = nova.api.openstack.compute.plugins.v3.config_drive:ConfigDrive @@ -134,10 +137,12 @@ nova.api.v3.extensions.server.create.deserialize = user_data = nova.api.openstack.compute.plugins.v3.user_data:UserData nova.api.v3.extensions.server.rebuild = + access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig personalities = nova.api.openstack.compute.plugins.v3.personalities:Personalities nova.api.v3.extensions.server.rebuild.deserialize = + access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig personalities = nova.api.openstack.compute.plugins.v3.personalities:Personalities @@ -148,6 +153,7 @@ nova.api.v3.extensions.server.resize.deserialize = disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig nova.api.v3.extensions.server.update = + access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig [build_sphinx]