← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/libvirt/vif.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/virt/libvirt/vif.py
2
2
 
3
3
# Copyright (C) 2011 Midokura KK
4
4
# Copyright (C) 2011 Nicira, Inc
5
 
# Copyright 2011 OpenStack LLC.
 
5
# Copyright 2011 OpenStack Foundation
6
6
# All Rights Reserved.
7
7
#
8
8
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
101
101
        # If the user has specified a 'vif_model' against the
102
102
        # image then honour that model
103
103
        if image_meta:
104
 
            vif_model = image_meta.get('properties', {}).get('vif_model')
 
104
            vif_model = image_meta.get('properties',
 
105
                                       {}).get('hw_vif_model')
105
106
            if vif_model is not None:
106
107
                model = vif_model
107
108
 
172
173
 
173
174
        mac_id = mapping['mac'].replace(':', '')
174
175
        name = "nova-instance-" + instance['name'] + "-" + mac_id
175
 
        conf.filtername = name
 
176
        if self.get_firewall_required():
 
177
            conf.filtername = name
176
178
        designer.set_vif_bandwidth_config(conf, instance)
177
179
 
178
180
        return conf
349
351
 
350
352
        if not linux_net.device_exists(br_name):
351
353
            utils.execute('brctl', 'addbr', br_name, run_as_root=True)
 
354
            utils.execute('brctl', 'setfd', br_name, 0, run_as_root=True)
 
355
            utils.execute('brctl', 'stp', br_name, 'off', run_as_root=True)
352
356
 
353
357
        if not linux_net.device_exists(v2_name):
354
358
            linux_net._create_veth_pair(v1_name, v2_name)