openstack
/
nova
Code Issues Proposed changes

trivial: Change name of network provided by NeutronFixture 

We do this because most of our sample tests are currently using a fake
network cache due to 'stub_compute_with_ips', and that fake cache uses
the name 'private' instead of 'private-network'. When we remove that in
a future change, there's going to be a lot of refactoring. Head some of
that off by just using the same name.

Change-Id: I6339005a0d49a6dfd376523d3f9e145a00cfc3bd
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2019-10-03 18:19:57 +01:00
parent 8b8542558a
commit 59d00aac7c
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/notification_samples/common_payloads/BandwidthPayload.json
View File

@ -1,6 +1,6 @@
{ {
"nova_object.data": { "nova_object.data": {
"network_name": "private-network", "network_name": "private",
"out_bytes": 0, "out_bytes": 0,
"in_bytes": 0 "in_bytes": 0
}, },

2
doc/notification_samples/common_payloads/IpPayload.json
View File

@ -8,7 +8,7 @@
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
"meta": {}, "meta": {},
"version": 4, "version": 4,
"label": "private-network", "label": "private",
"device_name": "tapce531f90-19" "device_name": "tapce531f90-19"
} }
} }

4
doc/notification_samples/instance-interface_attach-end.json
View File

@ -11,7 +11,7 @@
"device_name": "tapce531f90-19", "device_name": "tapce531f90-19",
"address": "192.168.1.3", "address": "192.168.1.3",
"version": 4, "version": 4,
"label": "private-network", "label": "private",
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
"mac": "fa:16:3e:4c:2c:30", "mac": "fa:16:3e:4c:2c:30",
"meta": {} "meta": {}
@ -25,7 +25,7 @@
"device_name": "tap88dae9fa-0d", "device_name": "tap88dae9fa-0d",
"address": "192.168.1.30", "address": "192.168.1.30",
"version": 4, "version": 4,
"label": "private-network", "label": "private",
"port_uuid": "88dae9fa-0dc6-49e3-8c29-3abc41e99ac9", "port_uuid": "88dae9fa-0dc6-49e3-8c29-3abc41e99ac9",
"mac": "00:0c:29:0d:11:74", "mac": "00:0c:29:0d:11:74",
"meta": {} "meta": {}

4
doc/notification_samples/instance-interface_detach-start.json
View File

@ -10,7 +10,7 @@
"device_name": "tapce531f90-19", "device_name": "tapce531f90-19",
"address": "192.168.1.3", "address": "192.168.1.3",
"version": 4, "version": 4,
"label": "private-network", "label": "private",
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
"mac": "fa:16:3e:4c:2c:30", "mac": "fa:16:3e:4c:2c:30",
"meta": {} "meta": {}
@ -24,7 +24,7 @@
"device_name": "tap88dae9fa-0d", "device_name": "tap88dae9fa-0d",
"address": "192.168.1.30", "address": "192.168.1.30",
"version": 4, "version": 4,
"label": "private-network", "label": "private",
"port_uuid": "88dae9fa-0dc6-49e3-8c29-3abc41e99ac9", "port_uuid": "88dae9fa-0dc6-49e3-8c29-3abc41e99ac9",
"mac": "00:0c:29:0d:11:74", "mac": "00:0c:29:0d:11:74",
"meta": {} "meta": {}

6
nova/tests/fixtures.py
View File

@ -1232,7 +1232,7 @@ class NeutronFixture(fixtures.Fixture):
network_1 = { network_1 = {
'id': '3cb9bc59-5699-4588-a4b1-b87f96708bc6', 'id': '3cb9bc59-5699-4588-a4b1-b87f96708bc6',
'name': 'private-network', 'name': 'private',
'description': '', 'description': '',
'status': 'ACTIVE', 'status': 'ACTIVE',
'subnets': [], 'subnets': [],
@ -1382,7 +1382,9 @@ class NeutronFixture(fixtures.Fixture):
network_2 = { network_2 = {
'id': '1b70879f-fd00-411e-8ea9-143e7820e61d', 'id': '1b70879f-fd00-411e-8ea9-143e7820e61d',
'name': 'private-network', # TODO(stephenfin): This would be more useful name due to things like
# https://bugs.launchpad.net/nova/+bug/1708316
'name': 'private',
'description': '', 'description': '',
'status': 'ACTIVE', 'status': 'ACTIVE',
'subnets': [], 'subnets': [],

4
nova/tests/functional/notification_sample_tests/test_instance.py
View File

@ -649,7 +649,7 @@ class TestInstanceNotificationSample(
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
"meta": {}, "meta": {},
"version": 4, "version": 4,
"label": "private-network", "label": "private",
"device_name": "tapce531f90-19" "device_name": "tapce531f90-19"
}}] }}]
}, },
@ -702,7 +702,7 @@ class TestInstanceNotificationSample(
{'nova_object.namespace': 'nova', {'nova_object.namespace': 'nova',
'nova_object.name': 'BandwidthPayload', 'nova_object.name': 'BandwidthPayload',
'nova_object.data': 'nova_object.data':
{'network_name': 'private-network', {'network_name': 'private',
'out_bytes': 0, 'out_bytes': 0,
'in_bytes': 0}, 'in_bytes': 0},
'nova_object.version': '1.0'}], 'nova_object.version': '1.0'}],

2
nova/tests/functional/test_list_servers_ip_filter.py
View File

@ -115,4 +115,4 @@ class TestListServersIpFilter(test.TestCase):
self.neutron.port_2['fixed_ips'][0]['ip_address'], self.neutron.port_2['fixed_ips'][0]['ip_address'],
servers)) servers))
self.assertEqual(self.neutron.port_2['fixed_ips'][0]['ip_address'], self.assertEqual(self.neutron.port_2['fixed_ips'][0]['ip_address'],
servers[0]['addresses']['private-network'][0]['addr']) servers[0]['addresses']['private'][0]['addr'])