diff --git a/doc/v3/api_samples/extension-info/extensions-get-resp.json b/doc/v3/api_samples/extension-info/extensions-get-resp.json index 1ee70325681b..0f8df1c991e0 100644 --- a/doc/v3/api_samples/extension-info/extensions-get-resp.json +++ b/doc/v3/api_samples/extension-info/extensions-get-resp.json @@ -3,7 +3,6 @@ "alias": "flavors", "description": "Flavors Extension.", "name": "flavors", - "namespace": "http://docs.openstack.org/compute/core/flavors/v3", "version": 1 } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/extension-info/extensions-list-resp.json b/doc/v3/api_samples/extension-info/extensions-list-resp.json index d25cdf57cdeb..a83faeeb44ed 100644 --- a/doc/v3/api_samples/extension-info/extensions-list-resp.json +++ b/doc/v3/api_samples/extension-info/extensions-list-resp.json @@ -4,15 +4,13 @@ "alias": "extensions", "description": "Extension information.", "name": "extensions", - "namespace": "http://docs.openstack.org/compute/core/extension_info/api/v3", "version": 1 }, { "alias": "flavors", "description": "Flavors Extension.", "name": "flavors", - "namespace": "http://docs.openstack.org/compute/core/flavors/v3", "version": 1 } ] -} \ No newline at end of file +} diff --git a/nova/api/openstack/compute/plugins/__init__.py b/nova/api/openstack/compute/plugins/__init__.py index 7a50de01ffdf..42c8b1280933 100644 --- a/nova/api/openstack/compute/plugins/__init__.py +++ b/nova/api/openstack/compute/plugins/__init__.py @@ -48,7 +48,6 @@ class LoadedExtensionInfo(object): LOG.debug(_('Ext alias: %s'), extension.alias) LOG.debug(_('Ext description: %s'), ' '.join(extension.__doc__.strip().split())) - LOG.debug(_('Ext namespace: %s'), extension.namespace) LOG.debug(_('Ext version: %i'), extension.version) except AttributeError as ex: LOG.exception(_("Exception loading extension: %s"), unicode(ex)) diff --git a/nova/api/openstack/compute/plugins/v3/access_ips.py b/nova/api/openstack/compute/plugins/v3/access_ips.py index 8e72b27541cd..04169c465e2f 100644 --- a/nova/api/openstack/compute/plugins/v3/access_ips.py +++ b/nova/api/openstack/compute/plugins/v3/access_ips.py @@ -79,8 +79,6 @@ class AccessIPs(extensions.V3APIExtensionBase): name = "AccessIPs" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "os-access-ips/api/v3") version = 1 v4_key = '%s:access_ip_v4' % ALIAS v6_key = '%s:access_ip_v6' % ALIAS diff --git a/nova/api/openstack/compute/plugins/v3/admin_password.py b/nova/api/openstack/compute/plugins/v3/admin_password.py index 757834e35fba..d52a71b57b75 100644 --- a/nova/api/openstack/compute/plugins/v3/admin_password.py +++ b/nova/api/openstack/compute/plugins/v3/admin_password.py @@ -67,8 +67,6 @@ class AdminPassword(extensions.V3APIExtensionBase): name = "AdminPassword" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "os-admin-password/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/agents.py b/nova/api/openstack/compute/plugins/v3/agents.py index 8ba5d4a3a87d..868b1166e4d8 100644 --- a/nova/api/openstack/compute/plugins/v3/agents.py +++ b/nova/api/openstack/compute/plugins/v3/agents.py @@ -145,7 +145,6 @@ class Agents(extensions.V3APIExtensionBase): name = "Agents" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/agents/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/aggregates.py b/nova/api/openstack/compute/plugins/v3/aggregates.py index 7db4f19598aa..08f7d5e10af2 100644 --- a/nova/api/openstack/compute/plugins/v3/aggregates.py +++ b/nova/api/openstack/compute/plugins/v3/aggregates.py @@ -227,7 +227,6 @@ class Aggregates(extensions.V3APIExtensionBase): name = "Aggregates" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/aggregates/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/attach_interfaces.py b/nova/api/openstack/compute/plugins/v3/attach_interfaces.py index 6c0c4225b7d0..799c0cb450c3 100644 --- a/nova/api/openstack/compute/plugins/v3/attach_interfaces.py +++ b/nova/api/openstack/compute/plugins/v3/attach_interfaces.py @@ -174,7 +174,6 @@ class AttachInterfaces(extensions.V3APIExtensionBase): name = "AttachInterfaces" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/interfaces/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/availability_zone.py b/nova/api/openstack/compute/plugins/v3/availability_zone.py index 5c72bea5fc22..f3bb1c6ba16b 100644 --- a/nova/api/openstack/compute/plugins/v3/availability_zone.py +++ b/nova/api/openstack/compute/plugins/v3/availability_zone.py @@ -127,8 +127,6 @@ class AvailabilityZone(extensions.V3APIExtensionBase): name = "AvailabilityZone" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "availabilityzone/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/block_device_mapping.py b/nova/api/openstack/compute/plugins/v3/block_device_mapping.py index 11fd6da32329..14ba43acec52 100644 --- a/nova/api/openstack/compute/plugins/v3/block_device_mapping.py +++ b/nova/api/openstack/compute/plugins/v3/block_device_mapping.py @@ -32,8 +32,6 @@ class BlockDeviceMapping(extensions.V3APIExtensionBase): name = "BlockDeviceMapping" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "blockdevicemapping/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/cells.py b/nova/api/openstack/compute/plugins/v3/cells.py index 07bd641f45c2..d461aa475337 100644 --- a/nova/api/openstack/compute/plugins/v3/cells.py +++ b/nova/api/openstack/compute/plugins/v3/cells.py @@ -331,7 +331,6 @@ class Cells(extensions.V3APIExtensionBase): name = "Cells" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/cells/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/certificates.py b/nova/api/openstack/compute/plugins/v3/certificates.py index a4a1a0399870..519153d6fdf9 100644 --- a/nova/api/openstack/compute/plugins/v3/certificates.py +++ b/nova/api/openstack/compute/plugins/v3/certificates.py @@ -74,8 +74,6 @@ class Certificates(extensions.V3APIExtensionBase): name = "Certificates" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "certificates/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/config_drive.py b/nova/api/openstack/compute/plugins/v3/config_drive.py index 303c731afcef..ca644b359674 100644 --- a/nova/api/openstack/compute/plugins/v3/config_drive.py +++ b/nova/api/openstack/compute/plugins/v3/config_drive.py @@ -58,7 +58,6 @@ class ConfigDrive(extensions.V3APIExtensionBase): name = "ConfigDrive" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/config_drive/api/v3" version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/console_output.py b/nova/api/openstack/compute/plugins/v3/console_output.py index 45fb68d0d560..2585ecb4f573 100644 --- a/nova/api/openstack/compute/plugins/v3/console_output.py +++ b/nova/api/openstack/compute/plugins/v3/console_output.py @@ -85,8 +85,6 @@ class ConsoleOutput(extensions.V3APIExtensionBase): name = "ConsoleOutput" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/core/" - "console-output/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/consoles.py b/nova/api/openstack/compute/plugins/v3/consoles.py index 3f6b42e6cf55..7258681b9947 100644 --- a/nova/api/openstack/compute/plugins/v3/consoles.py +++ b/nova/api/openstack/compute/plugins/v3/consoles.py @@ -100,7 +100,6 @@ class Consoles(extensions.V3APIExtensionBase): name = "Consoles" alias = "consoles" - namespace = "http://docs.openstack.org/compute/core/consoles/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/deferred_delete.py b/nova/api/openstack/compute/plugins/v3/deferred_delete.py index 9642ed11de05..3351ebb88627 100644 --- a/nova/api/openstack/compute/plugins/v3/deferred_delete.py +++ b/nova/api/openstack/compute/plugins/v3/deferred_delete.py @@ -77,8 +77,6 @@ class DeferredDelete(extensions.V3APIExtensionBase): name = "DeferredDelete" alias = "os-deferred-delete" - namespace = ("http://docs.openstack.org/compute/ext/" - "deferred-delete/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/evacuate.py b/nova/api/openstack/compute/plugins/v3/evacuate.py index 1539f1d272bd..2ac939b15016 100644 --- a/nova/api/openstack/compute/plugins/v3/evacuate.py +++ b/nova/api/openstack/compute/plugins/v3/evacuate.py @@ -92,7 +92,6 @@ class Evacuate(extensions.V3APIExtensionBase): name = "Evacuate" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/evacuate/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py b/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py index 8cc234920c93..9e22dd2c920a 100644 --- a/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py +++ b/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py @@ -60,8 +60,6 @@ class ExtendedAvailabilityZone(extensions.V3APIExtensionBase): name = "ExtendedAvailabilityZone" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "extended_availability_zone/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/extended_server_attributes.py b/nova/api/openstack/compute/plugins/v3/extended_server_attributes.py index 6691091cbd60..5fdc418e0f07 100644 --- a/nova/api/openstack/compute/plugins/v3/extended_server_attributes.py +++ b/nova/api/openstack/compute/plugins/v3/extended_server_attributes.py @@ -62,8 +62,6 @@ class ExtendedServerAttributes(extensions.V3APIExtensionBase): name = "ExtendedServerAttributes" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "extended_server_attributes/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/extended_status.py b/nova/api/openstack/compute/plugins/v3/extended_status.py index 9d42705f8cc2..66258c6a9f78 100644 --- a/nova/api/openstack/compute/plugins/v3/extended_status.py +++ b/nova/api/openstack/compute/plugins/v3/extended_status.py @@ -59,8 +59,6 @@ class ExtendedStatus(extensions.V3APIExtensionBase): name = "ExtendedStatus" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "extended_status/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/extended_volumes.py b/nova/api/openstack/compute/plugins/v3/extended_volumes.py index b4e3450d9ffa..83d69eb6b9fc 100644 --- a/nova/api/openstack/compute/plugins/v3/extended_volumes.py +++ b/nova/api/openstack/compute/plugins/v3/extended_volumes.py @@ -223,8 +223,6 @@ class ExtendedVolumes(extensions.V3APIExtensionBase): name = "ExtendedVolumes" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "extended_volumes/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/extension_info.py b/nova/api/openstack/compute/plugins/v3/extension_info.py index 7f6e294aff59..a09cdf10ab97 100644 --- a/nova/api/openstack/compute/plugins/v3/extension_info.py +++ b/nova/api/openstack/compute/plugins/v3/extension_info.py @@ -34,7 +34,6 @@ class ExtensionInfoController(object): ext_data['name'] = ext.name ext_data['alias'] = ext.alias ext_data['description'] = ext.__doc__ - ext_data['namespace'] = ext.namespace ext_data['version'] = ext.version return ext_data @@ -81,7 +80,6 @@ class ExtensionInfo(extensions.V3APIExtensionBase): name = "extensions" alias = "extensions" - namespace = "http://docs.openstack.org/compute/core/extension_info/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/flavor_access.py b/nova/api/openstack/compute/plugins/v3/flavor_access.py index 44bd7802f8dd..3e138765c567 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_access.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_access.py @@ -156,7 +156,6 @@ class FlavorAccess(extensions.V3APIExtensionBase): name = "FlavorAccess" alias = ALIAS - namespace = "http://docs.openstack.org/compute/core/%s/api/v3" % ALIAS version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/flavor_manage.py b/nova/api/openstack/compute/plugins/v3/flavor_manage.py index 72eef0e1f434..5ed4f10e09f9 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_manage.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_manage.py @@ -98,7 +98,6 @@ class FlavorManage(extensions.V3APIExtensionBase): name = "FlavorManage" alias = ALIAS - namespace = "http://docs.openstack.org/compute/core/%s/api/v3" % ALIAS version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/flavor_rxtx.py b/nova/api/openstack/compute/plugins/v3/flavor_rxtx.py index cb5e14b4533e..bdcf7ff6dc2a 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_rxtx.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_rxtx.py @@ -54,7 +54,6 @@ class FlavorRxtx(extensions.V3APIExtensionBase): name = "FlavorRxtx" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py index 59cb3990dcfb..65a16b779637 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors.py +++ b/nova/api/openstack/compute/plugins/v3/flavors.py @@ -119,7 +119,6 @@ class Flavors(extensions.V3APIExtensionBase): """Flavors Extension.""" name = "flavors" alias = "flavors" - namespace = "http://docs.openstack.org/compute/core/flavors/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py index e00c062ba615..625e9962f97b 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py +++ b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py @@ -118,7 +118,6 @@ class FlavorsExtraSpecs(extensions.V3APIExtensionBase): """Flavors Extension.""" name = 'FlavorsExtraSpecs' alias = FlavorExtraSpecsController.ALIAS - namespace = "http://docs.openstack.org/compute/core/%s/v3" % alias version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py b/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py index a33e63c65ca4..1d4f9df8b913 100644 --- a/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py +++ b/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py @@ -79,8 +79,6 @@ class HideServerAddresses(extensions.V3APIExtensionBase): name = 'HideServerAddresses' alias = ALIAS - namespace = ('http://docs.openstack.org/compute/ext/' - 'hide_server_addresses/api/v3') version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/hosts.py b/nova/api/openstack/compute/plugins/v3/hosts.py index b0221654cd88..7bfa6f652c29 100644 --- a/nova/api/openstack/compute/plugins/v3/hosts.py +++ b/nova/api/openstack/compute/plugins/v3/hosts.py @@ -310,7 +310,6 @@ class Hosts(extensions.V3APIExtensionBase): name = "Hosts" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/hosts/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/hypervisors.py b/nova/api/openstack/compute/plugins/v3/hypervisors.py index 0de516ecf1eb..007b8853859a 100644 --- a/nova/api/openstack/compute/plugins/v3/hypervisors.py +++ b/nova/api/openstack/compute/plugins/v3/hypervisors.py @@ -156,7 +156,6 @@ class Hypervisors(extensions.V3APIExtensionBase): name = "Hypervisors" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/hypervisors/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/instance_actions.py b/nova/api/openstack/compute/plugins/v3/instance_actions.py index 8fcd0cd48a9b..792d8ac2d96f 100644 --- a/nova/api/openstack/compute/plugins/v3/instance_actions.py +++ b/nova/api/openstack/compute/plugins/v3/instance_actions.py @@ -93,8 +93,6 @@ class InstanceActions(extensions.V3APIExtensionBase): name = "InstanceActions" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "instance-actions/api/v3") version = 1 def get_resources(self): 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 9f0831cf5e86..1b0d509e4f42 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 @@ -125,7 +125,6 @@ class InstanceUsageAuditLog(extensions.V3APIExtensionBase): """Admin-only Task Log Monitoring.""" name = "InstanceUsageAuditLog" alias = ALIAS - namespace = "http://docs.openstack.org/ext/services/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/ips.py b/nova/api/openstack/compute/plugins/v3/ips.py index ed19d22a4f17..654ba1566a25 100644 --- a/nova/api/openstack/compute/plugins/v3/ips.py +++ b/nova/api/openstack/compute/plugins/v3/ips.py @@ -70,7 +70,6 @@ class IPs(extensions.V3APIExtensionBase): name = "ips" alias = "ips" - namespace = "http://docs.openstack.org/compute/core/ips/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/keypairs.py b/nova/api/openstack/compute/plugins/v3/keypairs.py index 364cbcacd55e..a3acf550d778 100644 --- a/nova/api/openstack/compute/plugins/v3/keypairs.py +++ b/nova/api/openstack/compute/plugins/v3/keypairs.py @@ -170,7 +170,6 @@ class Keypairs(extensions.V3APIExtensionBase): name = "Keypairs" alias = ALIAS - namespace = "http://docs.openstack.org/compute/core/keypairs/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/lock_server.py b/nova/api/openstack/compute/plugins/v3/lock_server.py index 75646321fda9..e2d398269ae5 100644 --- a/nova/api/openstack/compute/plugins/v3/lock_server.py +++ b/nova/api/openstack/compute/plugins/v3/lock_server.py @@ -67,7 +67,6 @@ class LockServer(extensions.V3APIExtensionBase): name = "LockServer" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/migrations.py b/nova/api/openstack/compute/plugins/v3/migrations.py index 41aef1d5d970..a0c600450ab8 100644 --- a/nova/api/openstack/compute/plugins/v3/migrations.py +++ b/nova/api/openstack/compute/plugins/v3/migrations.py @@ -42,7 +42,6 @@ class Migrations(extensions.V3APIExtensionBase): """Provide data on migrations.""" name = "Migrations" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/migrations/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/multinic.py b/nova/api/openstack/compute/plugins/v3/multinic.py index 2196d0422f9b..3cfbbfa8b378 100644 --- a/nova/api/openstack/compute/plugins/v3/multinic.py +++ b/nova/api/openstack/compute/plugins/v3/multinic.py @@ -80,7 +80,6 @@ class Multinic(extensions.V3APIExtensionBase): name = "Multinic" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/multinic/api/v3" version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/multiple_create.py b/nova/api/openstack/compute/plugins/v3/multiple_create.py index 0bea6b7afe55..bc0cf1dbda05 100644 --- a/nova/api/openstack/compute/plugins/v3/multiple_create.py +++ b/nova/api/openstack/compute/plugins/v3/multiple_create.py @@ -33,8 +33,6 @@ class MultipleCreate(extensions.V3APIExtensionBase): name = "MultipleCreate" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "multiplecreate/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/pci.py b/nova/api/openstack/compute/plugins/v3/pci.py index a7e8fd856c2e..df04361ab47f 100644 --- a/nova/api/openstack/compute/plugins/v3/pci.py +++ b/nova/api/openstack/compute/plugins/v3/pci.py @@ -74,7 +74,6 @@ class Pci(extensions.V3APIExtensionBase): """Pci access support.""" name = "PCIAccess" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/quota_classes.py b/nova/api/openstack/compute/plugins/v3/quota_classes.py index d09331aa0419..02201235c913 100644 --- a/nova/api/openstack/compute/plugins/v3/quota_classes.py +++ b/nova/api/openstack/compute/plugins/v3/quota_classes.py @@ -87,8 +87,6 @@ class QuotaClasses(extensions.V3APIExtensionBase): name = "QuotaClasses" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "quota-class-sets/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/quota_sets.py b/nova/api/openstack/compute/plugins/v3/quota_sets.py index adeeb90950e0..8af93a8624db 100644 --- a/nova/api/openstack/compute/plugins/v3/quota_sets.py +++ b/nova/api/openstack/compute/plugins/v3/quota_sets.py @@ -225,7 +225,6 @@ class QuotaSets(extensions.V3APIExtensionBase): name = "Quotas" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/os-quotas-sets/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/remote_consoles.py b/nova/api/openstack/compute/plugins/v3/remote_consoles.py index a5f2e6f1009c..f3c63ec810d1 100644 --- a/nova/api/openstack/compute/plugins/v3/remote_consoles.py +++ b/nova/api/openstack/compute/plugins/v3/remote_consoles.py @@ -88,7 +88,6 @@ class RemoteConsoles(extensions.V3APIExtensionBase): """Interactive Console support.""" name = "RemoteConsoles" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/rescue.py b/nova/api/openstack/compute/plugins/v3/rescue.py index bbeb9a9e7a1c..993d9299c559 100644 --- a/nova/api/openstack/compute/plugins/v3/rescue.py +++ b/nova/api/openstack/compute/plugins/v3/rescue.py @@ -98,7 +98,6 @@ class Rescue(extensions.V3APIExtensionBase): name = "Rescue" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/rescue/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/scheduler_hints.py b/nova/api/openstack/compute/plugins/v3/scheduler_hints.py index 58c086c96be7..3b29c58419f5 100644 --- a/nova/api/openstack/compute/plugins/v3/scheduler_hints.py +++ b/nova/api/openstack/compute/plugins/v3/scheduler_hints.py @@ -54,8 +54,6 @@ class SchedulerHints(extensions.V3APIExtensionBase): name = "SchedulerHints" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "scheduler-hints/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/security_groups.py b/nova/api/openstack/compute/plugins/v3/security_groups.py index 2d3382a635fa..3bb6e9b08d33 100644 --- a/nova/api/openstack/compute/plugins/v3/security_groups.py +++ b/nova/api/openstack/compute/plugins/v3/security_groups.py @@ -126,7 +126,6 @@ class SecurityGroups(extensions.V3APIExtensionBase): """Security group support.""" name = "SecurityGroups" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/securitygroups/api/v3" version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/server_diagnostics.py b/nova/api/openstack/compute/plugins/v3/server_diagnostics.py index 4323eb39b5ab..8a69afdb4a9b 100644 --- a/nova/api/openstack/compute/plugins/v3/server_diagnostics.py +++ b/nova/api/openstack/compute/plugins/v3/server_diagnostics.py @@ -43,8 +43,6 @@ class ServerDiagnostics(extensions.V3APIExtensionBase): name = "ServerDiagnostics" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "server-diagnostics/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/server_metadata.py b/nova/api/openstack/compute/plugins/v3/server_metadata.py index 23ad27a9df9d..5009e5992c6e 100644 --- a/nova/api/openstack/compute/plugins/v3/server_metadata.py +++ b/nova/api/openstack/compute/plugins/v3/server_metadata.py @@ -173,7 +173,6 @@ class ServerMetadata(extensions.V3APIExtensionBase): """Server Metadata API.""" name = "Server Metadata" alias = "server-metadata" - namespace = "http://docs.openstack.org/compute/core/server_metadata/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/server_password.py b/nova/api/openstack/compute/plugins/v3/server_password.py index 0ee1bbbb2870..00d068a23473 100644 --- a/nova/api/openstack/compute/plugins/v3/server_password.py +++ b/nova/api/openstack/compute/plugins/v3/server_password.py @@ -74,7 +74,6 @@ class ServerPassword(extensions.V3APIExtensionBase): name = "ServerPassword" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" + ALIAS + "/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/server_usage.py b/nova/api/openstack/compute/plugins/v3/server_usage.py index d98e8236644a..1e5cdb7c7fa2 100644 --- a/nova/api/openstack/compute/plugins/v3/server_usage.py +++ b/nova/api/openstack/compute/plugins/v3/server_usage.py @@ -65,8 +65,6 @@ class ServerUsage(extensions.V3APIExtensionBase): name = "ServerUsage" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "os-server-usage/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index 0ea2c20cac82..155d4f4e206a 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -1022,7 +1022,6 @@ class Servers(extensions.V3APIExtensionBase): name = "Servers" alias = "servers" - namespace = "http://docs.openstack.org/compute/core/servers/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/services.py b/nova/api/openstack/compute/plugins/v3/services.py index 38991328983a..2a45f3001b8c 100644 --- a/nova/api/openstack/compute/plugins/v3/services.py +++ b/nova/api/openstack/compute/plugins/v3/services.py @@ -151,7 +151,6 @@ class Services(extensions.V3APIExtensionBase): name = "Services" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/services/api/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/shelve.py b/nova/api/openstack/compute/plugins/v3/shelve.py index f59967de8765..4261e62c7aa7 100644 --- a/nova/api/openstack/compute/plugins/v3/shelve.py +++ b/nova/api/openstack/compute/plugins/v3/shelve.py @@ -101,7 +101,6 @@ class Shelve(exts.V3APIExtensionBase): name = "Shelve" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/shelve/api/v3" version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py b/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py index 32221d43fe42..9598c2038943 100644 --- a/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py +++ b/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py @@ -252,8 +252,6 @@ class SimpleTenantUsage(extensions.V3APIExtensionBase): name = "SimpleTenantUsage" alias = ALIAS - namespace = ("http://docs.openstack.org/compute/ext/" - "os-simple-tenant-usage/api/v3") version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/user_data.py b/nova/api/openstack/compute/plugins/v3/user_data.py index 1ec71f42ef8b..86035b31de8f 100644 --- a/nova/api/openstack/compute/plugins/v3/user_data.py +++ b/nova/api/openstack/compute/plugins/v3/user_data.py @@ -26,8 +26,6 @@ class UserData(extensions.V3APIExtensionBase): name = "UserData" alias = "os-user-data" - namespace = ("http://docs.openstack.org/compute/ext/" - "userdata/api/v3") version = 1 def get_controller_extensions(self): diff --git a/nova/api/openstack/compute/plugins/v3/versions.py b/nova/api/openstack/compute/plugins/v3/versions.py index fa199e1acd3e..4e635227c2d2 100644 --- a/nova/api/openstack/compute/plugins/v3/versions.py +++ b/nova/api/openstack/compute/plugins/v3/versions.py @@ -35,7 +35,6 @@ class Versions(extensions.V3APIExtensionBase): name = "Versions" alias = ALIAS - namespace = "http://docs.openstack.org/compute/core/versions/v3" version = 1 def get_resources(self): diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 6c313fa71793..f477ba675069 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -445,11 +445,6 @@ class V3APIExtensionBase(object): """Alias for the extension.""" pass - @abc.abstractproperty - def namespace(self): - """Namespace for the extension.""" - pass - @abc.abstractproperty def version(self): """Version of the extension.""" diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py b/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py index 717d75b35f7a..81fb04f6c581 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py @@ -23,21 +23,17 @@ from nova.tests.api.openstack import fakes class fake_extension(object): - def __init__(self, name, alias, description, namespace, version): + def __init__(self, name, alias, description, version): self.name = name self.alias = alias self.__doc__ = description - self.namespace = namespace self.version = version fake_extensions = { - 'ext1-alias': fake_extension('ext1', 'ext1-alias', 'ext1 description', - 'ext1 namespace', 1), - 'ext2-alias': fake_extension('ext2', 'ext2-alias', 'ext2 description', - 'ext2 namespace', 2), - 'ext3-alias': fake_extension('ext3', 'ext3-alias', 'ext3 description', - 'ext3 namespace', 1) + 'ext1-alias': fake_extension('ext1', 'ext1-alias', 'ext1 description', 1), + 'ext2-alias': fake_extension('ext2', 'ext2-alias', 'ext2 description', 2), + 'ext3-alias': fake_extension('ext3', 'ext3-alias', 'ext3 description', 1) } @@ -71,8 +67,6 @@ class ExtensionInfoTest(test.NoDBTestCase): self.assertEqual(e['alias'], fake_extensions[e['alias']].alias) self.assertEqual(e['description'], fake_extensions[e['alias']].__doc__) - self.assertEqual(e['namespace'], - fake_extensions[e['alias']].namespace) self.assertEqual(e['version'], fake_extensions[e['alias']].version) @@ -87,8 +81,6 @@ class ExtensionInfoTest(test.NoDBTestCase): fake_extensions['ext1-alias'].alias) self.assertEqual(res_dict['extension']['description'], fake_extensions['ext1-alias'].__doc__) - self.assertEqual(res_dict['extension']['namespace'], - fake_extensions['ext1-alias'].namespace) self.assertEqual(res_dict['extension']['version'], fake_extensions['ext1-alias'].version) @@ -104,7 +96,5 @@ class ExtensionInfoTest(test.NoDBTestCase): self.assertEqual(e['alias'], fake_extensions[e['alias']].alias) self.assertEqual(e['description'], fake_extensions[e['alias']].__doc__) - self.assertEqual(e['namespace'], - fake_extensions[e['alias']].namespace) self.assertEqual(e['version'], fake_extensions[e['alias']].version) diff --git a/nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl index a042b02963de..0f8df1c991e0 100644 --- a/nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl @@ -3,7 +3,6 @@ "alias": "flavors", "description": "Flavors Extension.", "name": "flavors", - "namespace": "http://docs.openstack.org/compute/core/flavors/v3", "version": 1 } } diff --git a/nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl b/nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl index d25cdf57cdeb..a83faeeb44ed 100644 --- a/nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl @@ -4,15 +4,13 @@ "alias": "extensions", "description": "Extension information.", "name": "extensions", - "namespace": "http://docs.openstack.org/compute/core/extension_info/api/v3", "version": 1 }, { "alias": "flavors", "description": "Flavors Extension.", "name": "flavors", - "namespace": "http://docs.openstack.org/compute/core/flavors/v3", "version": 1 } ] -} \ No newline at end of file +}