← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-security

« back to all changes in this revision

Viewing changes to nova/network/quantum/manager.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/quantum/manager.py
28
28
from nova.network.quantum import melange_ipam_lib
29
29
from nova.network.quantum import quantum_connection
30
30
from nova.openstack.common import cfg
 
31
from nova.openstack.common import rpc
31
32
from nova import utils
32
33
 
33
34
LOG = logging.getLogger(__name__)
283
284
 
284
285
        # Now we can delete the network
285
286
        self.q_conn.delete_network(q_tenant_id, net_uuid)
286
 
        LOG.debug("Deleting network %s for tenant: %s" % \
287
 
                                    (net_uuid, q_tenant_id))
 
287
        LOG.debug("Deleting network %s for tenant: %s" %
 
288
                  (net_uuid, q_tenant_id))
288
289
        self.ipam.delete_subnets_by_net_id(context, net_uuid, project_id)
289
290
        # Get rid of dnsmasq
290
291
        if FLAGS.quantum_use_dhcp:
291
292
            if net_ref['host'] == self.host:
292
293
                self.kill_dhcp(net_ref)
293
294
            else:
294
 
                topic = self.db.queue_get_for(context,
 
295
                topic = rpc.queue_get_for(context,
295
296
                        FLAGS.network_topic,
296
297
                        net_ref['host'])
297
298
 
389
390
                    self.enable_dhcp(context, network['quantum_net_id'],
390
391
                            network, vif_rec, network['net_tenant_id'])
391
392
                else:
392
 
                    topic = self.db.queue_get_for(context,
 
393
                    topic = rpc.queue_get_for(context,
393
394
                                FLAGS.network_topic, network['host'])
394
395
                    rpc.call(context, topic, {'method': 'enable_dhcp',
395
396
                        'args': {'quantum_net_id': network['quantum_net_id'],
608
609
                    self.update_dhcp(context, ipam_tenant_id, network,
609
610
                                 vif, project_id)
610
611
                else:
611
 
                    topic = self.db.queue_get_for(context,
 
612
                    topic = rpc.queue_get_for(context,
612
613
                                FLAGS.network_topic, network['host'])
613
614
                    rpc.call(context, topic, {'method': 'update_dhcp',
614
615
                        'args': {'ipam_tenant_id': ipam_tenant_id,