From f5c3ea2f1ea14b4da13b09d097fecaf34eb9f4fb Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 20 Sep 2019 13:28:32 +0100 Subject: [PATCH] nova-net: Migrate 'test_hosts' functional tests Another case of there being no nova-network host. Change-Id: I51df797df4e1b77f70fe3dd87374737e650c27d9 Signed-off-by: Stephen Finucane --- doc/api_samples/os-hosts/hosts-list-resp.json | 5 ----- .../api_samples/os-hosts/hosts-list-resp.json.tpl | 5 ----- nova/tests/functional/api_sample_tests/test_hosts.py | 2 -- 3 files changed, 12 deletions(-) diff --git a/doc/api_samples/os-hosts/hosts-list-resp.json b/doc/api_samples/os-hosts/hosts-list-resp.json index 449cbfa5a1..cd6b8d0c6a 100644 --- a/doc/api_samples/os-hosts/hosts-list-resp.json +++ b/doc/api_samples/os-hosts/hosts-list-resp.json @@ -10,11 +10,6 @@ "service": "compute", "zone": "nova" }, - { - "host_name": "396a8a0a234f476eb05fb9fbc5802ba7", - "service": "network", - "zone": "internal" - }, { "host_name": "abffda96592c4eacaf4111c28fddee17", "service": "scheduler", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl index cf4ebd5dfc..971322e517 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl @@ -10,11 +10,6 @@ "service": "compute", "zone": "nova" }, - { - "host_name": "%(host_name)s", - "service": "network", - "zone": "internal" - }, { "host_name": "%(host_name)s", "service": "scheduler", diff --git a/nova/tests/functional/api_sample_tests/test_hosts.py b/nova/tests/functional/api_sample_tests/test_hosts.py index 205c6618f5..1d247176b2 100644 --- a/nova/tests/functional/api_sample_tests/test_hosts.py +++ b/nova/tests/functional/api_sample_tests/test_hosts.py @@ -17,7 +17,6 @@ from nova.tests.functional.api_sample_tests import api_sample_base class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): - USE_NEUTRON = False ADMIN_API = True sample_dir = "os-hosts" @@ -42,7 +41,6 @@ class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): response = self._do_get('os-hosts/%s' % self.compute.host) self._verify_response('host-get-resp', {}, response, 200) - # TODO(stephenfin): Migrate off of nova-network def test_hosts_list(self): response = self._do_get('os-hosts') self._verify_response('hosts-list-resp', {}, response, 200)