From b952e1ef61a6ed73e34c6dd0318cd4d52faf47dc Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Tue, 28 Sep 2010 21:07:26 -0700
Subject: patch for test

---
 nova/tests/virt_unittest.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py
index f9ff0f71f..5e9505374 100644
--- a/nova/tests/virt_unittest.py
+++ b/nova/tests/virt_unittest.py
@@ -178,8 +178,14 @@ class NWFilterTestCase(test.TrialTestCase):
             self.defined_filters.append(name)
             return True
 
+        self.fake_libvirt_connection.nwfilterDefineXML = _filterDefineXMLMock
+
+        instance_ref = db.instance_create({}, {'user_id': 'fake',
+                                          'project_id': 'fake'})
+        inst_id = instance_ref['id']
+
         def _ensure_all_called(_):
-            instance_filter = 'nova-instance-i-1'
+            instance_filter = 'nova-instance-%s' % instance_ref['str_id']
             secgroup_filter = 'nova-secgroup-%s' % self.security_group['id']
             for required in [secgroup_filter, 'allow-dhcp-server',
                              'no-arp-spoofing', 'no-ip-spoofing',
@@ -187,11 +193,6 @@ class NWFilterTestCase(test.TrialTestCase):
                 self.assertTrue(required in self.recursive_depends[instance_filter],
                             "Instance's filter does not include %s" % required)
 
-        self.fake_libvirt_connection.nwfilterDefineXML = _filterDefineXMLMock
-
-        inst_id = db.instance_create({}, {'user_id': 'fake',
-                                          'project_id': 'fake'})['id']
-
         self.security_group = self.setup_and_return_security_group()
 
         db.instance_add_security_group({}, inst_id, self.security_group.id)
-- 
cgit