From 59d00aac7c334e6720b760733873ea38116e16b7 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 3 Oct 2019 18:19:57 +0100 Subject: [PATCH] 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 --- .../common_payloads/BandwidthPayload.json | 2 +- doc/notification_samples/common_payloads/IpPayload.json | 2 +- doc/notification_samples/instance-interface_attach-end.json | 4 ++-- .../instance-interface_detach-start.json | 4 ++-- nova/tests/fixtures.py | 6 ++++-- .../functional/notification_sample_tests/test_instance.py | 4 ++-- nova/tests/functional/test_list_servers_ip_filter.py | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/notification_samples/common_payloads/BandwidthPayload.json b/doc/notification_samples/common_payloads/BandwidthPayload.json index dd1733c464f7..95311e4ea23d 100644 --- a/doc/notification_samples/common_payloads/BandwidthPayload.json +++ b/doc/notification_samples/common_payloads/BandwidthPayload.json @@ -1,6 +1,6 @@ { "nova_object.data": { - "network_name": "private-network", + "network_name": "private", "out_bytes": 0, "in_bytes": 0 }, diff --git a/doc/notification_samples/common_payloads/IpPayload.json b/doc/notification_samples/common_payloads/IpPayload.json index d1f108e81713..bf651c279621 100644 --- a/doc/notification_samples/common_payloads/IpPayload.json +++ b/doc/notification_samples/common_payloads/IpPayload.json @@ -8,7 +8,7 @@ "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "meta": {}, "version": 4, - "label": "private-network", + "label": "private", "device_name": "tapce531f90-19" } } diff --git a/doc/notification_samples/instance-interface_attach-end.json b/doc/notification_samples/instance-interface_attach-end.json index 273cd96f0e07..8fb0ffb6f63e 100644 --- a/doc/notification_samples/instance-interface_attach-end.json +++ b/doc/notification_samples/instance-interface_attach-end.json @@ -11,7 +11,7 @@ "device_name": "tapce531f90-19", "address": "192.168.1.3", "version": 4, - "label": "private-network", + "label": "private", "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "mac": "fa:16:3e:4c:2c:30", "meta": {} @@ -25,7 +25,7 @@ "device_name": "tap88dae9fa-0d", "address": "192.168.1.30", "version": 4, - "label": "private-network", + "label": "private", "port_uuid": "88dae9fa-0dc6-49e3-8c29-3abc41e99ac9", "mac": "00:0c:29:0d:11:74", "meta": {} diff --git a/doc/notification_samples/instance-interface_detach-start.json b/doc/notification_samples/instance-interface_detach-start.json index 6de3067dfe6e..591b34c58a5e 100644 --- a/doc/notification_samples/instance-interface_detach-start.json +++ b/doc/notification_samples/instance-interface_detach-start.json @@ -10,7 +10,7 @@ "device_name": "tapce531f90-19", "address": "192.168.1.3", "version": 4, - "label": "private-network", + "label": "private", "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "mac": "fa:16:3e:4c:2c:30", "meta": {} @@ -24,7 +24,7 @@ "device_name": "tap88dae9fa-0d", "address": "192.168.1.30", "version": 4, - "label": "private-network", + "label": "private", "port_uuid": "88dae9fa-0dc6-49e3-8c29-3abc41e99ac9", "mac": "00:0c:29:0d:11:74", "meta": {} diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index 326bedb61477..a1c866879435 100644 --- a/nova/tests/fixtures.py +++ b/nova/tests/fixtures.py @@ -1232,7 +1232,7 @@ class NeutronFixture(fixtures.Fixture): network_1 = { 'id': '3cb9bc59-5699-4588-a4b1-b87f96708bc6', - 'name': 'private-network', + 'name': 'private', 'description': '', 'status': 'ACTIVE', 'subnets': [], @@ -1382,7 +1382,9 @@ class NeutronFixture(fixtures.Fixture): network_2 = { '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': '', 'status': 'ACTIVE', 'subnets': [], diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py index d127c2b947ea..f329ddfe3845 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -649,7 +649,7 @@ class TestInstanceNotificationSample( "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442", "meta": {}, "version": 4, - "label": "private-network", + "label": "private", "device_name": "tapce531f90-19" }}] }, @@ -702,7 +702,7 @@ class TestInstanceNotificationSample( {'nova_object.namespace': 'nova', 'nova_object.name': 'BandwidthPayload', 'nova_object.data': - {'network_name': 'private-network', + {'network_name': 'private', 'out_bytes': 0, 'in_bytes': 0}, 'nova_object.version': '1.0'}], diff --git a/nova/tests/functional/test_list_servers_ip_filter.py b/nova/tests/functional/test_list_servers_ip_filter.py index 4402598fc192..375059487eae 100644 --- a/nova/tests/functional/test_list_servers_ip_filter.py +++ b/nova/tests/functional/test_list_servers_ip_filter.py @@ -115,4 +115,4 @@ class TestListServersIpFilter(test.TestCase): self.neutron.port_2['fixed_ips'][0]['ip_address'], servers)) self.assertEqual(self.neutron.port_2['fixed_ips'][0]['ip_address'], - servers[0]['addresses']['private-network'][0]['addr']) + servers[0]['addresses']['private'][0]['addr'])