From a5147669f4d584fdbee10b4a2c77b93b31ef3108 Mon Sep 17 00:00:00 2001 From: Ghanshyam Date: Fri, 12 Sep 2014 10:26:19 +0900 Subject: [PATCH] Port extended_ips/extended_ips_mac extension to V2.1 This patch port extended_ips/extended_ips_mac extension to V2.1 There are difference between V2 and V3 server show/index & server address index API response listed below- 'address' field of V2->V3 API response- "OS-EXT-IPS:type" -> "type" "OS-EXT-IPS-MAC:mac_addr" -> "mac_addr" Reverting those attribute same as V2 to work with V2.1 Closes-Bug: #1368495 Partially implements blueprint v2-on-v3-api Change-Id: I44902b0402115d1b6e833975e6c2f020ac5ab7c3 --- .../all_extensions/server-get-resp.json | 4 +- .../all_extensions/servers-details-resp.json | 4 +- .../server-action-rebuild-resp.json | 4 +- .../os-access-ips/server-get-resp.json | 4 +- .../os-access-ips/server-put-resp.json | 4 +- .../os-access-ips/servers-details-resp.json | 4 +- .../server-config-drive-get-resp.json | 4 +- .../servers-config-drive-details-resp.json | 4 +- .../server-get-resp.json | 4 +- .../servers-detail-resp.json | 4 +- .../server-get-resp.json | 4 +- .../servers-detail-resp.json | 4 +- .../os-extended-status/server-get-resp.json | 4 +- .../servers-detail-resp.json | 4 +- .../os-extended-volumes/server-get-resp.json | 4 +- .../servers-detail-resp.json | 4 +- .../api_samples/os-pci/server-get-resp.json | 4 +- .../os-pci/servers-detail-resp.json | 4 +- .../os-rescue/server-get-resp-rescue.json | 4 +- .../os-rescue/server-get-resp-unrescue.json | 4 +- .../os-security-groups/server-get-resp.json | 4 +- .../servers-detail-resp.json | 4 +- .../os-server-usage/server-get-resp.json | 4 +- .../os-server-usage/servers-detail-resp.json | 4 +- .../server-ips/server-ips-network-resp.json | 4 +- .../server-ips/server-ips-resp.json | 4 +- .../servers/server-action-rebuild-resp.json | 4 +- .../api_samples/servers/server-get-resp.json | 4 +- .../servers/servers-details-resp.json | 4 +- nova/api/openstack/compute/views/addresses.py | 4 +- .../compute/contrib/test_extended_ips.py | 28 +++++++---- .../compute/contrib/test_extended_ips_mac.py | 30 ++++++++---- .../compute/plugins/v3/test_servers.py | 48 ++++++++++++------- .../all_extensions/server-get-resp.json.tpl | 4 +- .../servers-details-resp.json.tpl | 4 +- .../server-action-rebuild-resp.json.tpl | 4 +- .../os-access-ips/server-get-resp.json.tpl | 4 +- .../os-access-ips/server-put-resp.json.tpl | 4 +- .../servers-details-resp.json.tpl | 4 +- .../server-config-drive-get-resp.json.tpl | 4 +- ...servers-config-drive-details-resp.json.tpl | 4 +- .../server-get-resp.json.tpl | 4 +- .../servers-detail-resp.json.tpl | 4 +- .../server-get-resp.json.tpl | 4 +- .../servers-detail-resp.json.tpl | 4 +- .../server-get-resp.json.tpl | 4 +- .../servers-detail-resp.json.tpl | 4 +- .../server-get-resp.json.tpl | 4 +- .../servers-detail-resp.json.tpl | 4 +- .../os-pci/server-get-resp.json.tpl | 4 +- .../os-pci/servers-detail-resp.json.tpl | 4 +- .../os-rescue/server-get-resp-rescue.json.tpl | 4 +- .../server-get-resp-unrescue.json.tpl | 4 +- .../server-get-resp.json.tpl | 4 +- .../servers-detail-resp.json.tpl | 4 +- .../os-server-usage/server-get-resp.json.tpl | 4 +- .../servers-detail-resp.json.tpl | 4 +- .../server-ips-network-resp.json.tpl | 4 +- .../server-ips/server-ips-resp.json.tpl | 4 +- ...n-rebuild-preserve-ephemeral-resp.json.tpl | 4 +- .../server-action-rebuild-resp.json.tpl | 4 +- .../servers/server-get-resp.json.tpl | 4 +- .../servers/servers-details-resp.json.tpl | 4 +- 63 files changed, 194 insertions(+), 152 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 87ed77b7e207..a3102309baab 100644 --- a/doc/v3/api_samples/all_extensions/server-get-resp.json +++ b/doc/v3/api_samples/all_extensions/server-get-resp.json @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 a3edb15260e5..7e800511efbb 100644 --- a/doc/v3/api_samples/all_extensions/servers-details-resp.json +++ b/doc/v3/api_samples/all_extensions/servers-details-resp.json @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 058ae3af35be..95966df5f9ff 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 39422928c580..7d501aaf9365 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 7b37ef924014..e25443007902 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 c0171965d862..4f1cfe6b245e 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json b/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json index f2938cee7f16..2987dde866e8 100644 --- a/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json +++ b/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json b/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json index ae4e5f7b198d..30f48065bcd3 100644 --- a/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json +++ b/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 07f5e8e940f3..bbede8753963 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 f536301e8ddf..b0db0f910285 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 ffc3a76f32ec..38715a9c62d1 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 9b037bd18727..12b3da8e8491 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 706d455bd4e8..ebd91864683e 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 1c1bffc110db..ecdcef77cbc2 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 973c4d40bcb1..4037f17e472b 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 762de50de176..68333b11dcfd 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/os-pci/server-get-resp.json b/doc/v3/api_samples/os-pci/server-get-resp.json index f517aefbb465..58e1fdc77d4c 100644 --- a/doc/v3/api_samples/os-pci/server-get-resp.json +++ b/doc/v3/api_samples/os-pci/server-get-resp.json @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/os-pci/servers-detail-resp.json b/doc/v3/api_samples/os-pci/servers-detail-resp.json index 872a5335f061..e14839f8f325 100644 --- a/doc/v3/api_samples/os-pci/servers-detail-resp.json +++ b/doc/v3/api_samples/os-pci/servers-detail-resp.json @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 4df7a7cb8925..2b0c20cdd75b 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 79ea58d3cebb..a24605550054 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 7534ccc0fe76..ab8e4cbcdc1d 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 4690063de1e1..8612a1834866 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 5316ba550799..78cda7482bb9 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 02eeafa32d7e..1346f3350bad 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/server-ips/server-ips-network-resp.json b/doc/v3/api_samples/server-ips/server-ips-network-resp.json index 0c13588eb09b..0f8831da64a8 100644 --- a/doc/v3/api_samples/server-ips/server-ips-network-resp.json +++ b/doc/v3/api_samples/server-ips/server-ips-network-resp.json @@ -2,8 +2,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/server-ips/server-ips-resp.json b/doc/v3/api_samples/server-ips/server-ips-resp.json index bb2ae0ab474f..f1bfb4d679ab 100644 --- a/doc/v3/api_samples/server-ips/server-ips-resp.json +++ b/doc/v3/api_samples/server-ips/server-ips-resp.json @@ -3,8 +3,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/servers/server-action-rebuild-resp.json b/doc/v3/api_samples/servers/server-action-rebuild-resp.json index 4c38ad2f8b50..8052530570c8 100644 --- a/doc/v3/api_samples/servers/server-action-rebuild-resp.json +++ b/doc/v3/api_samples/servers/server-action-rebuild-resp.json @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/servers/server-get-resp.json b/doc/v3/api_samples/servers/server-get-resp.json index fa7708f1775d..03fd2f6a2c47 100644 --- a/doc/v3/api_samples/servers/server-get-resp.json +++ b/doc/v3/api_samples/servers/server-get-resp.json @@ -4,8 +4,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/doc/v3/api_samples/servers/servers-details-resp.json b/doc/v3/api_samples/servers/servers-details-resp.json index 6644953453f5..ac69ea4ca57c 100644 --- a/doc/v3/api_samples/servers/servers-details-resp.json +++ b/doc/v3/api_samples/servers/servers-details-resp.json @@ -5,8 +5,8 @@ "private": [ { "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index 78640d486833..ebf3199aea21 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -51,6 +51,6 @@ class ViewBuilderV3(ViewBuilder): return { "version": ip["version"], "addr": ip["address"], - "type": ip["type"], - "mac_addr": ip['mac_address'], + "OS-EXT-IPS:type": ip["type"], + "OS-EXT-IPS-MAC:mac_addr": ip['mac_address'], } diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py b/nova/tests/api/openstack/compute/contrib/test_extended_ips.py index 9c84871db0b7..04ad279261f5 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_ips.py @@ -106,24 +106,20 @@ def fake_compute_get_all(*args, **kwargs): db_list, fields) -class ExtendedIpsTest(test.TestCase): +class ExtendedIpsTestV21(test.TestCase): content_type = 'application/json' prefix = 'OS-EXT-IPS:' def setUp(self): - super(ExtendedIpsTest, self).setUp() + super(ExtendedIpsTestV21, self).setUp() fakes.stub_out_nw_api(self.stubs) self.stubs.Set(compute.api.API, 'get', fake_compute_get) self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all) - self.flags( - osapi_compute_extension=[ - 'nova.api.openstack.compute.contrib.select_extensions'], - osapi_compute_ext_list=['Extended_ips']) def _make_request(self, url): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type - res = req.get_response(fakes.wsgi_app(init_only=('servers',))) + res = req.get_response(fakes.wsgi_app_v21(init_only=('servers',))) return res def _get_server(self, body): @@ -161,7 +157,23 @@ class ExtendedIpsTest(test.TestCase): self.assertServerStates(server) -class ExtendedIpsXmlTest(ExtendedIpsTest): +class ExtendedIpsTestV2(ExtendedIpsTestV21): + + def setUp(self): + super(ExtendedIpsTestV2, self).setUp() + self.flags( + osapi_compute_extension=[ + 'nova.api.openstack.compute.contrib.select_extensions'], + osapi_compute_ext_list=['Extended_ips']) + + def _make_request(self, url): + req = webob.Request.blank(url) + req.headers['Accept'] = self.content_type + res = req.get_response(fakes.wsgi_app(init_only=('servers',))) + return res + + +class ExtendedIpsXmlTest(ExtendedIpsTestV2): content_type = 'application/xml' prefix = '{%s}' % extended_ips.Extended_ips.namespace diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py b/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py index 2af86e31cb36..c6998c61591d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py @@ -111,24 +111,20 @@ def fake_compute_get_all(*args, **kwargs): db_list, fields) -class ExtendedIpsMacTest(test.TestCase): +class ExtendedIpsMacTestV21(test.TestCase): content_type = 'application/json' prefix = '%s:' % extended_ips_mac.Extended_ips_mac.alias def setUp(self): - super(ExtendedIpsMacTest, self).setUp() + super(ExtendedIpsMacTestV21, self).setUp() fakes.stub_out_nw_api(self.stubs) self.stubs.Set(compute.api.API, 'get', fake_compute_get) self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all) - self.flags( - osapi_compute_extension=[ - 'nova.api.openstack.compute.contrib.select_extensions'], - osapi_compute_ext_list=['Extended_ips_mac']) def _make_request(self, url): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type - res = req.get_response(fakes.wsgi_app(init_only=('servers',))) + res = req.get_response(fakes.wsgi_app_v21(init_only=('servers',))) return res def _get_server(self, body): @@ -166,7 +162,25 @@ class ExtendedIpsMacTest(test.TestCase): self.assertServerStates(server) -class ExtendedIpsMacXmlTest(ExtendedIpsMacTest): +class ExtendedIpsMacTestV2(ExtendedIpsMacTestV21): + content_type = 'application/json' + prefix = '%s:' % extended_ips_mac.Extended_ips_mac.alias + + def setUp(self): + super(ExtendedIpsMacTestV2, self).setUp() + self.flags( + osapi_compute_extension=[ + 'nova.api.openstack.compute.contrib.select_extensions'], + osapi_compute_ext_list=['Extended_ips_mac']) + + def _make_request(self, url): + req = webob.Request.blank(url) + req.headers['Accept'] = self.content_type + res = req.get_response(fakes.wsgi_app(init_only=('servers',))) + return res + + +class ExtendedIpsMacXmlTest(ExtendedIpsMacTestV2): content_type = 'application/xml' prefix = '{%s}' % extended_ips_mac.Extended_ips_mac.namespace 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 2818b38c76db..e7ea2f0369a2 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py @@ -340,9 +340,11 @@ class ServersControllerTest(ControllerTest): "addresses": { 'test1': [ {'version': 4, 'addr': '192.168.1.100', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 6, 'addr': '2001:db8:0:1::1', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'} + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'} ] }, "metadata": { @@ -453,19 +455,25 @@ class ServersControllerTest(ControllerTest): 'addresses': { 'private': [ {'version': 4, 'addr': '192.168.0.3', - 'type': 'fixed', 'mac_addr': 'bb:bb:bb:bb:bb:bb'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'bb:bb:bb:bb:bb:bb'}, {'version': 4, 'addr': '192.168.0.4', - 'type': 'fixed', 'mac_addr': 'bb:bb:bb:bb:bb:bb'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'bb:bb:bb:bb:bb:bb'}, ], 'public': [ {'version': 4, 'addr': '172.19.0.1', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 4, 'addr': '172.19.0.2', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 4, 'addr': '1.2.3.4', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 6, 'addr': 'b33f::fdee:ddff:fecc:bbaa', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, ], }, } @@ -2749,9 +2757,11 @@ class ServersViewBuilderTest(test.TestCase): "addresses": { 'test1': [ {'version': 4, 'addr': '192.168.1.100', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 6, 'addr': '2001:db8:0:1::1', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'} + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'} ] }, "metadata": {}, @@ -2811,9 +2821,11 @@ class ServersViewBuilderTest(test.TestCase): "addresses": { 'test1': [ {'version': 4, 'addr': '192.168.1.100', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 6, 'addr': '2001:db8:0:1::1', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'} + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'} ] }, "metadata": {}, @@ -2961,9 +2973,11 @@ class ServersViewBuilderTest(test.TestCase): "addresses": { 'test1': [ {'version': 4, 'addr': '192.168.1.100', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 6, 'addr': '2001:db8:0:1::1', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'} + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'} ] }, "metadata": {}, @@ -3026,9 +3040,11 @@ class ServersViewBuilderTest(test.TestCase): "addresses": { 'test1': [ {'version': 4, 'addr': '192.168.1.100', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, {'version': 6, 'addr': '2001:db8:0:1::1', - 'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'}, + 'OS-EXT-IPS:type': 'fixed', + 'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'}, ] }, "metadata": {"Open": "Stack"}, 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 0c6f1ad5cc2c..240b255c81d0 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 @@ -6,8 +6,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 e57488f0670f..ae6d35e7b50f 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 @@ -7,8 +7,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 b77f2bad016c..e9b7921f30a3 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 @@ -5,8 +5,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 9825b757a32a..efe780117470 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 @@ -6,8 +6,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 b64f39846a1d..b3e8c665e83b 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 @@ -6,8 +6,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 4820bf490727..041f1a105621 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 @@ -7,8 +7,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl index e07ccc46cd69..a9e9bc6564e7 100644 --- a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl @@ -5,8 +5,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl index b4bcf7c3fe7e..21ed41cf7ddb 100644 --- a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl @@ -6,8 +6,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 233e5f864503..d6436738effe 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 @@ -8,8 +8,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 59e5c8bc2453..c81acaf935db 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 @@ -9,8 +9,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 3244c1736e92..a4c68a3e8b65 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 @@ -10,8 +10,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 18474a64b5b0..8fc7dbcc4e2e 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 @@ -11,8 +11,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 fd870e24fd6f..a0b73e41d280 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 @@ -11,8 +11,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 5655465683f7..b8e17cd8cf8b 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 @@ -12,8 +12,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 3b38100e5115..1a28dd80efdd 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 e2561549a4b5..bb8a9bb9cb35 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 @@ -8,8 +8,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, diff --git a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl index 84ad95035979..b94f013f2814 100644 --- a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl @@ -4,8 +4,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl index 3b2a344d0cbc..d152ae31ec47 100644 --- a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl @@ -5,8 +5,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 a7fb13e958cb..02547e994f61 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 @@ -5,8 +5,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 e3c28e9de211..cd6ded9be3e7 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 @@ -5,8 +5,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 763e8f4f8655..47ed3c1f22ad 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 3555888907e1..519292d50aad 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 @@ -8,8 +8,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 0063b465c392..90e75947e59f 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 @@ -6,8 +6,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 635888de4151..ae20daabf751 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 @@ -9,8 +9,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl b/nova/tests/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl index 8df9796e9c70..404649a36e3c 100644 --- a/nova/tests/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl @@ -2,8 +2,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl b/nova/tests/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl index a2eab422f288..322ff1980223 100644 --- a/nova/tests/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl @@ -3,8 +3,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl index 8c8c124b0a0d..3c44eb8d7e68 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl @@ -5,8 +5,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl index 8c8c124b0a0d..3c44eb8d7e68 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl @@ -5,8 +5,8 @@ { "addr": "%(ip)s", "version": 4, - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed" + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed" } ] }, 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 b37fa3d12854..3c7cc6299928 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 @@ -4,8 +4,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] 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 a3d63d064f12..1d4f8d903197 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 @@ -5,8 +5,8 @@ "private": [ { "addr": "%(ip)s", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ]