← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/network_utils.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/network_utils.py
128
128
        excep = _("ESX SOAP server returned an empty port group "
129
129
                  "for the host system in its response")
130
130
        LOG.exception(excep)
131
 
        raise exception.Error(excep)
 
131
        raise exception.NovaException(excep)
132
132
    port_grps_on_host = port_grps_on_host_ret.HostPortGroup
133
133
    for p_gp in port_grps_on_host:
134
134
        if p_gp.spec.name == pg_name:
165
165
        # concerned with the port group being created, which is done
166
166
        # by the other call, we can ignore the exception.
167
167
        if error_util.FAULT_ALREADY_EXISTS not in exc.fault_list:
168
 
            raise exception.Error(exc)
 
168
            raise exception.NovaException(exc)
169
169
    LOG.debug(_("Created Port Group with name %s on "
170
170
                "the ESX host") % pg_name)