openstack
/
nova
Code Issues Proposed changes

Removes XML namespace definitions from V3 API plugins 

Removes the XML namespace definitions from the V3 API
plugins declarations. Deliberately avoids removing
the XML namespace definition from admin_actions to avoid
yet another rebase of the admin_actions split series.

Fixes up associated tests and requirement for V3 API extensions
to define a namespace property.

Partially implements blueprint remove-v3-xml-api

Change-Id: If3e1314cefdc1abcdd5eca44bcc2282cac664f05
This commit is contained in:
Chris Yeoh 2014-01-31 14:27:50 +10:30
parent 12ecf0bdd8
commit 0db1e4ed2a
59 changed files with 7 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/v3/api_samples/extension-info/extensions-get-resp.json
View File

@ -3,7 +3,6 @@
"alias": "flavors",
"description": "Flavors Extension.",
"name": "flavors",
"namespace": "http://docs.openstack.org/compute/core/flavors/v3",
"version": 1
}
}
}

4
doc/v3/api_samples/extension-info/extensions-list-resp.json
View File

@ -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
}
]
}
}

1
nova/api/openstack/compute/plugins/__init__.py
View File

@ -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))

2
nova/api/openstack/compute/plugins/v3/access_ips.py
View File

@ -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

2
nova/api/openstack/compute/plugins/v3/admin_password.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/agents.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/aggregates.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/attach_interfaces.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/availability_zone.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/block_device_mapping.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/cells.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/certificates.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/config_drive.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/console_output.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/consoles.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/deferred_delete.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/evacuate.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/extended_availability_zone.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/extended_server_attributes.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/extended_status.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/extended_volumes.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/extension_info.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/flavor_access.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/flavor_manage.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/flavor_rxtx.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/flavors.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/hide_server_addresses.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/hosts.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/hypervisors.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/instance_actions.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/ips.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/keypairs.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/lock_server.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/migrations.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/multinic.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/multiple_create.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/pci.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/quota_classes.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/quota_sets.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/remote_consoles.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/rescue.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/scheduler_hints.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/security_groups.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/server_diagnostics.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/server_metadata.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/server_password.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/server_usage.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/servers.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/services.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/shelve.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py
View File

@ -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):

2
nova/api/openstack/compute/plugins/v3/user_data.py
View File

@ -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):

1
nova/api/openstack/compute/plugins/v3/versions.py
View File

@ -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):

5
nova/api/openstack/extensions.py
View File

@ -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."""

18
nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py
View File

@ -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)

1
nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl
View File

@ -3,7 +3,6 @@
"alias": "flavors",
"description": "Flavors Extension.",
"name": "flavors",
"namespace": "http://docs.openstack.org/compute/core/flavors/v3",
"version": 1
}
}

4
nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl
View File

@ -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
}
]
}
}