← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/contrib/networks.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/api/openstack/compute/contrib/networks.py
40
40
                  'netmask', 'injected', 'cidr', 'vpn_public_address',
41
41
                  'multi_host', 'dns1', 'host', 'gateway_v6', 'netmask_v6',
42
42
                  'created_at')
43
 
        return dict((field, network[field]) for field in fields)
 
43
        result = dict((field, network[field]) for field in fields)
 
44
        if 'uuid' in network:
 
45
            result['id'] = network['uuid']
 
46
        return result
44
47
    else:
45
48
        return {}
46
49
 
67
70
    def _disassociate(self, request, network_id, body):
68
71
        context = request.environ['nova.context']
69
72
        authorize(context)
70
 
        LOG.debug(_("Disassociating network with id %s") % network_id)
 
73
        LOG.debug(_("Disassociating network with id %s"), network_id)
71
74
        try:
72
75
            self.network_api.disassociate(context, network_id)
73
76
        except exception.NetworkNotFound: