From 3e98973787710c44ac408086f21acd6bcbc91cc3 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Tue, 7 Jul 2015 10:34:17 +0900 Subject: [PATCH] Removing extension "OS-EXT-VIF-NET" from v2.1 extension-list Extension "OS-EXT-VIF-NET" is not ported to v2.1, due to that there is difference between v2 and v2.1 as mentioned in bug#1470690. But v2.1 extension-list has "OS-EXT-VIF-NET" extension which convey that this extension is also loaded for v2.1 and user will get the expected response according to "OS-EXT-VIF-NET" extension which is not true as this extension is not actually ported to v2.1. It is decided that fix for that difference should go in microversion not in base v2.1 as it is already released. This patch remove extension "OS-EXT-VIF-NET" from v2.1 extension-list which will actually convey that this extension is missing in v2.1. Partial-Bug: 1470690 Depends-On: I3caca80a6c010b86150909126f4545425ed99e11 Change-Id: Ic99ac1179d02d907422911fe1369b64479fd5f33 --- doc/api_samples/all_extensions/extensions-list-resp.json | 8 -------- nova/api/openstack/compute/extension_info.py | 2 -- .../all_extensions/extensions-list-resp.json.tpl | 8 -------- 3 files changed, 18 deletions(-) diff --git a/doc/api_samples/all_extensions/extensions-list-resp.json b/doc/api_samples/all_extensions/extensions-list-resp.json index 6eef43d78334..b7d8872b9360 100644 --- a/doc/api_samples/all_extensions/extensions-list-resp.json +++ b/doc/api_samples/all_extensions/extensions-list-resp.json @@ -64,14 +64,6 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, - { - "alias": "OS-EXT-VIF-NET", - "description": "", - "links": [], - "name": "ExtendedVIFNet", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, { "alias": "OS-FLV-DISABLED", "description": "", diff --git a/nova/api/openstack/compute/extension_info.py b/nova/api/openstack/compute/extension_info.py index 069aaf52d68b..5535bc1ebf76 100644 --- a/nova/api/openstack/compute/extension_info.py +++ b/nova/api/openstack/compute/extension_info.py @@ -69,8 +69,6 @@ v21_to_v2_extension_list_mapping = { 'alias': 'os-extended-rescue-with-image'}], 'os-extended-status': [{'name': 'ExtendedStatus', 'alias': 'OS-EXT-STS'}], - 'os-virtual-interfaces': [{'name': 'ExtendedVIFNet', - 'alias': 'OS-EXT-VIF-NET'}], 'os-used-limits': [{'name': 'UsedLimitsForAdmin', 'alias': 'os-used-limits-for-admin'}], 'os-volumes': [{'name': 'VolumeAttachmentUpdate', diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl index 6eef43d78334..b7d8872b9360 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl @@ -64,14 +64,6 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, - { - "alias": "OS-EXT-VIF-NET", - "description": "", - "links": [], - "name": "ExtendedVIFNet", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, { "alias": "OS-FLV-DISABLED", "description": "",