diff options
| author | Chet Burgess <cfb@metacloud.com> | 2013-02-21 12:02:07 -0800 |
|---|---|---|
| committer | Chet Burgess <cfb@metacloud.com> | 2013-02-22 05:20:01 +0000 |
| commit | 2ca65aecf47ab739a725f12095e716740e22e693 (patch) | |
| tree | 0a88eebd8b9f7f8a555ab8bfe692480d3aa41fe9 | |
| parent | a42845e455c74f41852babbbd09a3514021ea71d (diff) | |
Don't set filter name if we use Noop driver
If we are using the Noop firewall driver we don't set a filter name.
Fixes: bug #1131358
Change-Id: I5e8a92baa6838ed51b55ffd6af1e98da6dd662c2
| -rw-r--r-- | nova/tests/test_libvirt_vif.py | 8 | ||||
| -rw-r--r-- | nova/virt/libvirt/vif.py | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index df0d951f7..026e55e9c 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -371,6 +371,8 @@ class LibvirtVifTestCase(test.TestCase): ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] + ret = node.findall("filterref") + self.assertEqual(len(ret), 1) self.assertEqual(node.get("type"), "bridge") br_name = node.find("source").get("bridge") self.assertEqual(br_name, br_want) @@ -417,6 +419,8 @@ class LibvirtVifTestCase(test.TestCase): ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] + ret = node.findall("filterref") + self.assertEqual(len(ret), 0) self.assertEqual(node.get("type"), "ethernet") dev_name = node.find("target").get("dev") self.assertTrue(dev_name.startswith(dev_prefix)) @@ -455,6 +459,8 @@ class LibvirtVifTestCase(test.TestCase): ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] + ret = node.findall("filterref") + self.assertEqual(len(ret), 0) self.assertEqual(node.get("type"), "bridge") br_name = node.find("source").get("bridge") @@ -504,6 +510,8 @@ class LibvirtVifTestCase(test.TestCase): ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] + ret = node.findall("filterref") + self.assertEqual(len(ret), 1) self.assertEqual(node.get("type"), "bridge") br_name = node.find("source").get("bridge") self.assertEqual(br_name, br_want) diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 523857e42..8d9664751 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -172,7 +172,8 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): mac_id = mapping['mac'].replace(':', '') name = "nova-instance-" + instance['name'] + "-" + mac_id - conf.filtername = name + if self.get_firewall_required(): + conf.filtername = name designer.set_vif_bandwidth_config(conf, instance) return conf |