openstack/nova
Code Issues Proposed changes

Merge "nova-net: Stop mocking the instance network cache"

Browse Source
This commit is contained in:
Zuul
2019-10-08 16:07:02 +00:00
committed by Gerrit Code Review
parent 671298448e 337c90808e
commit a06c841421
79 changed files with 110 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json
View File

@@ -3,7 +3,7 @@
{ {
"created_at": "2012-11-27T17:18:01Z", "created_at": "2012-11-27T17:18:01Z",
"instance_id": "27deecdb-baa3-4a26-9c82-32994b815b01", "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", "project_id": "fa1765bd-a352-49c7-a6b7-8ee108a3cb0c",
"public_ip": "127.0.0.1", "public_ip": "127.0.0.1",
"public_port": 22, "public_port": 22,

2
doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/os-rescue/server-get-resp-rescue.json
View File

@@ -5,8 +5,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/os-rescue/server-get-resp-unrescue.json
View File

@@ -5,8 +5,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json
View File

@@ -6,8 +6,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json
View File

@@ -6,8 +6,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
doc/api_samples/server-ips/server-ips-network-resp.json
View File

@@ -1,7 +1,7 @@
{ {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/server-ips/server-ips-resp.json
View File

@@ -2,7 +2,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/server-action-addfloatingip-req.json
View File

@@ -1,6 +1,6 @@
{ {
"addFloatingIp" : { "addFloatingIp" : {
"address": "10.10.10.10", "address": "10.10.10.10",
"fixed_address": "192.168.0.3" "fixed_address": "192.168.1.30"
} }
} }

2
doc/api_samples/servers/server-action-rebuild-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/server-get-resp.json
View File

@@ -5,8 +5,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
doc/api_samples/servers/server-update-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/servers-details-resp.json
View File

@@ -6,8 +6,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/servers/v2.16/server-get-resp.json
View File

@@ -3,8 +3,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/servers/v2.16/servers-details-resp.json
View File

@@ -4,8 +4,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
doc/api_samples/servers/v2.19/server-action-rebuild-resp.json
View File

@@ -5,7 +5,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.19/server-get-resp.json
View File

@@ -5,9 +5,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.19/server-put-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.19/servers-details-resp.json
View File

@@ -6,9 +6,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.26/server-action-rebuild-resp.json
View File

@@ -5,7 +5,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.3/server-get-resp.json
View File

@@ -5,8 +5,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/servers/v2.3/servers-details-resp.json
View File

@@ -6,8 +6,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
doc/api_samples/servers/v2.47/server-action-rebuild-resp.json
View File

@@ -5,7 +5,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.47/server-get-resp.json
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.47/server-update-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.47/servers-details-resp.json
View File

@@ -23,9 +23,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.52/server-get-resp.json
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.52/servers-details-resp.json
View File

@@ -23,9 +23,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.54/server-action-rebuild-resp.json
View File

@@ -5,7 +5,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.57/server-action-rebuild-resp.json
View File

@@ -5,7 +5,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.63/server-action-rebuild-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.63/server-get-resp.json
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.63/server-update-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.63/servers-details-resp.json
View File

@@ -23,9 +23,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.66/servers-details-with-changes-before.json
View File

@@ -23,7 +23,7 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.1", "addr": "192.168.0.1",
"version": 4 "version": 4

2
doc/api_samples/servers/v2.71/server-action-rebuild-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.71/server-get-resp.json
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.71/server-update-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
doc/api_samples/servers/v2.73/server-action-rebuild-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

6
doc/api_samples/servers/v2.73/server-get-resp.json
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]
@@ -85,4 +85,4 @@
"updated": "2019-04-23T15:19:11Z", "updated": "2019-04-23T15:19:11Z",
"user_id": "fake" "user_id": "fake"
} }
} }

2
doc/api_samples/servers/v2.73/server-update-resp.json
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.73/servers-details-resp.json
View File

@@ -23,9 +23,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.75/server-action-rebuild-resp.json
View File

@@ -21,9 +21,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.75/server-update-resp.json
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
doc/api_samples/servers/v2.9/server-get-resp.json
View File

@@ -5,8 +5,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

4
doc/api_samples/servers/v2.9/servers-details-resp.json
View File

@@ -6,8 +6,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

3
nova/tests/functional/api_sample_tests/api_sample_base.py
View File

@@ -120,7 +120,8 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios,
if not self.USE_NEUTRON: if not self.USE_NEUTRON:
# self.network is only setup if USE_NEUTRON=False # self.network is only setup if USE_NEUTRON=False
self.useFixture(test.SampleNetworks(host=self.network.host)) 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()) self.useFixture(fixtures.SpawnIsSynchronousFixture())
# this is used to generate sample docs # this is used to generate sample docs
self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None

2
nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl
View File

@@ -7,7 +7,7 @@
{ {
"addr": "%(ip)s", "addr": "%(ip)s",
"version": 4, "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" "OS-EXT-IPS:type": "fixed"
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
View File

@@ -7,7 +7,7 @@
{ {
"addr": "%(ip)s", "addr": "%(ip)s",
"version": 4, "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" "OS-EXT-IPS:type": "fixed"
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl
View File

@@ -6,8 +6,8 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl
View File

@@ -37,7 +37,7 @@
{ {
"addr": "%(ip)s", "addr": "%(ip)s",
"version": 4, "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" "OS-EXT-IPS:type": "fixed"
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.71/server-update-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-action-rebuild-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-get-resp.json.tpl
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/server-update-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"addresses": { "addresses": {
"private": [ "private": [
{ {
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.73/servers-details-resp.json.tpl
View File

@@ -23,7 +23,7 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "%(ip)s", "addr": "%(ip)s",
"version": 4 "version": 4

4
nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-action-rebuild-resp.json.tpl
View File

@@ -21,9 +21,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/servers/v2.75/server-update-resp.json.tpl
View File

@@ -22,9 +22,9 @@
"addresses": { "addresses": {
"private": [ "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", "OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3", "addr": "192.168.1.30",
"version": 4 "version": 4
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl
View File

@@ -6,7 +6,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }

2
nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl
View File

@@ -7,7 +7,7 @@
"private": [ "private": [
{ {
"addr": "%(ip)s", "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", "OS-EXT-IPS:type": "fixed",
"version": 4 "version": 4
} }