← Back to branch summary

~blamar/nova/libvirt-cleanup-branch

« back to all changes in this revision

Viewing changes to nova/network/vmwareapi_net.py

  • Committer: Brian Lamar
  • Date: 2011-07-01 16:07:15 UTC
  • mfrom: (1217.1.27 nova)
  • Revision ID: brian.lamar@rackspace.com-20110701160715-b5prxtlcfz2qotjx
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/vmwareapi_net.py
33
33
FLAGS['vlan_interface'].SetDefault('vmnic0')
34
34
 
35
35
 
36
 
def ensure_vlan_bridge(vlan_num, bridge, net_attrs=None):
 
36
def ensure_vlan_bridge(vlan_num, bridge, bridge_interface, net_attrs=None):
37
37
    """Create a vlan and bridge unless they already exist."""
38
38
    # Open vmwareapi session
39
39
    host_ip = FLAGS.vmwareapi_host_ip
46
46
                          'connection_type=vmwareapi'))
47
47
    session = VMWareAPISession(host_ip, host_username, host_password,
48
48
                               FLAGS.vmwareapi_api_retry_count)
49
 
    vlan_interface = FLAGS.vlan_interface
 
49
    vlan_interface = bridge_interface
50
50
    # Check if the vlan_interface physical network adapter exists on the host
51
51
    if not network_utils.check_if_vlan_interface_exists(session,
52
52
                                                        vlan_interface):