diff --git a/cinder/api/common.py b/cinder/api/common.py
index 1efb6ae761c..82069d951ef 100644
--- a/cinder/api/common.py
+++ b/cinder/api/common.py
@@ -23,8 +23,6 @@ from oslo_log import log as logging
from six.moves import urllib
import webob
-from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder.common import constants
from cinder import exception
from cinder.i18n import _
@@ -59,9 +57,6 @@ CONF.register_opts(api_common_opts)
LOG = logging.getLogger(__name__)
-XML_NS_V1 = 'http://docs.openstack.org/api/openstack-block-storage/1.0/content'
-XML_NS_V2 = 'http://docs.openstack.org/api/openstack-block-storage/2.0/content'
-
METADATA_TYPES = enum.Enum('METADATA_TYPES', 'user image')
@@ -370,75 +365,3 @@ class ViewBuilder(object):
url_parts[2] = prefix_parts[2] + url_parts[2]
return urllib.parse.urlunsplit(url_parts).rstrip('/')
-
-
-class MetadataDeserializer(wsgi.MetadataXMLDeserializer):
- def deserialize(self, text):
- dom = utils.safe_minidom_parse_string(text)
- metadata_node = self.find_first_child_named(dom, "metadata")
- metadata = self.extract_metadata(metadata_node)
- return {'body': {'metadata': metadata}}
-
-
-class MetaItemDeserializer(wsgi.MetadataXMLDeserializer):
- def deserialize(self, text):
- dom = utils.safe_minidom_parse_string(text)
- metadata_item = self.extract_metadata(dom)
- return {'body': {'meta': metadata_item}}
-
-
-class MetadataXMLDeserializer(wsgi.XMLDeserializer):
-
- def extract_metadata(self, metadata_node):
- """Marshal the metadata attribute of a parsed request."""
- if metadata_node is None:
- return {}
- metadata = {}
- for meta_node in self.find_children_named(metadata_node, "meta"):
- key = meta_node.getAttribute("key")
- metadata[key] = self.extract_text(meta_node)
- return metadata
-
- def _extract_metadata_container(self, datastring):
- dom = utils.safe_minidom_parse_string(datastring)
- metadata_node = self.find_first_child_named(dom, "metadata")
- metadata = self.extract_metadata(metadata_node)
- return {'body': {'metadata': metadata}}
-
- def create(self, datastring):
- return self._extract_metadata_container(datastring)
-
- def update_all(self, datastring):
- return self._extract_metadata_container(datastring)
-
- def update(self, datastring):
- dom = utils.safe_minidom_parse_string(datastring)
- metadata_item = self.extract_metadata(dom)
- return {'body': {'meta': metadata_item}}
-
-
-metadata_nsmap = {None: xmlutil.XMLNS_V11}
-
-
-class MetaItemTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- sel = xmlutil.Selector('meta', xmlutil.get_items, 0)
- root = xmlutil.TemplateElement('meta', selector=sel)
- root.set('key', 0)
- root.text = 1
- return xmlutil.MasterTemplate(root, 1, nsmap=metadata_nsmap)
-
-
-class MetadataTemplateElement(xmlutil.TemplateElement):
- def will_render(self, datum):
- return True
-
-
-class MetadataTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = MetadataTemplateElement('metadata', selector='metadata')
- elem = xmlutil.SubTemplateElement(root, 'meta',
- selector=xmlutil.get_items)
- elem.set('key', 0)
- elem.text = 1
- return xmlutil.MasterTemplate(root, 1, nsmap=metadata_nsmap)
diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py
index 0911d20ffb9..8cc1aa7f36a 100644
--- a/cinder/api/contrib/admin_actions.py
+++ b/cinder/api/contrib/admin_actions.py
@@ -334,7 +334,6 @@ class Admin_actions(extensions.ExtensionDescriptor):
name = "AdminActions"
alias = "os-admin-actions"
- namespace = "http://docs.openstack.org/volume/ext/admin-actions/api/v1.1"
updated = "2012-08-25T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/availability_zones.py b/cinder/api/contrib/availability_zones.py
index 2f028110469..c3f7b3f8d57 100644
--- a/cinder/api/contrib/availability_zones.py
+++ b/cinder/api/contrib/availability_zones.py
@@ -16,29 +16,10 @@
from cinder.api import extensions
from cinder.api.openstack import wsgi
import cinder.api.views.availability_zones
-from cinder.api import xmlutil
import cinder.exception
import cinder.volume.api
-def make_availability_zone(elem):
- elem.set('name', 'zoneName')
- zoneStateElem = xmlutil.SubTemplateElement(elem, 'zoneState',
- selector='zoneState')
- zoneStateElem.set('available')
-
-
-class ListTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('availabilityZones')
- elem = xmlutil.SubTemplateElement(root, 'availabilityZone',
- selector='availabilityZoneInfo')
- make_availability_zone(elem)
- alias = Availability_zones.alias
- namespace = Availability_zones.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
class Controller(wsgi.Controller):
_view_builder_class = cinder.api.views.availability_zones.ViewBuilder
@@ -47,7 +28,6 @@ class Controller(wsgi.Controller):
super(Controller, self).__init__(*args, **kwargs)
self.volume_api = cinder.volume.api.API()
- @wsgi.serializers(xml=ListTemplate)
def index(self, req):
"""Describe all known availability zones."""
azs = self.volume_api.list_availability_zones()
@@ -59,8 +39,6 @@ class Availability_zones(extensions.ExtensionDescriptor):
name = 'AvailabilityZones'
alias = 'os-availability-zone'
- namespace = ('http://docs.openstack.org/volume/ext/'
- 'os-availability-zone/api/v1')
updated = '2013-06-27T00:00:00+00:00'
def get_resources(self):
diff --git a/cinder/api/contrib/backups.py b/cinder/api/contrib/backups.py
index c5d2d8ed492..90a6625332e 100644
--- a/cinder/api/contrib/backups.py
+++ b/cinder/api/contrib/backups.py
@@ -25,7 +25,6 @@ from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
from cinder.api.views import backups as backup_views
-from cinder.api import xmlutil
from cinder import backup as backupAPI
from cinder import exception
from cinder.i18n import _, _LI
@@ -34,123 +33,6 @@ from cinder import utils
LOG = logging.getLogger(__name__)
-def make_backup(elem):
- elem.set('id')
- elem.set('status')
- elem.set('size')
- elem.set('container')
- elem.set('parent_id')
- elem.set('volume_id')
- elem.set('object_count')
- elem.set('availability_zone')
- elem.set('created_at')
- elem.set('name')
- elem.set('description')
- elem.set('fail_reason')
-
-
-def make_backup_restore(elem):
- elem.set('backup_id')
- elem.set('volume_id')
- elem.set('volume_name')
-
-
-def make_backup_export_import_record(elem):
- elem.set('backup_service')
- elem.set('backup_url')
-
-
-class BackupTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('backup', selector='backup')
- make_backup(root)
- alias = Backups.alias
- namespace = Backups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class BackupsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('backups')
- elem = xmlutil.SubTemplateElement(root, 'backup', selector='backups')
- make_backup(elem)
- alias = Backups.alias
- namespace = Backups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class BackupRestoreTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('restore', selector='restore')
- make_backup_restore(root)
- alias = Backups.alias
- namespace = Backups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class BackupExportImportTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('backup-record',
- selector='backup-record')
- make_backup_export_import_record(root)
- alias = Backups.alias
- namespace = Backups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class CreateDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- backup = self._extract_backup(dom)
- return {'body': {'backup': backup}}
-
- def _extract_backup(self, node):
- backup = {}
- backup_node = self.find_first_child_named(node, 'backup')
-
- attributes = ['container', 'display_name',
- 'display_description', 'volume_id',
- 'parent_id']
-
- for attr in attributes:
- if backup_node.getAttribute(attr):
- backup[attr] = backup_node.getAttribute(attr)
- return backup
-
-
-class RestoreDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- restore = self._extract_restore(dom)
- return {'body': {'restore': restore}}
-
- def _extract_restore(self, node):
- restore = {}
- restore_node = self.find_first_child_named(node, 'restore')
- if restore_node.getAttribute('volume_id'):
- restore['volume_id'] = restore_node.getAttribute('volume_id')
- return restore
-
-
-class BackupImportDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- backup = self._extract_backup(dom)
- retval = {'body': {'backup-record': backup}}
- return retval
-
- def _extract_backup(self, node):
- backup = {}
- backup_node = self.find_first_child_named(node, 'backup-record')
-
- attributes = ['backup_service', 'backup_url']
-
- for attr in attributes:
- if backup_node.getAttribute(attr):
- backup[attr] = backup_node.getAttribute(attr)
- return backup
-
-
class BackupsController(wsgi.Controller):
"""The Backups API controller for the OpenStack API."""
@@ -160,7 +42,6 @@ class BackupsController(wsgi.Controller):
self.backup_api = backupAPI.API()
super(BackupsController, self).__init__()
- @wsgi.serializers(xml=BackupTemplate)
def show(self, req, id):
"""Return data about the given backup."""
LOG.debug('show called for member %s', id)
@@ -191,12 +72,10 @@ class BackupsController(wsgi.Controller):
return webob.Response(status_int=202)
- @wsgi.serializers(xml=BackupsTemplate)
def index(self, req):
"""Returns a summary list of backups."""
return self._get_backups(req, is_detail=False)
- @wsgi.serializers(xml=BackupsTemplate)
def detail(self, req):
"""Returns a detailed list of backups."""
return self._get_backups(req, is_detail=True)
@@ -242,8 +121,6 @@ class BackupsController(wsgi.Controller):
# immediately
# - maybe also do validation of swift container name
@wsgi.response(202)
- @wsgi.serializers(xml=BackupTemplate)
- @wsgi.deserializers(xml=CreateDeserializer)
def create(self, req, body):
"""Create a new backup."""
LOG.debug('Creating new backup %s', body)
@@ -287,8 +164,6 @@ class BackupsController(wsgi.Controller):
return retval
@wsgi.response(202)
- @wsgi.serializers(xml=BackupRestoreTemplate)
- @wsgi.deserializers(xml=RestoreDeserializer)
def restore(self, req, id, body):
"""Restore an existing backup to a volume."""
LOG.debug('Restoring backup %(backup_id)s (%(body)s)',
@@ -331,7 +206,6 @@ class BackupsController(wsgi.Controller):
return retval
@wsgi.response(200)
- @wsgi.serializers(xml=BackupExportImportTemplate)
def export_record(self, req, id):
"""Export a backup."""
LOG.debug('export record called for member %s.', id)
@@ -350,8 +224,6 @@ class BackupsController(wsgi.Controller):
return retval
@wsgi.response(201)
- @wsgi.serializers(xml=BackupTemplate)
- @wsgi.deserializers(xml=BackupImportDeserializer)
def import_record(self, req, body):
"""Import a backup."""
LOG.debug('Importing record from %s.', body)
@@ -389,7 +261,6 @@ class Backups(extensions.ExtensionDescriptor):
name = 'Backups'
alias = 'backups'
- namespace = 'http://docs.openstack.org/volume/ext/backups/api/v1'
updated = '2012-12-12T00:00:00+00:00'
def get_resources(self):
diff --git a/cinder/api/contrib/capabilities.py b/cinder/api/contrib/capabilities.py
index b1796305cdd..d8430c6067d 100644
--- a/cinder/api/contrib/capabilities.py
+++ b/cinder/api/contrib/capabilities.py
@@ -65,7 +65,6 @@ class Capabilities(extensions.ExtensionDescriptor):
name = "Capabilities"
alias = "capabilities"
- namespace = "http://docs.openstack.org/volume/ext/capabilities/api/v2"
updated = "2015-08-31T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/cgsnapshots.py b/cinder/api/contrib/cgsnapshots.py
index 752f5e4b198..e618fefe1a5 100644
--- a/cinder/api/contrib/cgsnapshots.py
+++ b/cinder/api/contrib/cgsnapshots.py
@@ -23,63 +23,13 @@ from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
from cinder.api.views import cgsnapshots as cgsnapshot_views
-from cinder.api import xmlutil
from cinder import consistencygroup as consistencygroupAPI
from cinder import exception
from cinder.i18n import _, _LI
-from cinder import utils
LOG = logging.getLogger(__name__)
-def make_cgsnapshot(elem):
- elem.set('id')
- elem.set('consistencygroup_id')
- elem.set('status')
- elem.set('created_at')
- elem.set('name')
- elem.set('description')
-
-
-class CgsnapshotTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('cgsnapshot', selector='cgsnapshot')
- make_cgsnapshot(root)
- alias = Cgsnapshots.alias
- namespace = Cgsnapshots.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class CgsnapshotsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('cgsnapshots')
- elem = xmlutil.SubTemplateElement(root, 'cgsnapshot',
- selector='cgsnapshots')
- make_cgsnapshot(elem)
- alias = Cgsnapshots.alias
- namespace = Cgsnapshots.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class CreateDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- cgsnapshot = self._extract_cgsnapshot(dom)
- return {'body': {'cgsnapshot': cgsnapshot}}
-
- def _extract_cgsnapshot(self, node):
- cgsnapshot = {}
- cgsnapshot_node = self.find_first_child_named(node, 'cgsnapshot')
-
- attributes = ['name',
- 'description']
-
- for attr in attributes:
- if cgsnapshot_node.getAttribute(attr):
- cgsnapshot[attr] = cgsnapshot_node.getAttribute(attr)
- return cgsnapshot
-
-
class CgsnapshotsController(wsgi.Controller):
"""The cgsnapshots API controller for the OpenStack API."""
@@ -89,7 +39,6 @@ class CgsnapshotsController(wsgi.Controller):
self.cgsnapshot_api = consistencygroupAPI.API()
super(CgsnapshotsController, self).__init__()
- @wsgi.serializers(xml=CgsnapshotTemplate)
def show(self, req, id):
"""Return data about the given cgsnapshot."""
LOG.debug('show called for member %s', id)
@@ -127,12 +76,10 @@ class CgsnapshotsController(wsgi.Controller):
return webob.Response(status_int=202)
- @wsgi.serializers(xml=CgsnapshotsTemplate)
def index(self, req):
"""Returns a summary list of cgsnapshots."""
return self._get_cgsnapshots(req, is_detail=False)
- @wsgi.serializers(xml=CgsnapshotsTemplate)
def detail(self, req):
"""Returns a detailed list of cgsnapshots."""
return self._get_cgsnapshots(req, is_detail=True)
@@ -150,8 +97,6 @@ class CgsnapshotsController(wsgi.Controller):
return cgsnapshots
@wsgi.response(202)
- @wsgi.serializers(xml=CgsnapshotTemplate)
- @wsgi.deserializers(xml=CreateDeserializer)
def create(self, req, body):
"""Create a new cgsnapshot."""
LOG.debug('Creating new cgsnapshot %s', body)
@@ -197,7 +142,6 @@ class Cgsnapshots(extensions.ExtensionDescriptor):
name = 'Cgsnapshots'
alias = 'cgsnapshots'
- namespace = 'http://docs.openstack.org/volume/ext/cgsnapshots/api/v1'
updated = '2014-08-18T00:00:00+00:00'
def get_resources(self):
diff --git a/cinder/api/contrib/consistencygroups.py b/cinder/api/contrib/consistencygroups.py
index ac7f9439a3d..7c462784c47 100644
--- a/cinder/api/contrib/consistencygroups.py
+++ b/cinder/api/contrib/consistencygroups.py
@@ -24,108 +24,13 @@ from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
from cinder.api.views import consistencygroups as consistencygroup_views
-from cinder.api import xmlutil
from cinder import consistencygroup as consistencygroupAPI
from cinder import exception
from cinder.i18n import _, _LI
-from cinder import utils
LOG = logging.getLogger(__name__)
-def make_consistencygroup(elem):
- elem.set('id')
- elem.set('status')
- elem.set('availability_zone')
- elem.set('created_at')
- elem.set('name')
- elem.set('description')
-
-
-def make_consistencygroup_from_src(elem):
- elem.set('id')
- elem.set('status')
- elem.set('created_at')
- elem.set('name')
- elem.set('description')
- elem.set('cgsnapshot_id')
- elem.set('source_cgid')
-
-
-class ConsistencyGroupTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('consistencygroup',
- selector='consistencygroup')
- make_consistencygroup(root)
- alias = Consistencygroups.alias
- namespace = Consistencygroups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class ConsistencyGroupsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('consistencygroups')
- elem = xmlutil.SubTemplateElement(root, 'consistencygroup',
- selector='consistencygroups')
- make_consistencygroup(elem)
- alias = Consistencygroups.alias
- namespace = Consistencygroups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class ConsistencyGroupFromSrcTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('consistencygroup-from-src',
- selector='consistencygroup-from-src')
- make_consistencygroup_from_src(root)
- alias = Consistencygroups.alias
- namespace = Consistencygroups.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class CreateDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- consistencygroup = self._extract_consistencygroup(dom)
- return {'body': {'consistencygroup': consistencygroup}}
-
- def _extract_consistencygroup(self, node):
- consistencygroup = {}
- consistencygroup_node = self.find_first_child_named(
- node,
- 'consistencygroup')
-
- attributes = ['name',
- 'description']
-
- for attr in attributes:
- if consistencygroup_node.getAttribute(attr):
- consistencygroup[attr] = consistencygroup_node.\
- getAttribute(attr)
- return consistencygroup
-
-
-class CreateFromSrcDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- consistencygroup = self._extract_consistencygroup(dom)
- retval = {'body': {'consistencygroup-from-src': consistencygroup}}
- return retval
-
- def _extract_consistencygroup(self, node):
- consistencygroup = {}
- consistencygroup_node = self.find_first_child_named(
- node, 'consistencygroup-from-src')
-
- attributes = ['cgsnapshot', 'source_cgid', 'name', 'description']
-
- for attr in attributes:
- if consistencygroup_node.getAttribute(attr):
- consistencygroup[attr] = (
- consistencygroup_node.getAttribute(attr))
- return consistencygroup
-
-
class ConsistencyGroupsController(wsgi.Controller):
"""The ConsistencyGroups API controller for the OpenStack API."""
@@ -135,7 +40,6 @@ class ConsistencyGroupsController(wsgi.Controller):
self.consistencygroup_api = consistencygroupAPI.API()
super(ConsistencyGroupsController, self).__init__()
- @wsgi.serializers(xml=ConsistencyGroupTemplate)
def show(self, req, id):
"""Return data about the given consistency group."""
LOG.debug('show called for member %s', id)
@@ -182,12 +86,10 @@ class ConsistencyGroupsController(wsgi.Controller):
return webob.Response(status_int=202)
- @wsgi.serializers(xml=ConsistencyGroupsTemplate)
def index(self, req):
"""Returns a summary list of consistency groups."""
return self._get_consistencygroups(req, is_detail=False)
- @wsgi.serializers(xml=ConsistencyGroupsTemplate)
def detail(self, req):
"""Returns a detailed list of consistency groups."""
return self._get_consistencygroups(req, is_detail=True)
@@ -212,8 +114,6 @@ class ConsistencyGroupsController(wsgi.Controller):
return consistencygroups
@wsgi.response(202)
- @wsgi.serializers(xml=ConsistencyGroupTemplate)
- @wsgi.deserializers(xml=CreateDeserializer)
def create(self, req, body):
"""Create a new consistency group."""
LOG.debug('Creating new consistency group %s', body)
@@ -250,8 +150,6 @@ class ConsistencyGroupsController(wsgi.Controller):
return retval
@wsgi.response(202)
- @wsgi.serializers(xml=ConsistencyGroupFromSrcTemplate)
- @wsgi.deserializers(xml=CreateFromSrcDeserializer)
def create_from_src(self, req, body):
"""Create a new consistency group from a source.
@@ -307,7 +205,6 @@ class ConsistencyGroupsController(wsgi.Controller):
retval = self._view_builder.summary(req, new_consistencygroup)
return retval
- @wsgi.serializers(xml=ConsistencyGroupTemplate)
def update(self, req, id, body):
"""Update the consistency group.
@@ -375,7 +272,6 @@ class Consistencygroups(extensions.ExtensionDescriptor):
name = 'Consistencygroups'
alias = 'consistencygroups'
- namespace = 'http://docs.openstack.org/volume/ext/consistencygroups/api/v1'
updated = '2014-08-18T00:00:00+00:00'
def get_resources(self):
diff --git a/cinder/api/contrib/extended_services.py b/cinder/api/contrib/extended_services.py
index 97e95b9e6c9..92619ea7e94 100644
--- a/cinder/api/contrib/extended_services.py
+++ b/cinder/api/contrib/extended_services.py
@@ -20,6 +20,4 @@ class Extended_services(extensions.ExtensionDescriptor):
name = "ExtendedServices"
alias = "os-extended-services"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "extended_services/api/v2")
updated = "2014-01-10T00:00:00-00:00"
diff --git a/cinder/api/contrib/extended_snapshot_attributes.py b/cinder/api/contrib/extended_snapshot_attributes.py
index 8fbe1a6db62..226d0739adb 100644
--- a/cinder/api/contrib/extended_snapshot_attributes.py
+++ b/cinder/api/contrib/extended_snapshot_attributes.py
@@ -18,7 +18,6 @@ from oslo_log import log as logging
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
LOG = logging.getLogger(__name__)
@@ -39,7 +38,6 @@ class ExtendedSnapshotAttributesController(wsgi.Controller):
context = req.environ['cinder.context']
if authorize(context):
# Attach our slave template to the response object
- resp_obj.attach(xml=ExtendedSnapshotAttributeTemplate())
snapshot = resp_obj.obj['snapshot']
self._extend_snapshot(req, snapshot)
@@ -48,7 +46,6 @@ class ExtendedSnapshotAttributesController(wsgi.Controller):
context = req.environ['cinder.context']
if authorize(context):
# Attach our slave template to the response object
- resp_obj.attach(xml=ExtendedSnapshotAttributesTemplate())
for snapshot in list(resp_obj.obj['snapshots']):
self._extend_snapshot(req, snapshot)
@@ -58,8 +55,6 @@ class Extended_snapshot_attributes(extensions.ExtensionDescriptor):
name = "ExtendedSnapshotAttributes"
alias = "os-extended-snapshot-attributes"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "extended_snapshot_attributes/api/v1")
updated = "2012-06-19T00:00:00+00:00"
def get_controller_extensions(self):
@@ -67,30 +62,3 @@ class Extended_snapshot_attributes(extensions.ExtensionDescriptor):
extension = extensions.ControllerExtension(self, 'snapshots',
controller)
return [extension]
-
-
-def make_snapshot(elem):
- elem.set('{%s}project_id' % Extended_snapshot_attributes.namespace,
- '%s:project_id' % Extended_snapshot_attributes.alias)
- elem.set('{%s}progress' % Extended_snapshot_attributes.namespace,
- '%s:progress' % Extended_snapshot_attributes.alias)
-
-
-class ExtendedSnapshotAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('snapshot', selector='snapshot')
- make_snapshot(root)
- alias = Extended_snapshot_attributes.alias
- namespace = Extended_snapshot_attributes.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class ExtendedSnapshotAttributesTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('snapshots')
- elem = xmlutil.SubTemplateElement(root, 'snapshot',
- selector='snapshots')
- make_snapshot(elem)
- alias = Extended_snapshot_attributes.alias
- namespace = Extended_snapshot_attributes.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
diff --git a/cinder/api/contrib/hosts.py b/cinder/api/contrib/hosts.py
index a09eff62464..9281d5966c7 100644
--- a/cinder/api/contrib/hosts.py
+++ b/cinder/api/contrib/hosts.py
@@ -15,8 +15,6 @@
"""The hosts admin extension."""
-from xml.parsers import expat
-
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils
@@ -24,12 +22,10 @@ import webob.exc
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import db
from cinder import exception
from cinder.i18n import _, _LI
from cinder import objects
-from cinder import utils
from cinder.volume import api as volume_api
@@ -39,62 +35,6 @@ LOG = logging.getLogger(__name__)
authorize = extensions.extension_authorizer('volume', 'hosts')
-class HostIndexTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('hosts')
- elem = xmlutil.SubTemplateElement(root, 'host', selector='hosts')
- elem.set('service-status')
- elem.set('service')
- elem.set('zone')
- elem.set('service-state')
- elem.set('host_name')
- elem.set('last-update')
-
- return xmlutil.MasterTemplate(root, 1)
-
-
-class HostUpdateTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('host')
- root.set('host')
- root.set('status')
-
- return xmlutil.MasterTemplate(root, 1)
-
-
-class HostActionTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('host')
- root.set('host')
-
- return xmlutil.MasterTemplate(root, 1)
-
-
-class HostShowTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('host')
- elem = xmlutil.make_flat_dict('resource', selector='host',
- subselector='resource')
- root.append(elem)
-
- return xmlutil.MasterTemplate(root, 1)
-
-
-class HostDeserializer(wsgi.XMLDeserializer):
- def default(self, string):
- try:
- node = utils.safe_minidom_parse_string(string)
- except expat.ExpatError:
- msg = _("cannot understand XML")
- raise exception.MalformedRequestBody(reason=msg)
-
- updates = {}
- for child in node.childNodes[0].childNodes:
- updates[child.tagName] = self.extract_text(child)
-
- return dict(body=updates)
-
-
def _list_hosts(req, service=None):
"""Returns a summary list of hosts."""
curr_time = timeutils.utcnow(with_timezone=True)
@@ -151,13 +91,10 @@ class HostController(wsgi.Controller):
self.api = volume_api.HostAPI()
super(HostController, self).__init__()
- @wsgi.serializers(xml=HostIndexTemplate)
def index(self, req):
authorize(req.environ['cinder.context'])
return {'hosts': _list_hosts(req)}
- @wsgi.serializers(xml=HostUpdateTemplate)
- @wsgi.deserializers(xml=HostDeserializer)
@check_host
def update(self, req, id, body):
authorize(req.environ['cinder.context'])
@@ -194,7 +131,6 @@ class HostController(wsgi.Controller):
raise webob.exc.HTTPBadRequest(explanation=result)
return {"host": host, "status": result}
- @wsgi.serializers(xml=HostShowTemplate)
def show(self, req, id):
"""Shows the volume usage info given by hosts.
@@ -260,7 +196,6 @@ class Hosts(extensions.ExtensionDescriptor):
name = "Hosts"
alias = "os-hosts"
- namespace = "http://docs.openstack.org/volume/ext/hosts/api/v1.1"
updated = "2011-06-29T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/image_create.py b/cinder/api/contrib/image_create.py
index 3358831143d..eb2358a3087 100644
--- a/cinder/api/contrib/image_create.py
+++ b/cinder/api/contrib/image_create.py
@@ -25,5 +25,4 @@ class Image_create(extensions.ExtensionDescriptor):
name = "CreateVolumeExtension"
alias = "os-image-create"
- namespace = "http://docs.openstack.org/volume/ext/image-create/api/v1"
updated = "2012-08-13T00:00:00+00:00"
diff --git a/cinder/api/contrib/qos_specs_manage.py b/cinder/api/contrib/qos_specs_manage.py
index d272bcb3d57..0c3d4f8f5da 100644
--- a/cinder/api/contrib/qos_specs_manage.py
+++ b/cinder/api/contrib/qos_specs_manage.py
@@ -24,9 +24,8 @@ from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
from cinder.api.views import qos_specs as view_qos_specs
-from cinder.api import xmlutil
from cinder import exception
-from cinder.i18n import _, _LI
+from cinder.i18n import _
from cinder import rpc
from cinder import utils
from cinder.volume import qos_specs
@@ -37,62 +36,6 @@ LOG = logging.getLogger(__name__)
authorize = extensions.extension_authorizer('volume', 'qos_specs_manage')
-def make_qos_specs(elem):
- elem.set('id')
- elem.set('name')
- elem.set('consumer')
- elem.append(SpecsTemplate())
-
-
-def make_associations(elem):
- elem.set('association_type')
- elem.set('name')
- elem.set('id')
-
-
-class SpecsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- return xmlutil.MasterTemplate(xmlutil.make_flat_dict('specs'), 1)
-
-
-class QoSSpecsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('qos_specs')
- elem = xmlutil.SubTemplateElement(root, 'qos_spec',
- selector='qos_specs')
- make_qos_specs(elem)
- return xmlutil.MasterTemplate(root, 1)
-
-
-class QoSSpecsKeyDeserializer(wsgi.XMLDeserializer):
- def _extract_keys(self, key_node):
- keys = []
- for key in key_node.childNodes:
- key_name = key.tagName
- keys.append(key_name)
-
- return keys
-
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- key_node = self.find_first_child_named(dom, 'keys')
- if not key_node:
- LOG.info(_LI("Unable to parse XML input."))
- msg = _("Unable to parse XML request. "
- "Please provide XML in correct format.")
- raise webob.exc.HTTPBadRequest(explanation=msg)
- return {'body': {'keys': self._extract_keys(key_node)}}
-
-
-class AssociationsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('qos_associations')
- elem = xmlutil.SubTemplateElement(root, 'associations',
- selector='qos_associations')
- make_associations(elem)
- return xmlutil.MasterTemplate(root, 1)
-
-
def _check_specs(context, specs_id):
try:
qos_specs.get_qos_specs(context, specs_id)
@@ -111,7 +54,6 @@ class QoSSpecsController(wsgi.Controller):
method,
payload)
- @wsgi.serializers(xml=QoSSpecsTemplate)
def index(self, req):
"""Returns the list of qos_specs."""
context = req.environ['cinder.context']
@@ -132,7 +74,6 @@ class QoSSpecsController(wsgi.Controller):
sort_dirs=sort_dirs)
return self._view_builder.summary_list(req, specs)
- @wsgi.serializers(xml=QoSSpecsTemplate)
def create(self, req, body=None):
context = req.environ['cinder.context']
authorize(context)
@@ -178,7 +119,6 @@ class QoSSpecsController(wsgi.Controller):
return self._view_builder.detail(req, spec)
- @wsgi.serializers(xml=QoSSpecsTemplate)
def update(self, req, id, body=None):
context = req.environ['cinder.context']
authorize(context)
@@ -213,7 +153,6 @@ class QoSSpecsController(wsgi.Controller):
return body
- @wsgi.serializers(xml=QoSSpecsTemplate)
def show(self, req, id):
"""Return a single qos spec item."""
context = req.environ['cinder.context']
@@ -263,7 +202,6 @@ class QoSSpecsController(wsgi.Controller):
return webob.Response(status_int=202)
- @wsgi.deserializers(xml=QoSSpecsKeyDeserializer)
def delete_keys(self, req, id, body):
"""Deletes specified keys in qos specs."""
context = req.environ['cinder.context']
@@ -297,7 +235,6 @@ class QoSSpecsController(wsgi.Controller):
return webob.Response(status_int=202)
- @wsgi.serializers(xml=AssociationsTemplate)
def associations(self, req, id):
"""List all associations of given qos specs."""
context = req.environ['cinder.context']
@@ -461,7 +398,6 @@ class Qos_specs_manage(extensions.ExtensionDescriptor):
name = "Qos_specs_manage"
alias = "qos-specs"
- namespace = "http://docs.openstack.org/volume/ext/qos-specs/api/v1"
updated = "2013-08-02T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/quota_classes.py b/cinder/api/contrib/quota_classes.py
index 086d2c36d09..a694d856cb7 100644
--- a/cinder/api/contrib/quota_classes.py
+++ b/cinder/api/contrib/quota_classes.py
@@ -17,7 +17,6 @@ import webob
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import db
from cinder import exception
from cinder.i18n import _
@@ -31,19 +30,6 @@ QUOTAS = quota.QUOTAS
authorize = extensions.extension_authorizer('volume', 'quota_classes')
-class QuotaClassTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('quota_class_set',
- selector='quota_class_set')
- root.set('id')
-
- for resource in QUOTAS.resources:
- elem = xmlutil.SubTemplateElement(root, resource)
- elem.text = resource
-
- return xmlutil.MasterTemplate(root, 1)
-
-
class QuotaClassSetsController(wsgi.Controller):
def _format_quota_set(self, quota_class, quota_set):
@@ -53,7 +39,6 @@ class QuotaClassSetsController(wsgi.Controller):
return dict(quota_class_set=quota_set)
- @wsgi.serializers(xml=QuotaClassTemplate)
def show(self, req, id):
context = req.environ['cinder.context']
authorize(context)
@@ -65,7 +50,6 @@ class QuotaClassSetsController(wsgi.Controller):
return self._format_quota_set(id,
QUOTAS.get_class_quotas(context, id))
- @wsgi.serializers(xml=QuotaClassTemplate)
def update(self, req, id, body):
context = req.environ['cinder.context']
authorize(context)
@@ -97,8 +81,6 @@ class Quota_classes(extensions.ExtensionDescriptor):
name = "QuotaClasses"
alias = "os-quota-class-sets"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "quota-classes-sets/api/v1.1")
updated = "2012-03-12T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/quotas.py b/cinder/api/contrib/quotas.py
index d4dcc66d0a9..5b458fb4d01 100644
--- a/cinder/api/contrib/quotas.py
+++ b/cinder/api/contrib/quotas.py
@@ -17,7 +17,6 @@ import webob
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import db
from cinder.db.sqlalchemy import api as sqlalchemy_api
from cinder import exception
@@ -39,18 +38,6 @@ authorize_show = extensions.extension_authorizer('volume', 'quotas:show')
authorize_delete = extensions.extension_authorizer('volume', 'quotas:delete')
-class QuotaTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('quota_set', selector='quota_set')
- root.set('id')
-
- for resource in QUOTAS.resources:
- elem = xmlutil.SubTemplateElement(root, resource)
- elem.text = resource
-
- return xmlutil.MasterTemplate(root, 1)
-
-
class QuotaSetsController(wsgi.Controller):
def _format_quota_set(self, project_id, quota_set):
@@ -155,7 +142,6 @@ class QuotaSetsController(wsgi.Controller):
return True
return False
- @wsgi.serializers(xml=QuotaTemplate)
def show(self, req, id):
"""Show quota for a particular tenant
@@ -197,7 +183,6 @@ class QuotaSetsController(wsgi.Controller):
quotas = self._get_quotas(context, target_project_id, usage)
return self._format_quota_set(target_project_id, quotas)
- @wsgi.serializers(xml=QuotaTemplate)
def update(self, req, id, body):
"""Update Quota for a particular tenant
@@ -337,7 +322,6 @@ class QuotaSetsController(wsgi.Controller):
return reservations
- @wsgi.serializers(xml=QuotaTemplate)
def defaults(self, req, id):
context = req.environ['cinder.context']
authorize_show(context)
@@ -345,7 +329,6 @@ class QuotaSetsController(wsgi.Controller):
return self._format_quota_set(id, QUOTAS.get_defaults(
context, project_id=id))
- @wsgi.serializers(xml=QuotaTemplate)
def delete(self, req, id):
"""Delete Quota for a particular tenant.
@@ -436,7 +419,6 @@ class Quotas(extensions.ExtensionDescriptor):
name = "Quotas"
alias = "os-quota-sets"
- namespace = "http://docs.openstack.org/volume/ext/quotas-sets/api/v1.1"
updated = "2011-08-08T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/scheduler_hints.py b/cinder/api/contrib/scheduler_hints.py
index 4d01d51059f..858b3ade6f6 100644
--- a/cinder/api/contrib/scheduler_hints.py
+++ b/cinder/api/contrib/scheduler_hints.py
@@ -17,7 +17,6 @@ import webob.exc
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api.v2 import volumes
from cinder.i18n import _
LOG = logging.getLogger(__name__)
@@ -53,7 +52,6 @@ class Scheduler_hints(extensions.ExtensionDescriptor):
name = "SchedulerHints"
alias = "OS-SCH-HNT"
- namespace = volumes.SCHEDULER_HINTS_NAMESPACE
updated = "2013-04-18T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/scheduler_stats.py b/cinder/api/contrib/scheduler_stats.py
index 96d8076cf91..9f6e59d36de 100644
--- a/cinder/api/contrib/scheduler_stats.py
+++ b/cinder/api/contrib/scheduler_stats.py
@@ -56,7 +56,6 @@ class Scheduler_stats(extensions.ExtensionDescriptor):
name = "Scheduler_stats"
alias = "scheduler-stats"
- namespace = "http://docs.openstack.org/volume/ext/scheduler-stats/api/v1"
updated = "2014-09-07T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py
index 36a99543961..fa531a08f8f 100644
--- a/cinder/api/contrib/services.py
+++ b/cinder/api/contrib/services.py
@@ -22,7 +22,6 @@ import webob.exc
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import exception
from cinder.i18n import _
from cinder import objects
@@ -36,51 +35,12 @@ LOG = logging.getLogger(__name__)
authorize = extensions.extension_authorizer('volume', 'services')
-class ServicesIndexTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('services')
- elem = xmlutil.SubTemplateElement(root, 'service', selector='services')
- elem.set('binary')
- elem.set('host')
- elem.set('zone')
- elem.set('status')
- elem.set('state')
- elem.set('update_at')
- elem.set('disabled_reason')
- elem.set('replication_status')
- elem.set('active_backend_id')
- elem.set('frozen')
-
- return xmlutil.MasterTemplate(root, 1)
-
-
-class ServicesUpdateTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- # TODO(uni): template elements of 'host', 'service' and 'disabled'
- # should be deprecated to make ServicesUpdateTemplate consistent
- # with ServicesIndexTemplate. Still keeping it here for API
- # compatibility sake.
- root = xmlutil.TemplateElement('host')
- root.set('host')
- root.set('service')
- root.set('disabled')
- root.set('binary')
- root.set('status')
- root.set('disabled_reason')
- root.set('replication_status')
- root.set('active_backend_id')
- root.set('frozen')
-
- return xmlutil.MasterTemplate(root, 1)
-
-
class ServiceController(wsgi.Controller):
def __init__(self, ext_mgr=None):
self.ext_mgr = ext_mgr
super(ServiceController, self).__init__()
self.volume_api = volume.API()
- @wsgi.serializers(xml=ServicesIndexTemplate)
def index(self, req):
"""Return a list of all running services.
@@ -154,7 +114,6 @@ class ServiceController(wsgi.Controller):
def _failover(self, context, host, backend_id=None):
return self.volume_api.failover_host(context, host, backend_id)
- @wsgi.serializers(xml=ServicesUpdateTemplate)
def update(self, req, id, body):
"""Enable/Disable scheduling for a service.
@@ -236,7 +195,6 @@ class Services(extensions.ExtensionDescriptor):
name = "Services"
alias = "os-services"
- namespace = "http://docs.openstack.org/volume/ext/services/api/v2"
updated = "2012-10-28T00:00:00-00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/snapshot_actions.py b/cinder/api/contrib/snapshot_actions.py
index 6319c16e27f..6cc0f764f56 100644
--- a/cinder/api/contrib/snapshot_actions.py
+++ b/cinder/api/contrib/snapshot_actions.py
@@ -100,8 +100,6 @@ class Snapshot_actions(extensions.ExtensionDescriptor):
name = "SnapshotActions"
alias = "os-snapshot-actions"
- namespace = \
- "http://docs.openstack.org/volume/ext/snapshot-actions/api/v1.1"
updated = "2013-07-16T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/snapshot_manage.py b/cinder/api/contrib/snapshot_manage.py
index bf1c280c446..e797dd27e6e 100644
--- a/cinder/api/contrib/snapshot_manage.py
+++ b/cinder/api/contrib/snapshot_manage.py
@@ -18,7 +18,6 @@ from webob import exc
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api.v2 import snapshots
from cinder.api.views import snapshots as snapshot_views
from cinder import exception
from cinder.i18n import _
@@ -39,7 +38,6 @@ class SnapshotManageController(wsgi.Controller):
self.volume_api = cinder_volume.API()
@wsgi.response(202)
- @wsgi.serializers(xml=snapshots.SnapshotTemplate)
def create(self, req, body):
"""Instruct Cinder to manage a storage snapshot object.
@@ -138,8 +136,6 @@ class Snapshot_manage(extensions.ExtensionDescriptor):
name = 'SnapshotManage'
alias = 'os-snapshot-manage'
- namespace = ('http://docs.openstack.org/volume/ext/'
- 'os-snapshot-manage/api/v1')
updated = '2014-12-31T00:00:00+00:00'
def get_resources(self):
diff --git a/cinder/api/contrib/snapshot_unmanage.py b/cinder/api/contrib/snapshot_unmanage.py
index 5ddf96b1829..c9e2259df21 100644
--- a/cinder/api/contrib/snapshot_unmanage.py
+++ b/cinder/api/contrib/snapshot_unmanage.py
@@ -66,8 +66,6 @@ class Snapshot_unmanage(extensions.ExtensionDescriptor):
name = "SnapshotUnmanage"
alias = "os-snapshot-unmanage"
- namespace = ('http://docs.openstack.org/snapshot/ext/snapshot-unmanage'
- '/api/v1')
updated = "2014-12-31T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/types_extra_specs.py b/cinder/api/contrib/types_extra_specs.py
index cc169144edf..70b6083ee75 100644
--- a/cinder/api/contrib/types_extra_specs.py
+++ b/cinder/api/contrib/types_extra_specs.py
@@ -20,7 +20,6 @@ import webob
from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import db
from cinder import exception
from cinder.i18n import _
@@ -30,26 +29,6 @@ from cinder.volume import volume_types
authorize = extensions.extension_authorizer('volume', 'types_extra_specs')
-class VolumeTypeExtraSpecsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.make_flat_dict('extra_specs', selector='extra_specs')
- return xmlutil.MasterTemplate(root, 1)
-
-
-class VolumeTypeExtraSpecTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- tagname = xmlutil.Selector('key')
-
- def extraspec_sel(obj, do_raise=False):
- # Have to extract the key and value for later use...
- key, value = list(obj.items())[0]
- return dict(key=key, value=value)
-
- root = xmlutil.TemplateElement(tagname, selector=extraspec_sel)
- root.text = 'value'
- return xmlutil.MasterTemplate(root, 1)
-
-
class VolumeTypeExtraSpecsController(wsgi.Controller):
"""The volume type extra specs API controller for the OpenStack API."""
@@ -66,7 +45,6 @@ class VolumeTypeExtraSpecsController(wsgi.Controller):
except exception.VolumeTypeNotFound as ex:
raise webob.exc.HTTPNotFound(explanation=ex.msg)
- @wsgi.serializers(xml=VolumeTypeExtraSpecsTemplate)
def index(self, req, type_id):
"""Returns the list of extra specs for a given volume type."""
context = req.environ['cinder.context']
@@ -85,7 +63,6 @@ class VolumeTypeExtraSpecsController(wsgi.Controller):
self.validate_string_length(value, 'Value for key "%s"' % key,
min_length=0, max_length=255)
- @wsgi.serializers(xml=VolumeTypeExtraSpecsTemplate)
def create(self, req, type_id, body=None):
context = req.environ['cinder.context']
authorize(context)
@@ -106,7 +83,6 @@ class VolumeTypeExtraSpecsController(wsgi.Controller):
notifier_info)
return body
- @wsgi.serializers(xml=VolumeTypeExtraSpecTemplate)
def update(self, req, type_id, id, body=None):
context = req.environ['cinder.context']
authorize(context)
@@ -133,7 +109,6 @@ class VolumeTypeExtraSpecsController(wsgi.Controller):
notifier_info)
return body
- @wsgi.serializers(xml=VolumeTypeExtraSpecTemplate)
def show(self, req, type_id, id):
"""Return a single extra spec item."""
context = req.environ['cinder.context']
@@ -178,7 +153,6 @@ class Types_extra_specs(extensions.ExtensionDescriptor):
name = "TypesExtraSpecs"
alias = "os-types-extra-specs"
- namespace = "http://docs.openstack.org/volume/ext/types-extra-specs/api/v1"
updated = "2011-08-24T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/types_manage.py b/cinder/api/contrib/types_manage.py
index f90ea12ac7c..b22d239ad74 100644
--- a/cinder/api/contrib/types_manage.py
+++ b/cinder/api/contrib/types_manage.py
@@ -20,7 +20,6 @@ import webob
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api.v1 import types
from cinder.api.views import types as views_types
from cinder import exception
from cinder.i18n import _
@@ -48,7 +47,6 @@ class VolumeTypesManageController(wsgi.Controller):
rpc.get_notifier('volumeType').info(context, method, payload)
@wsgi.action("create")
- @wsgi.serializers(xml=types.VolumeTypeTemplate)
def _create(self, req, body):
"""Creates a new volume type."""
context = req.environ['cinder.context']
@@ -101,7 +99,6 @@ class VolumeTypesManageController(wsgi.Controller):
return self._view_builder.show(req, vol_type)
@wsgi.action("update")
- @wsgi.serializers(xml=types.VolumeTypeTemplate)
def _update(self, req, id, body):
# Update description for a given volume type.
context = req.environ['cinder.context']
@@ -192,7 +189,6 @@ class Types_manage(extensions.ExtensionDescriptor):
name = "TypesManage"
alias = "os-types-manage"
- namespace = "http://docs.openstack.org/volume/ext/types-manage/api/v1"
updated = "2011-08-24T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/used_limits.py b/cinder/api/contrib/used_limits.py
index d32967a3e7b..2665ed21da4 100644
--- a/cinder/api/contrib/used_limits.py
+++ b/cinder/api/contrib/used_limits.py
@@ -51,7 +51,6 @@ class Used_limits(extensions.ExtensionDescriptor):
name = "UsedLimits"
alias = 'os-used-limits'
- namespace = "http://docs.openstack.org/volume/ext/used-limits/api/v1.1"
updated = "2013-10-03T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index 9737a212d87..684791d4eed 100644
--- a/cinder/api/contrib/volume_actions.py
+++ b/cinder/api/contrib/volume_actions.py
@@ -24,7 +24,6 @@ import webob
from cinder.api import extensions
from cinder.api.openstack import api_version_request
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import exception
from cinder.i18n import _
from cinder import utils
@@ -40,50 +39,6 @@ def authorize(context, action_name):
extensions.extension_authorizer('volume', action)(context)
-class VolumeToImageSerializer(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('os-volume_upload_image',
- selector='os-volume_upload_image')
- root.set('id')
- root.set('updated_at')
- root.set('status')
- root.set('display_description')
- root.set('size')
- root.set('volume_type')
- root.set('image_id')
- root.set('container_format')
- root.set('disk_format')
- root.set('image_name')
- root.set('protected')
- if CONF.glance_api_version == 2:
- root.set('visibility')
- else:
- root.set('is_public')
- return xmlutil.MasterTemplate(root, 1)
-
-
-class VolumeToImageDeserializer(wsgi.XMLDeserializer):
- """Deserializer to handle xml-formatted requests."""
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- action_node = dom.childNodes[0]
- action_name = action_node.tagName
-
- action_data = {}
- attributes = ["force", "image_name", "container_format", "disk_format",
- "protected"]
- if CONF.glance_api_version == 2:
- attributes.append('visibility')
- else:
- attributes.append('is_public')
- for attr in attributes:
- if action_node.hasAttribute(attr):
- action_data[attr] = action_node.getAttribute(attr)
- if 'force' in action_data and action_data['force'] == 'True':
- action_data['force'] = True
- return {'body': {action_name: action_data}}
-
-
class VolumeActionsController(wsgi.Controller):
def __init__(self, *args, **kwargs):
super(VolumeActionsController, self).__init__(*args, **kwargs)
@@ -261,8 +216,6 @@ class VolumeActionsController(wsgi.Controller):
@wsgi.response(202)
@wsgi.action('os-volume_upload_image')
- @wsgi.serializers(xml=VolumeToImageSerializer)
- @wsgi.deserializers(xml=VolumeToImageDeserializer)
def _volume_upload_image(self, req, id, body):
"""Uploads the specified volume to image service."""
context = req.environ['cinder.context']
@@ -423,7 +376,6 @@ class Volume_actions(extensions.ExtensionDescriptor):
name = "VolumeActions"
alias = "os-volume-actions"
- namespace = "http://docs.openstack.org/volume/ext/volume-actions/api/v1.1"
updated = "2012-05-31T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/contrib/volume_encryption_metadata.py b/cinder/api/contrib/volume_encryption_metadata.py
index 6ce2100bbb6..66f18277a5f 100644
--- a/cinder/api/contrib/volume_encryption_metadata.py
+++ b/cinder/api/contrib/volume_encryption_metadata.py
@@ -17,30 +17,21 @@
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import db
authorize = extensions.extension_authorizer('volume',
'volume_encryption_metadata')
-class VolumeEncryptionMetadataTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.make_flat_dict('encryption', selector='encryption')
- return xmlutil.MasterTemplate(root, 1)
-
-
class VolumeEncryptionMetadataController(wsgi.Controller):
"""The volume encryption metadata API extension."""
- @wsgi.serializers(xml=VolumeEncryptionMetadataTemplate)
def index(self, req, volume_id):
"""Returns the encryption metadata for a given volume."""
context = req.environ['cinder.context']
authorize(context)
return db.volume_encryption_metadata_get(context, volume_id)
- @wsgi.serializers(xml=VolumeEncryptionMetadataTemplate)
def show(self, req, volume_id, id):
"""Return a single encryption item."""
encryption_item = self.index(req, volume_id)
@@ -55,8 +46,6 @@ class Volume_encryption_metadata(extensions.ExtensionDescriptor):
name = "VolumeEncryptionMetadata"
alias = "os-volume-encryption-metadata"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "os-volume-encryption-metadata/api/v1")
updated = "2013-07-10T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/volume_host_attribute.py b/cinder/api/contrib/volume_host_attribute.py
index 2367a530f92..4d8a0e7001a 100644
--- a/cinder/api/contrib/volume_host_attribute.py
+++ b/cinder/api/contrib/volume_host_attribute.py
@@ -16,7 +16,6 @@ from oslo_log import log as logging
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
LOG = logging.getLogger(__name__)
@@ -34,7 +33,6 @@ class VolumeHostAttributeController(wsgi.Controller):
def show(self, req, resp_obj, id):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeHostAttributeTemplate())
volume = resp_obj.obj['volume']
self._add_volume_host_attribute(req, volume)
@@ -42,7 +40,6 @@ class VolumeHostAttributeController(wsgi.Controller):
def detail(self, req, resp_obj):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeListHostAttributeTemplate())
for vol in list(resp_obj.obj['volumes']):
self._add_volume_host_attribute(req, vol)
@@ -52,35 +49,9 @@ class Volume_host_attribute(extensions.ExtensionDescriptor):
name = "VolumeHostAttribute"
alias = "os-vol-host-attr"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "volume_host_attribute/api/v2")
updated = "2011-11-03T00:00:00+00:00"
def get_controller_extensions(self):
controller = VolumeHostAttributeController()
extension = extensions.ControllerExtension(self, 'volumes', controller)
return [extension]
-
-
-def make_volume(elem):
- elem.set('{%s}host' % Volume_host_attribute.namespace,
- '%s:host' % Volume_host_attribute.alias)
-
-
-class VolumeHostAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume', selector='volume')
- make_volume(root)
- alias = Volume_host_attribute.alias
- namespace = Volume_host_attribute.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class VolumeListHostAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volumes')
- elem = xmlutil.SubTemplateElement(root, 'volume', selector='volumes')
- make_volume(elem)
- alias = Volume_host_attribute.alias
- namespace = Volume_host_attribute.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
diff --git a/cinder/api/contrib/volume_image_metadata.py b/cinder/api/contrib/volume_image_metadata.py
index c1113d041f6..8f9c4145021 100644
--- a/cinder/api/contrib/volume_image_metadata.py
+++ b/cinder/api/contrib/volume_image_metadata.py
@@ -20,7 +20,6 @@ from oslo_log import log as logging
from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import exception
from cinder.i18n import _
from cinder import volume
@@ -75,22 +74,18 @@ class VolumeImageMetadataController(wsgi.Controller):
def show(self, req, resp_obj, id):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeImageMetadataTemplate())
self._add_image_metadata(context, [resp_obj.obj['volume']])
@wsgi.extends
def detail(self, req, resp_obj):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumesImageMetadataTemplate())
# Just get the image metadata of those volumes in response.
volumes = list(resp_obj.obj.get('volumes', []))
if volumes:
self._add_image_metadata(context, volumes)
@wsgi.action("os-set_image_metadata")
- @wsgi.serializers(xml=common.MetadataTemplate)
- @wsgi.deserializers(xml=common.MetadataDeserializer)
def create(self, req, id, body):
context = req.environ['cinder.context']
if authorize(context):
@@ -130,7 +125,6 @@ class VolumeImageMetadataController(wsgi.Controller):
raise webob.exc.HTTPRequestEntityTooLarge(explanation=error.msg)
@wsgi.action("os-show_image_metadata")
- @wsgi.serializers(xml=common.MetadataTemplate)
def index(self, req, id, body):
context = req.environ['cinder.context']
return {'metadata': self._get_image_metadata(context, id)[1]}
@@ -167,46 +161,9 @@ class Volume_image_metadata(extensions.ExtensionDescriptor):
name = "VolumeImageMetadata"
alias = "os-vol-image-meta"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "volume_image_metadata/api/v1")
updated = "2012-12-07T00:00:00+00:00"
def get_controller_extensions(self):
controller = VolumeImageMetadataController()
extension = extensions.ControllerExtension(self, 'volumes', controller)
return [extension]
-
-
-class VolumeImageMetadataMetadataTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume_image_metadata',
- selector='volume_image_metadata')
- elem = xmlutil.SubTemplateElement(root, 'meta',
- selector=xmlutil.get_items)
- elem.set('key', 0)
- elem.text = 1
-
- return xmlutil.MasterTemplate(root, 1)
-
-
-class VolumeImageMetadataTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume', selector='volume')
- root.append(VolumeImageMetadataMetadataTemplate())
-
- alias = Volume_image_metadata.alias
- namespace = Volume_image_metadata.namespace
-
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class VolumesImageMetadataTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volumes')
- elem = xmlutil.SubTemplateElement(root, 'volume', selector='volume')
- elem.append(VolumeImageMetadataMetadataTemplate())
-
- alias = Volume_image_metadata.alias
- namespace = Volume_image_metadata.namespace
-
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
diff --git a/cinder/api/contrib/volume_manage.py b/cinder/api/contrib/volume_manage.py
index 136812b809b..bb5734c4dc4 100644
--- a/cinder/api/contrib/volume_manage.py
+++ b/cinder/api/contrib/volume_manage.py
@@ -19,7 +19,6 @@ from webob import exc
from cinder.api import extensions
from cinder.api.openstack import wsgi
from cinder.api.v2.views import volumes as volume_views
-from cinder.api.v2 import volumes
from cinder import exception
from cinder.i18n import _
from cinder import utils
@@ -40,8 +39,6 @@ class VolumeManageController(wsgi.Controller):
self.volume_api = cinder_volume.API()
@wsgi.response(202)
- @wsgi.serializers(xml=volumes.VolumeTemplate)
- @wsgi.deserializers(xml=volumes.CreateDeserializer)
def create(self, req, body):
"""Instruct Cinder to manage a storage object.
@@ -155,8 +152,6 @@ class Volume_manage(extensions.ExtensionDescriptor):
name = 'VolumeManage'
alias = 'os-volume-manage'
- namespace = ('http://docs.openstack.org/volume/ext/'
- 'os-volume-manage/api/v1')
updated = '2014-02-10T00:00:00+00:00'
def get_resources(self):
diff --git a/cinder/api/contrib/volume_mig_status_attribute.py b/cinder/api/contrib/volume_mig_status_attribute.py
index 9e7b6c380a4..ce2e6d1fa4c 100644
--- a/cinder/api/contrib/volume_mig_status_attribute.py
+++ b/cinder/api/contrib/volume_mig_status_attribute.py
@@ -14,8 +14,6 @@
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
-
authorize = extensions.soft_extension_authorizer('volume',
'volume_mig_status_attribute')
@@ -33,14 +31,12 @@ class VolumeMigStatusAttributeController(wsgi.Controller):
def show(self, req, resp_obj, id):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeMigStatusAttributeTemplate())
self._add_volume_mig_status_attribute(req, resp_obj.obj['volume'])
@wsgi.extends
def detail(self, req, resp_obj):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeListMigStatusAttributeTemplate())
for vol in list(resp_obj.obj['volumes']):
self._add_volume_mig_status_attribute(req, vol)
@@ -50,37 +46,9 @@ class Volume_mig_status_attribute(extensions.ExtensionDescriptor):
name = "VolumeMigStatusAttribute"
alias = "os-vol-mig-status-attr"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "volume_mig_status_attribute/api/v1")
updated = "2013-08-08T00:00:00+00:00"
def get_controller_extensions(self):
controller = VolumeMigStatusAttributeController()
extension = extensions.ControllerExtension(self, 'volumes', controller)
return [extension]
-
-
-def make_volume(elem):
- elem.set('{%s}migstat' % Volume_mig_status_attribute.namespace,
- '%s:migstat' % Volume_mig_status_attribute.alias)
- elem.set('{%s}name_id' % Volume_mig_status_attribute.namespace,
- '%s:name_id' % Volume_mig_status_attribute.alias)
-
-
-class VolumeMigStatusAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume', selector='volume')
- make_volume(root)
- alias = Volume_mig_status_attribute.alias
- namespace = Volume_mig_status_attribute.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class VolumeListMigStatusAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volumes')
- elem = xmlutil.SubTemplateElement(root, 'volume', selector='volumes')
- make_volume(elem)
- alias = Volume_mig_status_attribute.alias
- namespace = Volume_mig_status_attribute.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
diff --git a/cinder/api/contrib/volume_tenant_attribute.py b/cinder/api/contrib/volume_tenant_attribute.py
index bb51b6057fe..263704abc40 100644
--- a/cinder/api/contrib/volume_tenant_attribute.py
+++ b/cinder/api/contrib/volume_tenant_attribute.py
@@ -14,7 +14,6 @@
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
authorize = extensions.soft_extension_authorizer('volume',
@@ -31,7 +30,6 @@ class VolumeTenantAttributeController(wsgi.Controller):
def show(self, req, resp_obj, id):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeTenantAttributeTemplate())
volume = resp_obj.obj['volume']
self._add_volume_tenant_attribute(req, volume)
@@ -39,7 +37,6 @@ class VolumeTenantAttributeController(wsgi.Controller):
def detail(self, req, resp_obj):
context = req.environ['cinder.context']
if authorize(context):
- resp_obj.attach(xml=VolumeListTenantAttributeTemplate())
for vol in list(resp_obj.obj['volumes']):
self._add_volume_tenant_attribute(req, vol)
@@ -49,35 +46,9 @@ class Volume_tenant_attribute(extensions.ExtensionDescriptor):
name = "VolumeTenantAttribute"
alias = "os-vol-tenant-attr"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "volume_tenant_attribute/api/v2")
updated = "2011-11-03T00:00:00+00:00"
def get_controller_extensions(self):
controller = VolumeTenantAttributeController()
extension = extensions.ControllerExtension(self, 'volumes', controller)
return [extension]
-
-
-def make_volume(elem):
- elem.set('{%s}tenant_id' % Volume_tenant_attribute.namespace,
- '%s:tenant_id' % Volume_tenant_attribute.alias)
-
-
-class VolumeTenantAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume', selector='volume')
- make_volume(root)
- alias = Volume_tenant_attribute.alias
- namespace = Volume_tenant_attribute.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class VolumeListTenantAttributeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volumes')
- elem = xmlutil.SubTemplateElement(root, 'volume', selector='volumes')
- make_volume(elem)
- alias = Volume_tenant_attribute.alias
- namespace = Volume_tenant_attribute.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
diff --git a/cinder/api/contrib/volume_transfer.py b/cinder/api/contrib/volume_transfer.py
index d5700ae08df..fc7745c3bf0 100644
--- a/cinder/api/contrib/volume_transfer.py
+++ b/cinder/api/contrib/volume_transfer.py
@@ -21,79 +21,13 @@ from cinder.api import common
from cinder.api import extensions
from cinder.api.openstack import wsgi
from cinder.api.views import transfers as transfer_view
-from cinder.api import xmlutil
from cinder import exception
from cinder.i18n import _, _LI
from cinder import transfer as transferAPI
-from cinder import utils
LOG = logging.getLogger(__name__)
-def make_transfer(elem):
- elem.set('id')
- elem.set('volume_id')
- elem.set('created_at')
- elem.set('name')
- elem.set('auth_key')
-
-
-class TransferTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('transfer', selector='transfer')
- make_transfer(root)
- alias = Volume_transfer.alias
- namespace = Volume_transfer.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class TransfersTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('transfers')
- elem = xmlutil.SubTemplateElement(root, 'transfer',
- selector='transfers')
- make_transfer(elem)
- alias = Volume_transfer.alias
- namespace = Volume_transfer.namespace
- return xmlutil.MasterTemplate(root, 1, nsmap={alias: namespace})
-
-
-class CreateDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- transfer = self._extract_transfer(dom)
- return {'body': {'transfer': transfer}}
-
- def _extract_transfer(self, node):
- transfer = {}
- transfer_node = self.find_first_child_named(node, 'transfer')
-
- attributes = ['volume_id', 'name']
-
- for attr in attributes:
- if transfer_node.getAttribute(attr):
- transfer[attr] = transfer_node.getAttribute(attr)
- return transfer
-
-
-class AcceptDeserializer(wsgi.MetadataXMLDeserializer):
- def default(self, string):
- dom = utils.safe_minidom_parse_string(string)
- transfer = self._extract_transfer(dom)
- return {'body': {'accept': transfer}}
-
- def _extract_transfer(self, node):
- transfer = {}
- transfer_node = self.find_first_child_named(node, 'accept')
-
- attributes = ['auth_key']
-
- for attr in attributes:
- if transfer_node.getAttribute(attr):
- transfer[attr] = transfer_node.getAttribute(attr)
- return transfer
-
-
class VolumeTransferController(wsgi.Controller):
"""The Volume Transfer API controller for the OpenStack API."""
@@ -103,7 +37,6 @@ class VolumeTransferController(wsgi.Controller):
self.transfer_api = transferAPI.API()
super(VolumeTransferController, self).__init__()
- @wsgi.serializers(xml=TransferTemplate)
def show(self, req, id):
"""Return data about active transfers."""
context = req.environ['cinder.context']
@@ -115,12 +48,10 @@ class VolumeTransferController(wsgi.Controller):
return self._view_builder.detail(req, transfer)
- @wsgi.serializers(xml=TransfersTemplate)
def index(self, req):
"""Returns a summary list of transfers."""
return self._get_transfers(req, is_detail=False)
- @wsgi.serializers(xml=TransfersTemplate)
def detail(self, req):
"""Returns a detailed list of transfers."""
return self._get_transfers(req, is_detail=True)
@@ -144,8 +75,6 @@ class VolumeTransferController(wsgi.Controller):
return transfers
@wsgi.response(202)
- @wsgi.serializers(xml=TransferTemplate)
- @wsgi.deserializers(xml=CreateDeserializer)
def create(self, req, body):
"""Create a new volume transfer."""
LOG.debug('Creating new volume transfer %s', body)
@@ -183,8 +112,6 @@ class VolumeTransferController(wsgi.Controller):
return transfer
@wsgi.response(202)
- @wsgi.serializers(xml=TransferTemplate)
- @wsgi.deserializers(xml=AcceptDeserializer)
def accept(self, req, id, body):
"""Accept a new volume transfer."""
transfer_id = id
@@ -235,8 +162,6 @@ class Volume_transfer(extensions.ExtensionDescriptor):
name = "VolumeTransfer"
alias = "os-volume-transfer"
- namespace = "http://docs.openstack.org/volume/ext/volume-transfer/" + \
- "api/v1.1"
updated = "2013-05-29T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/volume_type_access.py b/cinder/api/contrib/volume_type_access.py
index 82a84d53c77..56937900919 100644
--- a/cinder/api/contrib/volume_type_access.py
+++ b/cinder/api/contrib/volume_type_access.py
@@ -19,7 +19,6 @@ import webob
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import exception
from cinder.i18n import _
from cinder.volume import volume_types
@@ -30,45 +29,6 @@ soft_authorize = extensions.soft_extension_authorizer('volume',
authorize = extensions.extension_authorizer('volume', 'volume_type_access')
-def make_volume_type(elem):
- elem.set('{%s}is_public' % Volume_type_access.namespace,
- '%s:is_public' % Volume_type_access.alias)
-
-
-def make_volume_type_access(elem):
- elem.set('volume_type_id')
- elem.set('project_id')
-
-
-class VolumeTypeTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume_type', selector='volume_type')
- make_volume_type(root)
- alias = Volume_type_access.alias
- namespace = Volume_type_access.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class VolumeTypesTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume_types')
- elem = xmlutil.SubTemplateElement(
- root, 'volume_type', selector='volume_types')
- make_volume_type(elem)
- alias = Volume_type_access.alias
- namespace = Volume_type_access.namespace
- return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
-
-
-class VolumeTypeAccessTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('volume_type_access')
- elem = xmlutil.SubTemplateElement(root, 'access',
- selector='volume_type_access')
- make_volume_type_access(elem)
- return xmlutil.MasterTemplate(root, 1)
-
-
def _marshall_volume_type_access(vol_type):
rval = []
for project_id in vol_type['projects']:
@@ -84,7 +44,6 @@ class VolumeTypeAccessController(object):
def __init__(self):
super(VolumeTypeAccessController, self).__init__()
- @wsgi.serializers(xml=VolumeTypeAccessTemplate)
def index(self, req, type_id):
context = req.environ['cinder.context']
authorize(context)
@@ -123,8 +82,6 @@ class VolumeTypeActionController(wsgi.Controller):
def show(self, req, resp_obj, id):
context = req.environ['cinder.context']
if soft_authorize(context):
- # Attach our slave template to the response object
- resp_obj.attach(xml=VolumeTypeTemplate())
vol_type = req.cached_resource_by_id(id, name='types')
self._extend_vol_type(resp_obj.obj['volume_type'], vol_type)
@@ -132,8 +89,6 @@ class VolumeTypeActionController(wsgi.Controller):
def index(self, req, resp_obj):
context = req.environ['cinder.context']
if soft_authorize(context):
- # Attach our slave template to the response object
- resp_obj.attach(xml=VolumeTypesTemplate())
for vol_type_rval in list(resp_obj.obj['volume_types']):
type_id = vol_type_rval['id']
vol_type = req.cached_resource_by_id(type_id, name='types')
@@ -143,8 +98,6 @@ class VolumeTypeActionController(wsgi.Controller):
def detail(self, req, resp_obj):
context = req.environ['cinder.context']
if soft_authorize(context):
- # Attach our slave template to the response object
- resp_obj.attach(xml=VolumeTypesTemplate())
for vol_type_rval in list(resp_obj.obj['volume_types']):
type_id = vol_type_rval['id']
vol_type = req.cached_resource_by_id(type_id, name='types')
@@ -154,8 +107,6 @@ class VolumeTypeActionController(wsgi.Controller):
def create(self, req, body, resp_obj):
context = req.environ['cinder.context']
if soft_authorize(context):
- # Attach our slave template to the response object
- resp_obj.attach(xml=VolumeTypeTemplate())
type_id = resp_obj.obj['volume_type']['id']
vol_type = req.cached_resource_by_id(type_id, name='types')
self._extend_vol_type(resp_obj.obj['volume_type'], vol_type)
@@ -195,8 +146,6 @@ class Volume_type_access(extensions.ExtensionDescriptor):
name = "VolumeTypeAccess"
alias = "os-volume-type-access"
- namespace = ("http://docs.openstack.org/volume/"
- "ext/os-volume-type-access/api/v1")
updated = "2014-06-26T00:00:00Z"
def get_resources(self):
diff --git a/cinder/api/contrib/volume_type_encryption.py b/cinder/api/contrib/volume_type_encryption.py
index 7750aa090a5..9ae05ce5021 100644
--- a/cinder/api/contrib/volume_type_encryption.py
+++ b/cinder/api/contrib/volume_type_encryption.py
@@ -19,7 +19,6 @@ import webob
from cinder.api import extensions
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import db
from cinder import exception
from cinder.i18n import _
@@ -33,12 +32,6 @@ authorize = extensions.extension_authorizer('volume',
CONTROL_LOCATION = ['front-end', 'back-end']
-class VolumeTypeEncryptionTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.make_flat_dict('encryption', selector='encryption')
- return xmlutil.MasterTemplate(root, 1)
-
-
class VolumeTypeEncryptionController(wsgi.Controller):
"""The volume type encryption API controller for the OpenStack API."""
@@ -89,7 +82,6 @@ class VolumeTypeEncryptionController(wsgi.Controller):
else:
return False
- @wsgi.serializers(xml=VolumeTypeEncryptionTemplate)
def index(self, req, type_id):
"""Returns the encryption specs for a given volume type."""
context = req.environ['cinder.context']
@@ -97,7 +89,6 @@ class VolumeTypeEncryptionController(wsgi.Controller):
self._check_type(context, type_id)
return self._get_volume_type_encryption(context, type_id)
- @wsgi.serializers(xml=VolumeTypeEncryptionTemplate)
def create(self, req, type_id, body=None):
"""Create encryption specs for an existing volume type."""
context = req.environ['cinder.context']
@@ -125,7 +116,6 @@ class VolumeTypeEncryptionController(wsgi.Controller):
notifier.info(context, 'volume_type_encryption.create', notifier_info)
return body
- @wsgi.serializers(xml=VolumeTypeEncryptionTemplate)
def update(self, req, type_id, id, body=None):
"""Update encryption specs for a given volume type."""
context = req.environ['cinder.context']
@@ -153,7 +143,6 @@ class VolumeTypeEncryptionController(wsgi.Controller):
return body
- @wsgi.serializers(xml=VolumeTypeEncryptionTemplate)
def show(self, req, type_id, id):
"""Return a single encryption item."""
context = req.environ['cinder.context']
@@ -190,8 +179,6 @@ class Volume_type_encryption(extensions.ExtensionDescriptor):
name = "VolumeTypeEncryption"
alias = "encryption"
- namespace = ("http://docs.openstack.org/volume/ext/"
- "volume-type-encryption/api/v1")
updated = "2013-07-01T00:00:00+00:00"
def get_resources(self):
diff --git a/cinder/api/contrib/volume_unmanage.py b/cinder/api/contrib/volume_unmanage.py
index 72b5c7fa1ca..0e156d76ef0 100644
--- a/cinder/api/contrib/volume_unmanage.py
+++ b/cinder/api/contrib/volume_unmanage.py
@@ -66,7 +66,6 @@ class Volume_unmanage(extensions.ExtensionDescriptor):
name = "VolumeUnmanage"
alias = "os-volume-unmanage"
- namespace = "http://docs.openstack.org/volume/ext/volume-unmanage/api/v1.1"
updated = "2012-05-31T00:00:00+00:00"
def get_controller_extensions(self):
diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py
index 20af44c0cf1..bf8cc96e937 100644
--- a/cinder/api/extensions.py
+++ b/cinder/api/extensions.py
@@ -24,7 +24,6 @@ import webob.exc
import cinder.api.openstack
from cinder.api.openstack import wsgi
-from cinder.api import xmlutil
from cinder import exception
from cinder.i18n import _LE, _LI, _LW
import cinder.policy
@@ -49,12 +48,6 @@ class ExtensionDescriptor(object):
# The alias for the extension, e.g., 'FOXNSOX'
alias = None
- # Description comes from the docstring for the class
-
- # The XML namespace for the extension, e.g.,
- # 'http://www.fox.in.socks/api/ext/pie/v1.0'
- namespace = None
-
# The timestamp when the extension was last updated, e.g.,
# '2011-01-22T13:25:27-06:00'
updated = None
@@ -82,55 +75,6 @@ class ExtensionDescriptor(object):
controller_exts = []
return controller_exts
- @classmethod
- def nsmap(cls):
- """Synthesize a namespace map from extension."""
-
- # Start with a base nsmap
- nsmap = ext_nsmap.copy()
-
- # Add the namespace for the extension
- nsmap[cls.alias] = cls.namespace
-
- return nsmap
-
- @classmethod
- def xmlname(cls, name):
- """Synthesize element and attribute names."""
-
- return '{%s}%s' % (cls.namespace, name)
-
-
-def make_ext(elem):
- elem.set('name')
- elem.set('namespace')
- elem.set('alias')
- elem.set('updated')
-
- desc = xmlutil.SubTemplateElement(elem, 'description')
- desc.text = 'description'
-
- xmlutil.make_links(elem, 'links')
-
-
-ext_nsmap = {None: xmlutil.XMLNS_COMMON_V10, 'atom': xmlutil.XMLNS_ATOM}
-
-
-class ExtensionTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('extension', selector='extension')
- make_ext(root)
- return xmlutil.MasterTemplate(root, 1, nsmap=ext_nsmap)
-
-
-class ExtensionsTemplate(xmlutil.TemplateBuilder):
- def construct(self):
- root = xmlutil.TemplateElement('extensions')
- elem = xmlutil.SubTemplateElement(root, 'extension',
- selector='extensions')
- make_ext(elem)
- return xmlutil.MasterTemplate(root, 1, nsmap=ext_nsmap)
-
class ExtensionsResource(wsgi.Resource):
@@ -143,19 +87,16 @@ class ExtensionsResource(wsgi.Resource):
ext_data['name'] = ext.name
ext_data['alias'] = ext.alias
ext_data['description'] = ext.__doc__
- ext_data['namespace'] = ext.namespace
ext_data['updated'] = ext.updated
ext_data['links'] = [] # TODO(dprince): implement extension links
return ext_data
- @wsgi.serializers(xml=ExtensionsTemplate)
def index(self, req):
extensions = []
for _alias, ext in self.extension_manager.extensions.items():
extensions.append(self._translate(ext))
return dict(extensions=extensions)
- @wsgi.serializers(xml=ExtensionTemplate)
def show(self, req, id):
try:
# NOTE(dprince): the extensions alias is used as the 'id' for show
@@ -238,7 +179,6 @@ class ExtensionManager(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 updated: %s', extension.updated)
except AttributeError:
LOG.exception(_LE("Exception loading extension."))
diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py
index fabd12aaed3..1d7152b5b10 100644
--- a/cinder/api/openstack/__init__.py
+++ b/cinder/api/openstack/__init__.py
@@ -38,11 +38,11 @@ class APIMapper(routes.Mapper):
def connect(self, *args, **kwargs):
# NOTE(inhye): Default the format part of a route to only accept json
- # and xml so it doesn't eat all characters after a '.'
+ # so it doesn't eat all characters after a '.'
# in the url.
kwargs.setdefault('requirements', {})
if not kwargs['requirements'].get('format'):
- kwargs['requirements']['format'] = 'json|xml'
+ kwargs['requirements']['format'] = 'json'
return routes.Mapper.connect(self, *args, **kwargs)
diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 67a54cb373f..c715271370c 100644
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -18,12 +18,8 @@ import functools
import inspect
import math
import time
-from xml.dom import minidom
-from xml.parsers import expat
-from lxml import etree
from oslo_log import log as logging
-from oslo_log import versionutils
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
from oslo_utils import excutils
@@ -41,26 +37,16 @@ from cinder import utils
from cinder.wsgi import common as wsgi
-XML_NS_V1 = 'http://docs.openstack.org/api/openstack-block-storage/1.0/content'
-XML_NS_V2 = 'http://docs.openstack.org/api/openstack-block-storage/2.0/content'
-XML_NS_ATOM = 'http://www.w3.org/2005/Atom'
-XML_WARNING = False
-
LOG = logging.getLogger(__name__)
SUPPORTED_CONTENT_TYPES = (
'application/json',
'application/vnd.openstack.volume+json',
- 'application/xml',
- 'application/vnd.openstack.volume+xml',
)
_MEDIA_TYPE_MAP = {
'application/vnd.openstack.volume+json': 'json',
'application/json': 'json',
- 'application/vnd.openstack.volume+xml': 'xml',
- 'application/xml': 'xml',
- 'application/atom+xml': 'atom',
}
@@ -372,95 +358,6 @@ class JSONDeserializer(TextDeserializer):
return {'body': self._from_json(datastring)}
-class XMLDeserializer(TextDeserializer):
-
- def __init__(self, metadata=None):
- """Initialize XMLDeserializer.
-
- :param metadata: information needed to deserialize xml into
- a dictionary.
- """
- super(XMLDeserializer, self).__init__()
- self.metadata = metadata or {}
-
- def _from_xml(self, datastring):
- plurals = set(self.metadata.get('plurals', {}))
-
- try:
- node = utils.safe_minidom_parse_string(datastring).childNodes[0]
- return {node.nodeName: self._from_xml_node(node, plurals)}
- except expat.ExpatError:
- msg = _("cannot understand XML")
- raise exception.MalformedRequestBody(reason=msg)
-
- def _from_xml_node(self, node, listnames):
- """Convert a minidom node to a simple Python type.
-
- :param listnames: list of XML node names whose subnodes should
- be considered list items.
- """
- if len(node.childNodes) == 1 and node.childNodes[0].nodeType == 3:
- return node.childNodes[0].nodeValue
- elif node.nodeName in listnames:
- return [self._from_xml_node(n, listnames) for n in node.childNodes]
- else:
- result = dict()
- for attr in node.attributes.keys():
- result[attr] = node.attributes[attr].nodeValue
- for child in node.childNodes:
- if child.nodeType != node.TEXT_NODE:
- result[child.nodeName] = self._from_xml_node(child,
- listnames)
- return result
-
- def find_first_child_named_in_namespace(self, parent, namespace, name):
- """Search a nodes children for the first child with a given name."""
- for node in parent.childNodes:
- if (node.localName == name and
- node.namespaceURI and
- node.namespaceURI == namespace):
- return node
- return None
-
- def find_first_child_named(self, parent, name):
- """Search a nodes children for the first child with a given name."""
- for node in parent.childNodes:
- if node.nodeName == name:
- return node
- return None
-
- def find_children_named(self, parent, name):
- """Return all of a nodes children who have the given name."""
- for node in parent.childNodes:
- if node.nodeName == name:
- yield node
-
- def extract_text(self, node):
- """Get the text field contained by the given node."""
- text = []
- # Cannot assume entire text will be in a single child node because SAX
- # parsers may split contiguous character data into multiple chunks
- for child in node.childNodes:
- if child.nodeType == child.TEXT_NODE:
- text.append(child.nodeValue)
- return ''.join(text)
-
- def default(self, datastring):
- return {'body': self._from_xml(datastring)}
-
-
-class MetadataXMLDeserializer(XMLDeserializer):
-
- def extract_metadata(self, metadata_node):
- """Marshal the metadata attribute of a parsed request."""
- metadata = {}
- if metadata_node is not None:
- for meta_node in self.find_children_named(metadata_node, "meta"):
- key = meta_node.getAttribute("key")
- metadata[key] = self.extract_text(meta_node)
- return metadata
-
-
class DictSerializer(ActionDispatcher):
"""Default request body serialization."""
@@ -478,111 +375,6 @@ class JSONDictSerializer(DictSerializer):
return jsonutils.dump_as_bytes(data)
-class XMLDictSerializer(DictSerializer):
-
- def __init__(self, metadata=None, xmlns=None):
- """Initialize XMLDictSerializer.
-
- :param metadata: information needed to deserialize xml into
- a dictionary.
- :param xmlns: XML namespace to include with serialized xml
- """
- super(XMLDictSerializer, self).__init__()
- self.metadata = metadata or {}
- self.xmlns = xmlns
-
- def default(self, data):
- # We expect data to contain a single key which is the XML root.
- root_key = list(data.keys())[0]
- doc = minidom.Document()
- node = self._to_xml_node(doc, self.metadata, root_key, data[root_key])
-
- return self.to_xml_string(node)
-
- def to_xml_string(self, node, has_atom=False):
- self._add_xmlns(node, has_atom)
- return node.toxml('UTF-8')
-
- # NOTE (ameade): the has_atom should be removed after all of the
- # xml serializers and view builders have been updated to the current
- # spec that required all responses include the xmlns:atom, the has_atom
- # flag is to prevent current tests from breaking
- def _add_xmlns(self, node, has_atom=False):
- if self.xmlns is not None:
- node.setAttribute('xmlns', self.xmlns)
- if has_atom:
- node.setAttribute('xmlns:atom', "http://www.w3.org/2005/Atom")
-
- def _to_xml_node(self, doc, metadata, nodename, data):
- """Recursive method to convert data members to XML nodes."""
- result = doc.createElement(nodename)
-
- # Set the xml namespace if one is specified
- # TODO(justinsb): We could also use prefixes on the keys
- xmlns = metadata.get('xmlns', None)
- if xmlns:
- result.setAttribute('xmlns', xmlns)
-
- # TODO(bcwaldon): accomplish this without a type-check
- if isinstance(data, list):
- collections = metadata.get('list_collections', {})
- if nodename in collections:
- metadata = collections[nodename]
- for item in data:
- node = doc.createElement(metadata['item_name'])
- node.setAttribute(metadata['item_key'], str(item))
- result.appendChild(node)
- return result
- singular = metadata.get('plurals', {}).get(nodename, None)
- if singular is None:
- if nodename.endswith('s'):
- singular = nodename[:-1]
- else:
- singular = 'item'
- for item in data:
- node = self._to_xml_node(doc, metadata, singular, item)
- result.appendChild(node)
- # TODO(bcwaldon): accomplish this without a type-check
- elif isinstance(data, dict):
- collections = metadata.get('dict_collections', {})
- if nodename in collections:
- metadata = collections[nodename]
- for k, v in sorted(data.items()):
- node = doc.createElement(metadata['item_name'])
- node.setAttribute(metadata['item_key'], str(k))
- text = doc.createTextNode(str(v))
- node.appendChild(text)
- result.appendChild(node)
- return result
- attrs = metadata.get('attributes', {}).get(nodename, {})
- for k, v in sorted(data.items()):
- if k in attrs:
- result.setAttribute(k, str(v))
- else:
- node = self._to_xml_node(doc, metadata, k, v)
- result.appendChild(node)
- else:
- # Type is atom
- node = doc.createTextNode(str(data))
- result.appendChild(node)
- return result
-
- def _create_link_nodes(self, xml_doc, links):
- link_nodes = []
- for link in links:
- link_node = xml_doc.createElement('atom:link')
- link_node.setAttribute('rel', link['rel'])
- link_node.setAttribute('href', link['href'])
- if 'type' in link:
- link_node.setAttribute('type', link['type'])
- link_nodes.append(link_node)
- return link_nodes
-
- def _to_xml(self, root):
- """Convert the xml object to an xml string."""
- return etree.tostring(root, encoding='UTF-8', xml_declaration=True)
-
-
def serializers(**serializers):
"""Attaches serializers to a method.
@@ -784,15 +576,6 @@ def action_peek_json(body):
return list(decoded.keys())[0]
-def action_peek_xml(body):
- """Determine action to invoke."""
-
- dom = utils.safe_minidom_parse_string(body)
- action_node = dom.childNodes[0]
-
- return action_node.tagName
-
-
class ResourceExceptionHandler(object):
"""Context manager to handle Resource exceptions.
@@ -859,16 +642,13 @@ class Resource(wsgi.Application):
self.controller = controller
- default_deserializers = dict(xml=XMLDeserializer,
- json=JSONDeserializer)
+ default_deserializers = dict(json=JSONDeserializer)
default_deserializers.update(deserializers)
self.default_deserializers = default_deserializers
- self.default_serializers = dict(xml=XMLDictSerializer,
- json=JSONDictSerializer)
+ self.default_serializers = dict(json=JSONDictSerializer)
- self.action_peek = dict(xml=action_peek_xml,
- json=action_peek_json)
+ self.action_peek = dict(json=action_peek_json)
self.action_peek.update(action_peek or {})
# Copy over the actions dictionary
@@ -1542,25 +1322,11 @@ class Fault(webob.exc.HTTPException):
req.api_version_request.get_string())
self.wrapped_exc.headers['Vary'] = API_VERSION_REQUEST_HEADER
- # 'code' is an attribute on the fault tag itself
- metadata = {'attributes': {fault_name: 'code'}}
-
- xml_serializer = XMLDictSerializer(metadata, XML_NS_V2)
-
content_type = req.best_match_content_type()
serializer = {
- 'application/xml': xml_serializer,
'application/json': JSONDictSerializer(),
}[content_type]
- if content_type == 'application/xml':
- global XML_WARNING
- if not XML_WARNING:
- msg = _('XML support has been deprecated and will be removed '
- 'in the N release.')
- versionutils.report_deprecated_feature(LOG, msg)
- XML_WARNING = True
-
body = serializer.serialize(fault_data)
if isinstance(body, six.text_type):
body = body.encode('utf-8')
@@ -1606,7 +1372,6 @@ class OverLimitFault(webob.exc.HTTPException):
def __call__(self, request):
"""Serializes the wrapped exception conforming to our error format."""
content_type = request.best_match_content_type()
- metadata = {"attributes": {"overLimitFault": "code"}}
def translate(msg):
locale = request.best_match_language()
@@ -1617,9 +1382,7 @@ class OverLimitFault(webob.exc.HTTPException):
self.content['overLimitFault']['details'] = \
translate(self.content['overLimitFault']['details'])
- xml_serializer = XMLDictSerializer(metadata, XML_NS_V2)
serializer = {
- 'application/xml': xml_serializer,
'application/json': JSONDictSerializer(),
}[content_type]
diff --git a/cinder/api/schemas/atom-link.rng b/cinder/api/schemas/atom-link.rng
deleted file mode 100644
index edba5eee6c4..00000000000
--- a/cinder/api/schemas/atom-link.rng
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-