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 caaa22774a..e6bc92a626 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 38ef12daaa..f65af997aa 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 707e5a8906..9a9c29eea2 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 b163bc064e..0136ca4e9b 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 6ae101260e..deeba67511 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 6e39ae53ff..023e45b5cc 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 8669202e74..fdb070ac3c 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 8a35005613..f710c5777e 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 e4ad5638ab..654c6bda4c 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 b66dc4ce80..65acbb5d9b 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 667b3586b1..f04a0ae0b2 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 4607e312f2..26384cee2c 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 1d4898cb6a..5dd38f78f4 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 36dfe8fb49..426db9f903 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 a6b1d4d5e1..9886ebf3da 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 b38d40709d..73528464e1 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 3fd3bc9361..b808a159c7 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 29c8f6ac9b..6ec7fa6b0d 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 37f83b7dd3..395c91f9fc 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 86a7b41c23..40c9e6070a 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 cfb9c9c57a..037673f20c 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 3f0ecab316..ccdc3193bf 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 7069951d97..9b4350eea5 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 406b6d41aa..eadd8cccad 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 abf9e107d8..cc96f4db26 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 6c6c2804be..5714949907 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 9eaff718fa..189400df24 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 6b7bd0220a..c42c5a2d02 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 612bd60199..668303f5b2 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 05225e7dcb..7680368a67 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 e1db18192a..9beefb1256 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 82c3b9bcf2..c7abc9ad65 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 9f2bbe6728..d9bb68dc06 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 089a07ff02..3603f1214f 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 1f3c91460e..15e786a661 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 a4ca94e85d..3044b69e13 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 46f07e9478..afe68495bb 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 8024a7cd9f..26be517a68 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 1234595ac5..aacceae048 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 c2b7a3c84a..5776774dfa 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 73c43120bb..c7b960cc7e 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 f82f8be54d..67865fa3ae 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 c50a17834f..78025ab0c6 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 5040ae6c72..cd22347a00 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 a4f32246e7..af1bbb296d 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 610de3e0cc..ff5818a860 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 f9e51f8540..e75bac6c8c 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 4b6f0e1d3d..1838c50533 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 5d1bfb3257..35ed72fc5f 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 4a1b8bd5ad..e8ec32ccf3 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 665db740f6..5ecbd6814f 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 621c9be113..db22c63a60 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 a712dbfb94..252f6478c0 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 3b5b1a1e25..29bbc2498c 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 e3473a4979..3a2679ccf2 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 640fc42650..fb7d43ec08 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 939381ed97..1c4110528d 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 adb6de734c..12b8ee539e 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 3639ab6c11..05a4ab614b 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 1dffa0a780..c993fc1f8f 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 5568f7ab5e..782ca09740 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 a297a767bd..4daca2c30f 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 cba2f9d102..ded56e01b3 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 39f9038eab..8ae086dd58 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 c73cf740b8..8a2669ce82 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 ac6c385ce6..b0e890df2d 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 d96971c4c4..233751590e 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 a64afc4a34..ee96b1df86 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 9d42bbd499..8f0a505178 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 ac2536ab77..260a22d785 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 a7353ec3db..98a4a0c57c 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 b4570476f8..8b25ba622b 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 765a6d0877..1fd0f291a7 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 f9fe440d85..1dee1263b7 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 44d04a2f4b..fcf12e1901 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 4a3ac19623..37e52c17d5 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 920cd6e324..dfe6700a2b 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 635d3012a4..01c8d93096 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 424968bbe0..59f7885deb 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 }