From 337c90808e2f2f30badb3d50c728e07910589103 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 3 Oct 2019 18:21:39 +0100 Subject: [PATCH] nova-net: Stop mocking the instance network cache This has been tying us to nova-network. This should be a one line change but it has a large knock-on effect due to lots of samples using it. We just need to suck it up and deal with it, unfortunately. Change-Id: I09c88e0fdf3635683c56901637fc3c0a9084d482 Signed-off-by: Stephen Finucane --- doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json | 2 +- .../server-action-rebuild-preserve-ephemeral-resp.json | 2 +- doc/api_samples/os-rescue/server-get-resp-rescue.json | 4 ++-- doc/api_samples/os-rescue/server-get-resp-unrescue.json | 4 ++-- .../os-server-tags/v2.26/server-tags-show-details-resp.json | 4 ++-- .../os-server-tags/v2.26/servers-tags-details-resp.json | 4 ++-- doc/api_samples/server-ips/server-ips-network-resp.json | 2 +- doc/api_samples/server-ips/server-ips-resp.json | 2 +- .../servers/server-action-addfloatingip-req.json | 2 +- doc/api_samples/servers/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/server-get-resp.json | 4 ++-- doc/api_samples/servers/server-update-resp.json | 2 +- doc/api_samples/servers/servers-details-resp.json | 4 ++-- doc/api_samples/servers/v2.16/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.16/servers-details-resp.json | 4 ++-- .../servers/v2.19/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/v2.19/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.19/server-put-resp.json | 2 +- doc/api_samples/servers/v2.19/servers-details-resp.json | 4 ++-- .../servers/v2.26/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/v2.3/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.3/servers-details-resp.json | 4 ++-- .../servers/v2.47/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/v2.47/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.47/server-update-resp.json | 2 +- doc/api_samples/servers/v2.47/servers-details-resp.json | 4 ++-- doc/api_samples/servers/v2.52/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.52/servers-details-resp.json | 4 ++-- .../servers/v2.54/server-action-rebuild-resp.json | 2 +- .../servers/v2.57/server-action-rebuild-resp.json | 2 +- .../servers/v2.63/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/v2.63/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.63/server-update-resp.json | 2 +- doc/api_samples/servers/v2.63/servers-details-resp.json | 4 ++-- .../servers/v2.66/servers-details-with-changes-before.json | 2 +- .../servers/v2.71/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/v2.71/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.71/server-update-resp.json | 2 +- .../servers/v2.73/server-action-rebuild-resp.json | 2 +- doc/api_samples/servers/v2.73/server-get-resp.json | 6 +++--- doc/api_samples/servers/v2.73/server-update-resp.json | 2 +- doc/api_samples/servers/v2.73/servers-details-resp.json | 4 ++-- .../servers/v2.75/server-action-rebuild-resp.json | 4 ++-- doc/api_samples/servers/v2.75/server-update-resp.json | 4 ++-- doc/api_samples/servers/v2.9/server-get-resp.json | 4 ++-- doc/api_samples/servers/v2.9/servers-details-resp.json | 4 ++-- nova/tests/functional/api_sample_tests/api_sample_base.py | 3 ++- .../api_samples/os-rescue/server-get-resp-rescue.json.tpl | 2 +- .../api_samples/os-rescue/server-get-resp-unrescue.json.tpl | 2 +- .../v2.26/server-tags-show-details-resp.json.tpl | 4 ++-- .../os-server-tags/v2.26/servers-tags-details-resp.json.tpl | 2 +- .../api_samples/servers/server-get-resp.json.tpl | 2 +- .../api_samples/servers/server-update-resp.json.tpl | 2 +- .../api_samples/servers/servers-details-resp.json.tpl | 2 +- .../api_samples/servers/v2.16/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.16/servers-details-resp.json.tpl | 2 +- .../api_samples/servers/v2.19/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.19/servers-details-resp.json.tpl | 2 +- .../api_samples/servers/v2.3/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.3/servers-details-resp.json.tpl | 2 +- .../api_samples/servers/v2.47/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.47/server-update-resp.json.tpl | 2 +- .../api_samples/servers/v2.47/servers-details-resp.json.tpl | 2 +- .../api_samples/servers/v2.52/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.52/servers-details-resp.json.tpl | 2 +- .../api_samples/servers/v2.63/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.63/server-update-resp.json.tpl | 2 +- .../api_samples/servers/v2.63/servers-details-resp.json.tpl | 2 +- .../v2.66/servers-details-with-changes-before.json.tpl | 2 +- .../api_samples/servers/v2.71/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.71/server-update-resp.json.tpl | 2 +- .../servers/v2.73/server-action-rebuild-resp.json.tpl | 2 +- .../api_samples/servers/v2.73/server-get-resp.json.tpl | 4 ++-- .../api_samples/servers/v2.73/server-update-resp.json.tpl | 2 +- .../api_samples/servers/v2.73/servers-details-resp.json.tpl | 2 +- .../servers/v2.75/server-action-rebuild-resp.json.tpl | 4 ++-- .../api_samples/servers/v2.75/server-update-resp.json.tpl | 4 ++-- .../api_samples/servers/v2.9/server-get-resp.json.tpl | 2 +- .../api_samples/servers/v2.9/servers-details-resp.json.tpl | 2 +- 79 files changed, 110 insertions(+), 109 deletions(-) diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json b/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json index caaa22774ad5..e6bc92a62688 100644 --- a/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json +++ b/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json @@ -3,7 +3,7 @@ { "created_at": "2012-11-27T17:18:01Z", "instance_id": "27deecdb-baa3-4a26-9c82-32994b815b01", - "internal_ip": "192.168.0.3", + "internal_ip": "192.168.1.30", "project_id": "fa1765bd-a352-49c7-a6b7-8ee108a3cb0c", "public_ip": "127.0.0.1", "public_port": 22, diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json index 38ef12daaa8e..f65af997aae9 100644 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json +++ b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/os-rescue/server-get-resp-rescue.json b/doc/api_samples/os-rescue/server-get-resp-rescue.json index 707e5a89065d..9a9c29eea209 100644 --- a/doc/api_samples/os-rescue/server-get-resp-rescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-rescue.json @@ -5,8 +5,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/api_samples/os-rescue/server-get-resp-unrescue.json index b163bc064e08..0136ca4e9b2c 100644 --- a/doc/api_samples/os-rescue/server-get-resp-unrescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-unrescue.json @@ -5,8 +5,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json b/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json index 6ae101260eff..deeba67511e7 100644 --- a/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json +++ b/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json @@ -6,8 +6,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json b/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json index 6e39ae53ff0a..023e45b5cc5d 100644 --- a/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json +++ b/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json @@ -6,8 +6,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/server-ips/server-ips-network-resp.json b/doc/api_samples/server-ips/server-ips-network-resp.json index 8669202e745a..fdb070ac3cd9 100644 --- a/doc/api_samples/server-ips/server-ips-network-resp.json +++ b/doc/api_samples/server-ips/server-ips-network-resp.json @@ -1,7 +1,7 @@ { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/server-ips/server-ips-resp.json b/doc/api_samples/server-ips/server-ips-resp.json index 8a3500561399..f710c5777ed8 100644 --- a/doc/api_samples/server-ips/server-ips-resp.json +++ b/doc/api_samples/server-ips/server-ips-resp.json @@ -2,7 +2,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/server-action-addfloatingip-req.json b/doc/api_samples/servers/server-action-addfloatingip-req.json index e4ad5638ab27..654c6bda4c8e 100644 --- a/doc/api_samples/servers/server-action-addfloatingip-req.json +++ b/doc/api_samples/servers/server-action-addfloatingip-req.json @@ -1,6 +1,6 @@ { "addFloatingIp" : { "address": "10.10.10.10", - "fixed_address": "192.168.0.3" + "fixed_address": "192.168.1.30" } } \ No newline at end of file diff --git a/doc/api_samples/servers/server-action-rebuild-resp.json b/doc/api_samples/servers/server-action-rebuild-resp.json index b66dc4ce80d2..65acbb5d9b1e 100644 --- a/doc/api_samples/servers/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/server-action-rebuild-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/server-get-resp.json b/doc/api_samples/servers/server-get-resp.json index 667b3586b1d4..f04a0ae0b269 100644 --- a/doc/api_samples/servers/server-get-resp.json +++ b/doc/api_samples/servers/server-get-resp.json @@ -5,8 +5,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/server-update-resp.json b/doc/api_samples/servers/server-update-resp.json index 4607e312f23b..26384cee2c7f 100644 --- a/doc/api_samples/servers/server-update-resp.json +++ b/doc/api_samples/servers/server-update-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json index 1d4898cb6ac0..5dd38f78f4fe 100644 --- a/doc/api_samples/servers/servers-details-resp.json +++ b/doc/api_samples/servers/servers-details-resp.json @@ -6,8 +6,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/v2.16/server-get-resp.json b/doc/api_samples/servers/v2.16/server-get-resp.json index 36dfe8fb496a..426db9f903ca 100644 --- a/doc/api_samples/servers/v2.16/server-get-resp.json +++ b/doc/api_samples/servers/v2.16/server-get-resp.json @@ -3,8 +3,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/v2.16/servers-details-resp.json b/doc/api_samples/servers/v2.16/servers-details-resp.json index a6b1d4d5e168..9886ebf3da40 100644 --- a/doc/api_samples/servers/v2.16/servers-details-resp.json +++ b/doc/api_samples/servers/v2.16/servers-details-resp.json @@ -4,8 +4,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json index b38d40709d11..73528464e18f 100644 --- a/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json @@ -5,7 +5,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.19/server-get-resp.json b/doc/api_samples/servers/v2.19/server-get-resp.json index 3fd3bc93610b..b808a159c7c6 100644 --- a/doc/api_samples/servers/v2.19/server-get-resp.json +++ b/doc/api_samples/servers/v2.19/server-get-resp.json @@ -5,9 +5,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.19/server-put-resp.json b/doc/api_samples/servers/v2.19/server-put-resp.json index 29c8f6ac9b32..6ec7fa6b0dc7 100644 --- a/doc/api_samples/servers/v2.19/server-put-resp.json +++ b/doc/api_samples/servers/v2.19/server-put-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.19/servers-details-resp.json b/doc/api_samples/servers/v2.19/servers-details-resp.json index 37f83b7dd354..395c91f9fc81 100644 --- a/doc/api_samples/servers/v2.19/servers-details-resp.json +++ b/doc/api_samples/servers/v2.19/servers-details-resp.json @@ -6,9 +6,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.26/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.26/server-action-rebuild-resp.json index 86a7b41c232e..40c9e6070a6a 100644 --- a/doc/api_samples/servers/v2.26/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.26/server-action-rebuild-resp.json @@ -5,7 +5,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.3/server-get-resp.json b/doc/api_samples/servers/v2.3/server-get-resp.json index cfb9c9c57a5b..037673f20c70 100644 --- a/doc/api_samples/servers/v2.3/server-get-resp.json +++ b/doc/api_samples/servers/v2.3/server-get-resp.json @@ -5,8 +5,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/v2.3/servers-details-resp.json b/doc/api_samples/servers/v2.3/servers-details-resp.json index 3f0ecab3165f..ccdc3193bf40 100644 --- a/doc/api_samples/servers/v2.3/servers-details-resp.json +++ b/doc/api_samples/servers/v2.3/servers-details-resp.json @@ -6,8 +6,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/v2.47/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.47/server-action-rebuild-resp.json index 7069951d97f3..9b4350eea5e2 100644 --- a/doc/api_samples/servers/v2.47/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.47/server-action-rebuild-resp.json @@ -5,7 +5,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.47/server-get-resp.json b/doc/api_samples/servers/v2.47/server-get-resp.json index 406b6d41aa8e..eadd8cccad60 100644 --- a/doc/api_samples/servers/v2.47/server-get-resp.json +++ b/doc/api_samples/servers/v2.47/server-get-resp.json @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.47/server-update-resp.json b/doc/api_samples/servers/v2.47/server-update-resp.json index abf9e107d844..cc96f4db26e5 100644 --- a/doc/api_samples/servers/v2.47/server-update-resp.json +++ b/doc/api_samples/servers/v2.47/server-update-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.47/servers-details-resp.json b/doc/api_samples/servers/v2.47/servers-details-resp.json index 6c6c2804be33..571494990798 100644 --- a/doc/api_samples/servers/v2.47/servers-details-resp.json +++ b/doc/api_samples/servers/v2.47/servers-details-resp.json @@ -23,9 +23,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.52/server-get-resp.json b/doc/api_samples/servers/v2.52/server-get-resp.json index 9eaff718fab1..189400df2496 100644 --- a/doc/api_samples/servers/v2.52/server-get-resp.json +++ b/doc/api_samples/servers/v2.52/server-get-resp.json @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.52/servers-details-resp.json b/doc/api_samples/servers/v2.52/servers-details-resp.json index 6b7bd0220ad5..c42c5a2d0211 100644 --- a/doc/api_samples/servers/v2.52/servers-details-resp.json +++ b/doc/api_samples/servers/v2.52/servers-details-resp.json @@ -23,9 +23,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.54/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.54/server-action-rebuild-resp.json index 612bd6019943..668303f5b21f 100644 --- a/doc/api_samples/servers/v2.54/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.54/server-action-rebuild-resp.json @@ -5,7 +5,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.57/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.57/server-action-rebuild-resp.json index 05225e7dcb29..7680368a67a5 100644 --- a/doc/api_samples/servers/v2.57/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.57/server-action-rebuild-resp.json @@ -5,7 +5,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json index e1db18192a1f..9beefb12568a 100644 --- a/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.63/server-get-resp.json b/doc/api_samples/servers/v2.63/server-get-resp.json index 82c3b9bcf2c0..c7abc9ad6551 100644 --- a/doc/api_samples/servers/v2.63/server-get-resp.json +++ b/doc/api_samples/servers/v2.63/server-get-resp.json @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.63/server-update-resp.json b/doc/api_samples/servers/v2.63/server-update-resp.json index 9f2bbe6728b6..d9bb68dc062a 100644 --- a/doc/api_samples/servers/v2.63/server-update-resp.json +++ b/doc/api_samples/servers/v2.63/server-update-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.63/servers-details-resp.json b/doc/api_samples/servers/v2.63/servers-details-resp.json index 089a07ff02cc..3603f1214f3e 100644 --- a/doc/api_samples/servers/v2.63/servers-details-resp.json +++ b/doc/api_samples/servers/v2.63/servers-details-resp.json @@ -23,9 +23,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.66/servers-details-with-changes-before.json b/doc/api_samples/servers/v2.66/servers-details-with-changes-before.json index 1f3c91460e1c..15e786a66167 100644 --- a/doc/api_samples/servers/v2.66/servers-details-with-changes-before.json +++ b/doc/api_samples/servers/v2.66/servers-details-with-changes-before.json @@ -23,7 +23,7 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "addr": "192.168.0.1", "version": 4 diff --git a/doc/api_samples/servers/v2.71/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.71/server-action-rebuild-resp.json index a4ca94e85d1b..3044b69e133b 100644 --- a/doc/api_samples/servers/v2.71/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.71/server-action-rebuild-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.71/server-get-resp.json b/doc/api_samples/servers/v2.71/server-get-resp.json index 46f07e947804..afe68495bba0 100644 --- a/doc/api_samples/servers/v2.71/server-get-resp.json +++ b/doc/api_samples/servers/v2.71/server-get-resp.json @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.71/server-update-resp.json b/doc/api_samples/servers/v2.71/server-update-resp.json index 8024a7cd9f32..26be517a68ee 100644 --- a/doc/api_samples/servers/v2.71/server-update-resp.json +++ b/doc/api_samples/servers/v2.71/server-update-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.73/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.73/server-action-rebuild-resp.json index 1234595ac549..aacceae048c8 100644 --- a/doc/api_samples/servers/v2.73/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.73/server-action-rebuild-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.73/server-get-resp.json b/doc/api_samples/servers/v2.73/server-get-resp.json index c2b7a3c84aab..5776774dfa3e 100644 --- a/doc/api_samples/servers/v2.73/server-get-resp.json +++ b/doc/api_samples/servers/v2.73/server-get-resp.json @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] @@ -85,4 +85,4 @@ "updated": "2019-04-23T15:19:11Z", "user_id": "fake" } -} \ No newline at end of file +} diff --git a/doc/api_samples/servers/v2.73/server-update-resp.json b/doc/api_samples/servers/v2.73/server-update-resp.json index 73c43120bb3e..c7b960cc7e4c 100644 --- a/doc/api_samples/servers/v2.73/server-update-resp.json +++ b/doc/api_samples/servers/v2.73/server-update-resp.json @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.73/servers-details-resp.json b/doc/api_samples/servers/v2.73/servers-details-resp.json index f82f8be54d7a..67865fa3ae5c 100644 --- a/doc/api_samples/servers/v2.73/servers-details-resp.json +++ b/doc/api_samples/servers/v2.73/servers-details-resp.json @@ -23,9 +23,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.75/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.75/server-action-rebuild-resp.json index c50a17834f1d..78025ab0c616 100644 --- a/doc/api_samples/servers/v2.75/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.75/server-action-rebuild-resp.json @@ -21,9 +21,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.75/server-update-resp.json b/doc/api_samples/servers/v2.75/server-update-resp.json index 5040ae6c725d..cd22347a00e1 100644 --- a/doc/api_samples/servers/v2.75/server-update-resp.json +++ b/doc/api_samples/servers/v2.75/server-update-resp.json @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/doc/api_samples/servers/v2.9/server-get-resp.json b/doc/api_samples/servers/v2.9/server-get-resp.json index a4f32246e775..af1bbb296df7 100644 --- a/doc/api_samples/servers/v2.9/server-get-resp.json +++ b/doc/api_samples/servers/v2.9/server-get-resp.json @@ -5,8 +5,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/doc/api_samples/servers/v2.9/servers-details-resp.json b/doc/api_samples/servers/v2.9/servers-details-resp.json index 610de3e0ccc4..ff5818a86096 100644 --- a/doc/api_samples/servers/v2.9/servers-details-resp.json +++ b/doc/api_samples/servers/v2.9/servers-details-resp.json @@ -6,8 +6,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py index f9e51f854075..e75bac6c8c7c 100644 --- a/nova/tests/functional/api_sample_tests/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -120,7 +120,8 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios, if not self.USE_NEUTRON: # self.network is only setup if USE_NEUTRON=False self.useFixture(test.SampleNetworks(host=self.network.host)) - fake_network.stub_compute_with_ips(self) + fake_network.stub_compute_with_ips(self) + self.useFixture(fixtures.SpawnIsSynchronousFixture()) # this is used to generate sample docs self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl index 4b6f0e1d3d4e..1838c50533bb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl @@ -7,7 +7,7 @@ { "addr": "%(ip)s", "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl index 5d1bfb325745..35ed72fc5fb2 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl @@ -7,7 +7,7 @@ { "addr": "%(ip)s", "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl index 4a1b8bd5ad2b..e8ec32ccf32e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl @@ -6,8 +6,8 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "addr": "192.168.1.30", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl index 665db740f6a1..5ecbd6814f5e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl index 621c9be11345..db22c63a60bb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl index a712dbfb940a..252f6478c00c 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl index 3b5b1a1e25a5..29bbc2498c18 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl index e3473a497942..3a2679ccf248 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl @@ -37,7 +37,7 @@ { "addr": "%(ip)s", "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl index 640fc4265094..fb7d43ec0824 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl index 939381ed9724..1c4110528d1f 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl index adb6de734cc4..12b8ee539ebf 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/server-get-resp.json.tpl index 3639ab6c115f..05a4ab614b7e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl index 1dffa0a78067..c993fc1f8f16 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl index 5568f7ab5e2c..782ca0974033 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl index a297a767bd56..4daca2c30f76 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl index cba2f9d102b9..ded56e01b386 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/server-get-resp.json.tpl index 39f9038eabb2..8ae086dd5842 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl index c73cf740b85b..8a2669ce8206 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl index ac6c385ce629..b0e890df2d71 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl index d96971c4c46c..233751590e0d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl index a64afc4a346f..ee96b1df8668 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl index 9d42bbd49902..8f0a5051781a 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-get-resp.json.tpl index ac2536ab77c9..260a22d785fb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-update-resp.json.tpl index a7353ec3db1c..98a4a0c57c5d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-update-resp.json.tpl @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-action-rebuild-resp.json.tpl index b4570476f849..8b25ba622b56 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-action-rebuild-resp.json.tpl @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-get-resp.json.tpl index 765a6d087742..1fd0f291a70c 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-get-resp.json.tpl @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-update-resp.json.tpl index f9fe440d851c..1dee1263b7cf 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-update-resp.json.tpl @@ -6,7 +6,7 @@ "addresses": { "private": [ { - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/servers-details-resp.json.tpl index 44d04a2f4b42..fcf12e1901ae 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/servers-details-resp.json.tpl @@ -23,7 +23,7 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "addr": "%(ip)s", "version": 4 diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-action-rebuild-resp.json.tpl index 4a3ac1962381..37e52c17d529 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-action-rebuild-resp.json.tpl @@ -21,9 +21,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-update-resp.json.tpl index 920cd6e32467..dfe6700a2b1b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-update-resp.json.tpl @@ -22,9 +22,9 @@ "addresses": { "private": [ { - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", - "addr": "192.168.0.3", + "addr": "192.168.1.30", "version": 4 } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl index 635d3012a465..01c8d93096f1 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl @@ -6,7 +6,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl index 424968bbe0c2..59f7885deb96 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl @@ -7,7 +7,7 @@ "private": [ { "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74", "OS-EXT-IPS:type": "fixed", "version": 4 }