diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-19 23:19:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-19 23:19:52 +0000 |
| commit | e60d593b5ec254bb74fca39db7164f57db90be47 (patch) | |
| tree | c5dc4414ede93c58aa80a782fa869a0ac05856fb /nova/virt | |
| parent | 565f0b2fac370a41c1f34893d9d73d2c4e161474 (diff) | |
| parent | 4e733aac4697703b8c787cd6347421ed2f57d1b2 (diff) | |
Merge "Fix calls to private method in linux_net"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/vif.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index feb6e456a..4f51b96a8 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -144,7 +144,7 @@ class LibvirtOpenVswitchDriver(vif.VIFDriver): network, mapping = vif iface_id = mapping['vif_uuid'] dev = self.get_dev_name(iface_id) - if not linux_net._device_exists(dev): + if not linux_net.device_exists(dev): # Older version of the command 'ip' from the iproute2 package # don't have support for the tuntap option (lp:882568). If it # turns out we're on an old version we work around this by using @@ -212,10 +212,10 @@ class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver, br_name = self.get_br_name(iface_id) v1_name, v2_name = self.get_veth_pair_names(iface_id) - if not linux_net._device_exists(br_name): + if not linux_net.device_exists(br_name): utils.execute('brctl', 'addbr', br_name, run_as_root=True) - if not linux_net._device_exists(v2_name): + if not linux_net.device_exists(v2_name): linux_net._create_veth_pair(v1_name, v2_name) utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True) utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True) |