From c99d8f32b22b02b7cf80848c06cd8b0d9cb6800a Mon Sep 17 00:00:00 2001 From: Chris Yeoh Date: Fri, 6 Feb 2015 15:00:04 +1030 Subject: [PATCH] Change some v2.1 extension names to v2 Changes some extension names (not aliases) in the v2.1 api to match what they are in v2. This is for compatibility between v2.1 and v2 to ensure /extensions output matches. Longer term the extension names don't really matter as users should just be using the extension alias and /extensions will be replaced by microversions and json HOME. So its not worth adding extra infrastructure which is capable of translating just the extension name like we do with other parts of the v2.1 /extension information Partially implements bp v2-on-v3-api Change-Id: I22227496aec51c5f523112cf49af92f0fa124a10 --- .../api_samples/all_extensions/extensions-list-resp.json | 8 ++++---- .../openstack/compute/plugins/v3/flavors_extraspecs.py | 2 +- .../compute/plugins/v3/instance_usage_audit_log.py | 2 +- nova/api/openstack/compute/plugins/v3/remote_consoles.py | 2 +- nova/api/openstack/compute/plugins/v3/tenant_networks.py | 2 +- .../all_extensions/extensions-list-resp.json.tpl | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) 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 902110ea7e..7bf8286bcd 100644 --- a/doc/v3/api_samples/all_extensions/extensions-list-resp.json +++ b/doc/v3/api_samples/all_extensions/extensions-list-resp.json @@ -268,7 +268,7 @@ "alias": "os-consoles", "description": "Interactive Console support.", "links": [], - "name": "RemoteConsoles", + "name": "Consoles", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, @@ -404,7 +404,7 @@ "alias": "os-flavor-extra-specs", "description": "Flavors extra specs support.", "links": [], - "name": "FlavorsExtraSpecs", + "name": "FlavorExtraSpecs", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, @@ -516,7 +516,7 @@ "alias": "os-instance_usage_audit_log", "description": "Admin-only Task Log Monitoring.", "links": [], - "name": "InstanceUsageAuditLog", + "name": "OSInstanceUsageAuditLog", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, @@ -740,7 +740,7 @@ "alias": "os-tenant-networks", "description": "Tenant-based Network Management Extension.", "links": [], - "name": "TenantNetworks", + "name": "OSTenantNetworks", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, diff --git a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py index b9265c54db..f6c7dd5dc3 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py +++ b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py @@ -140,7 +140,7 @@ class FlavorExtraSpecsController(wsgi.Controller): class FlavorsExtraSpecs(extensions.V3APIExtensionBase): """Flavors extra specs support.""" - name = 'FlavorsExtraSpecs' + name = 'FlavorExtraSpecs' alias = ALIAS version = 1 diff --git a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py index 247dc89071..a28f9a3bd0 100644 --- a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py @@ -128,7 +128,7 @@ class InstanceUsageAuditLogController(wsgi.Controller): class InstanceUsageAuditLog(extensions.V3APIExtensionBase): """Admin-only Task Log Monitoring.""" - name = "InstanceUsageAuditLog" + name = "OSInstanceUsageAuditLog" alias = ALIAS version = 1 diff --git a/nova/api/openstack/compute/plugins/v3/remote_consoles.py b/nova/api/openstack/compute/plugins/v3/remote_consoles.py index d99d221896..a72a00b71e 100644 --- a/nova/api/openstack/compute/plugins/v3/remote_consoles.py +++ b/nova/api/openstack/compute/plugins/v3/remote_consoles.py @@ -157,7 +157,7 @@ class RemoteConsolesController(wsgi.Controller): class RemoteConsoles(extensions.V3APIExtensionBase): """Interactive Console support.""" - name = "RemoteConsoles" + name = "Consoles" alias = ALIAS version = 1 diff --git a/nova/api/openstack/compute/plugins/v3/tenant_networks.py b/nova/api/openstack/compute/plugins/v3/tenant_networks.py index a32c5af52d..5c406532d4 100644 --- a/nova/api/openstack/compute/plugins/v3/tenant_networks.py +++ b/nova/api/openstack/compute/plugins/v3/tenant_networks.py @@ -195,7 +195,7 @@ class TenantNetworkController(wsgi.Controller): class TenantNetworks(extensions.V3APIExtensionBase): """Tenant-based Network Management Extension.""" - name = "TenantNetworks" + name = "OSTenantNetworks" alias = ALIAS version = 1 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 902110ea7e..7bf8286bcd 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 @@ -268,7 +268,7 @@ "alias": "os-consoles", "description": "Interactive Console support.", "links": [], - "name": "RemoteConsoles", + "name": "Consoles", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, @@ -404,7 +404,7 @@ "alias": "os-flavor-extra-specs", "description": "Flavors extra specs support.", "links": [], - "name": "FlavorsExtraSpecs", + "name": "FlavorExtraSpecs", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, @@ -516,7 +516,7 @@ "alias": "os-instance_usage_audit_log", "description": "Admin-only Task Log Monitoring.", "links": [], - "name": "InstanceUsageAuditLog", + "name": "OSInstanceUsageAuditLog", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" }, @@ -740,7 +740,7 @@ "alias": "os-tenant-networks", "description": "Tenant-based Network Management Extension.", "links": [], - "name": "TenantNetworks", + "name": "OSTenantNetworks", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "updated": "2014-12-03T00:00:00Z" },