diff --git a/doc/v3/api_samples/all_extensions/extensions-list-resp.json b/doc/v3/api_samples/all_extensions/extensions-list-resp.json index 93f0ab9ac839..6eef43d78334 100644 --- a/doc/v3/api_samples/all_extensions/extensions-list-resp.json +++ b/doc/v3/api_samples/all_extensions/extensions-list-resp.json @@ -584,14 +584,6 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, - { - "alias": "os-pci", - "description": "Pci access support.", - "links": [], - "name": "PciAccess", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, { "alias": "os-personality", "description": "Personality support.", @@ -809,4 +801,4 @@ "updated": "2014-12-03T00:00:00Z" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/all_extensions/server-get-resp.json b/doc/v3/api_samples/all_extensions/server-get-resp.json index 10a878d7e052..d45fa151e75b 100644 --- a/doc/v3/api_samples/all_extensions/server-get-resp.json +++ b/doc/v3/api_samples/all_extensions/server-get-resp.json @@ -58,11 +58,6 @@ "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", "os-extended-volumes:volumes_attached": [], - "os-pci:pci_devices": [ - { - "id": 1 - } - ], "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/v3/api_samples/all_extensions/servers-details-resp.json b/doc/v3/api_samples/all_extensions/servers-details-resp.json index f6495b549066..93792dbda9cb 100644 --- a/doc/v3/api_samples/all_extensions/servers-details-resp.json +++ b/doc/v3/api_samples/all_extensions/servers-details-resp.json @@ -59,11 +59,6 @@ "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", "os-extended-volumes:volumes_attached": [], - "os-pci:pci_devices": [ - { - "id": 1 - } - ], "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl index 93f0ab9ac839..6eef43d78334 100644 --- a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl @@ -584,14 +584,6 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, - { - "alias": "os-pci", - "description": "Pci access support.", - "links": [], - "name": "PciAccess", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, { "alias": "os-personality", "description": "Personality support.", @@ -809,4 +801,4 @@ "updated": "2014-12-03T00:00:00Z" } ] -} \ No newline at end of file +} diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/server-get-resp.json.tpl index f43ced955141..ec85e8f1fc56 100644 --- a/nova/tests/functional/v3/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/all_extensions/server-get-resp.json.tpl @@ -58,7 +58,6 @@ "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", "os-extended-volumes:volumes_attached": [], - "os-pci:pci_devices": [{"id": 1}], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/servers-details-resp.json.tpl index e05509d6d067..bd377aa365a2 100644 --- a/nova/tests/functional/v3/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/all_extensions/servers-details-resp.json.tpl @@ -59,7 +59,6 @@ "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", "os-extended-volumes:volumes_attached": [], - "os-pci:pci_devices": [{"id": 1}], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/v3/test_pci.py b/nova/tests/functional/v3/test_pci.py index 8b4abc281a42..23516948a92a 100644 --- a/nova/tests/functional/v3/test_pci.py +++ b/nova/tests/functional/v3/test_pci.py @@ -16,6 +16,7 @@ import collections import mock from oslo_serialization import jsonutils +import testtools from nova import db from nova import objects @@ -23,6 +24,7 @@ from nova.objects import pci_device_pool from nova.tests.functional.v3 import api_sample_base from nova.tests.functional.v3 import test_servers +skip_msg = "Bug 1426241" fake_db_dev_1 = { 'created_at': None, @@ -68,6 +70,9 @@ fake_db_dev_2 = { class ExtendedServerPciSampleJsonTest(test_servers.ServersSampleBase): extension_name = "os-pci" + def setUp(self): + raise testtools.TestCase.skipException(skip_msg) + def test_show(self): uuid = self._post_server() response = self._do_get('servers/%s' % uuid) @@ -88,6 +93,7 @@ class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): extension_name = 'os-pci' def setUp(self): + raise testtools.TestCase.skipException(skip_msg) super(ExtendedHyervisorPciSampleJsonTest, self).setUp() cpu_info = collections.OrderedDict([ ('arch', 'x86_64'), @@ -173,6 +179,9 @@ class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): class PciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): extension_name = "os-pci" + def setUp(self): + raise testtools.TestCase.skipException(skip_msg) + def _fake_pci_device_get_by_id(self, context, id): return fake_db_dev_1 diff --git a/setup.cfg b/setup.cfg index 82fffadbe02b..195fe5aabc70 100644 --- a/setup.cfg +++ b/setup.cfg @@ -111,7 +111,9 @@ nova.api.v3.extensions = networks = nova.api.openstack.compute.plugins.v3.networks:Networks networks_associate = nova.api.openstack.compute.plugins.v3.networks_associate:NetworksAssociate pause_server = nova.api.openstack.compute.plugins.v3.pause_server:PauseServer - pci = nova.api.openstack.compute.plugins.v3.pci:Pci +# NOTE(cyeoh): this is intentionally disabled until microversions is active. +# See https://bugs.launchpad.net/nova/+bug/1426241 +# pci = nova.api.openstack.compute.plugins.v3.pci:Pci personality = nova.api.openstack.compute.plugins.v3.personality:Personality preserve_ephemeral_rebuild = nova.api.openstack.compute.plugins.v3.preserve_ephemeral_rebuild:PreserveEphemeralRebuild quota_classes = nova.api.openstack.compute.plugins.v3.quota_classes:QuotaClasses