openstack/nova
Code Issues Proposed changes

nova-net: Remove references to nova-net service from tests

Browse Source 
Remove some leftover references to the now-removed service from various
tests.

Change-Id: Ib3433b70b3a7b8f030bf60a0bc98ce926106b34d
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
2019-10-02 11:54:56 +01:00
parent d209dd7d52
commit 180221114c
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/compute/hosts.py
View File

@@ -53,12 +53,6 @@ class HostController(wsgi.Controller):
| {'host_name': 'some.celly.host.name', | {'host_name': 'some.celly.host.name',
| 'service': 'cells', | 'service': 'cells',
| 'zone': 'internal'}, | 'zone': 'internal'},
| {'host_name': 'network1.host.com',
| 'service': 'network',
| 'zone': 'internal'},
| {'host_name': 'network2.host.com',
| 'service': 'network',
| 'zone': 'internal'},
| {'host_name': 'compute1.host.com', | {'host_name': 'compute1.host.com',
| 'service': 'compute', | 'service': 'compute',
| 'zone': 'nova'}, | 'zone': 'nova'},

22
nova/tests/unit/api/openstack/compute/test_availability_zone.py
View File

@@ -61,11 +61,7 @@ def fake_service_get_all(context, filters=None, **kwargs):
__fake_service("nova-scheduler", "internal", __fake_service("nova-scheduler", "internal",
datetime.datetime(2012, 11, 14, 9, 57, 3, 0), datetime.datetime(2012, 11, 14, 9, 57, 3, 0),
datetime.datetime(2012, 12, 26, 14, 45, 25, 0), datetime.datetime(2012, 12, 26, 14, 45, 25, 0),
"fake_host-1", True), "fake_host-1", True)]
__fake_service("nova-network", "internal",
datetime.datetime(2012, 11, 16, 7, 25, 46, 0),
datetime.datetime(2012, 12, 26, 14, 45, 24, 0),
"fake_host-2", True)]
else: else:
svcs = [__fake_service("nova-compute", "zone-1", svcs = [__fake_service("nova-compute", "zone-1",
datetime.datetime(2012, 11, 14, 9, 53, 25, 0), datetime.datetime(2012, 11, 14, 9, 53, 25, 0),
@@ -80,11 +76,7 @@ def fake_service_get_all(context, filters=None, **kwargs):
__fake_service("nova-conductor", "internal", __fake_service("nova-conductor", "internal",
datetime.datetime(2012, 11, 14, 9, 57, 3, 0), datetime.datetime(2012, 11, 14, 9, 57, 3, 0),
datetime.datetime(2012, 12, 26, 14, 45, 25, 0), datetime.datetime(2012, 12, 26, 14, 45, 25, 0),
"fake_host-1", False), "fake_host-1", False)]
__fake_service("nova-network", "internal",
datetime.datetime(2012, 11, 16, 7, 25, 46, 0),
datetime.datetime(2012, 12, 26, 14, 45, 24, 0),
"fake_host-2", False)]
return objects.ServiceList(objects=svcs) return objects.ServiceList(objects=svcs)
@@ -98,7 +90,7 @@ class AvailabilityZoneApiTestV21(test.NoDBTestCase):
self.stub_out('nova.availability_zones.set_availability_zones', self.stub_out('nova.availability_zones.set_availability_zones',
lambda c, services: services) lambda c, services: services)
self.stub_out('nova.servicegroup.API.service_is_up', self.stub_out('nova.servicegroup.API.service_is_up',
lambda s, service: service['binary'] != u"nova-network") lambda s, service: True)
self.controller = self.availability_zone.AvailabilityZoneController() self.controller = self.availability_zone.AvailabilityZoneController()
self.mock_service_get_all = mock.patch.object( self.mock_service_get_all = mock.patch.object(
self.controller.host_api, 'service_get_all', self.controller.host_api, 'service_get_all',
@@ -141,7 +133,6 @@ class AvailabilityZoneApiTestV21(test.NoDBTestCase):
zones = resp_dict['availabilityZoneInfo'] zones = resp_dict['availabilityZoneInfo']
self.assertEqual(len(zones), 3) self.assertEqual(len(zones), 3)
timestamp = iso8601.parse_date("2012-12-26T14:45:25Z") timestamp = iso8601.parse_date("2012-12-26T14:45:25Z")
nova_network_timestamp = iso8601.parse_date("2012-12-26T14:45:24Z")
expected = [ expected = [
{ {
'zoneName': 'zone-1', 'zoneName': 'zone-1',
@@ -171,13 +162,6 @@ class AvailabilityZoneApiTestV21(test.NoDBTestCase):
'available': True, 'available': True,
'updated_at': timestamp 'updated_at': timestamp
} }
},
'fake_host-2': {
'nova-network': {
'active': True,
'available': False,
'updated_at': nova_network_timestamp
}
} }
} }
}, },