← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/api/openstack/common.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2013-03-20 12:59:22 UTC
  • mfrom: (1.1.69)
  • Revision ID: package-import@ubuntu.com-20130320125922-ohvfav96lemn9wlz
Tags: 1:2013.1~rc1-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.
  - Add sqlite3 required for the testsuite.

[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/common.py
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
2
 
3
 
# Copyright 2010 OpenStack LLC.
 
3
# Copyright 2010 OpenStack Foundation
4
4
# All Rights Reserved.
5
5
#
6
6
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
31
31
from nova import exception
32
32
from nova.openstack.common import log as logging
33
33
from nova import quota
34
 
from nova import utils
35
34
 
36
35
osapi_opts = [
37
36
    cfg.IntOpt('osapi_max_limit',
356
355
 
357
356
class MetadataDeserializer(wsgi.MetadataXMLDeserializer):
358
357
    def deserialize(self, text):
359
 
        dom = utils.safe_minidom_parse_string(text)
 
358
        dom = xmlutil.safe_minidom_parse_string(text)
360
359
        metadata_node = self.find_first_child_named(dom, "metadata")
361
360
        metadata = self.extract_metadata(metadata_node)
362
361
        return {'body': {'metadata': metadata}}
364
363
 
365
364
class MetaItemDeserializer(wsgi.MetadataXMLDeserializer):
366
365
    def deserialize(self, text):
367
 
        dom = utils.safe_minidom_parse_string(text)
 
366
        dom = xmlutil.safe_minidom_parse_string(text)
368
367
        metadata_item = self.extract_metadata(dom)
369
368
        return {'body': {'meta': metadata_item}}
370
369
 
382
381
        return metadata
383
382
 
384
383
    def _extract_metadata_container(self, datastring):
385
 
        dom = utils.safe_minidom_parse_string(datastring)
 
384
        dom = xmlutil.safe_minidom_parse_string(datastring)
386
385
        metadata_node = self.find_first_child_named(dom, "metadata")
387
386
        metadata = self.extract_metadata(metadata_node)
388
387
        return {'body': {'metadata': metadata}}
394
393
        return self._extract_metadata_container(datastring)
395
394
 
396
395
    def update(self, datastring):
397
 
        dom = utils.safe_minidom_parse_string(datastring)
 
396
        dom = xmlutil.safe_minidom_parse_string(datastring)
398
397
        metadata_item = self.extract_metadata(dom)
399
398
        return {'body': {'meta': metadata_item}}
400
399