From 4e733aac4697703b8c787cd6347421ed2f57d1b2 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 19 Nov 2012 13:15:35 -0500 Subject: Fix calls to private method in linux_net LibvirtOpenVswitchDriver currently calls private method in linux_net. Modify this private method into a public method Fixes bug 883299 Change-Id: I5784b1550981636aa1c0abed040a86008c817b5d --- nova/virt/libvirt/vif.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/virt') 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) -- cgit