← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/fake.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/vmwareapi/fake.py
128
128
        for elem in self.propSet:
129
129
            if elem.name == attr:
130
130
                return elem.val
131
 
        raise exception.Error(_("Property %(attr)s not set for the managed "
132
 
                        "object %(objName)s") %
133
 
                        {'attr': attr,
134
 
                         'objName': self.objName})
 
131
        msg = _("Property %(attr)s not set for the managed object %(name)s")
 
132
        raise exception.NovaException(msg % {'attr': attr,
 
133
                                             'name': self.objName})
135
134
 
136
135
 
137
136
class DataObject(object):
498
497
        s = self._session
499
498
        self._session = None
500
499
        if s not in _db_content['session']:
501
 
            raise exception.Error(
 
500
            raise exception.NovaException(
502
501
                _("Logging out a session that is invalid or already logged "
503
502
                "out: %s") % s)
504
503
        del _db_content['session'][s]