fix after review: style, improving tests, replacing underscore

2 files changed, 21 insertions, 13 deletions

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 19e4d5428..2e6fae6c7 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -223,7 +223,7 @@ class LibvirtConnTestCase(test.TestCase):
                                         _create_network_info(2))
         self.assertTrue(len(result['nics']) == 2)
 
-    def test_get_nic_for_xml(self):
+    def test_get_nic_for_xml_v4(self):
         conn = libvirt_conn.LibvirtConnection(True)
         network, mapping = _create_network_info()[0]
         self.flags(use_ipv6=False)
@@ -794,8 +794,11 @@ class IptablesFirewallTestCase(test.TestCase):
         self.assertEquals(len(rulesv6), 3)
 
     def multinic_iptables_test(self):
+        ipv4_rules_per_network = 2
+        ipv6_rules_per_network = 3
+        networks_count = 5
         instance_ref = self._create_instance_ref()
-        network_info = _create_network_info()
+        network_info = _create_network_info(networks_count)
         ipv4_len = len(self.fw.iptables.ipv4['filter'].rules)
         ipv6_len = len(self.fw.iptables.ipv6['filter'].rules)
         inst_ipv4, inst_ipv6 = self.fw.instance_rules(instance_ref,
@@ -803,8 +806,12 @@ class IptablesFirewallTestCase(test.TestCase):
         self.fw.add_filters_for_instance(instance_ref, network_info)
         ipv4 = self.fw.iptables.ipv4['filter'].rules
         ipv6 = self.fw.iptables.ipv6['filter'].rules
-        self.assertEquals(len(ipv4) - len(inst_ipv4) - ipv4_len, 2)
-        self.assertEquals(len(ipv6) - len(inst_ipv6) - ipv6_len, 3)
+        ipv4_network_rules = len(ipv4) - len(inst_ipv4) - ipv4_len
+        ipv6_network_rules = len(ipv6) - len(inst_ipv6) - ipv6_len
+        self.assertEquals(ipv4_network_rules,
+                          ipv4_rules_per_network * networks_count)
+        self.assertEquals(ipv6_network_rules,
+                          ipv6_rules_per_network * networks_count)
 
 
 class NWFilterTestCase(test.TestCase):
@@ -965,6 +972,7 @@ class NWFilterTestCase(test.TestCase):
     def test_create_network_filters(self):
         instance_ref = self._create_instance()
         network_info = _create_network_info(3)
-        result = \
-        self.fw._create_network_filters(instance_ref, network_info, "fake")
+        result = self.fw._create_network_filters(instance_ref,
+                                                 network_info,
+                                                 "fake")
         self.assertEquals(len(result), 3)
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 73a804014..7e8ff409a 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -1839,12 +1839,12 @@ class NWFilterFirewall(FirewallDriver):
                                              'nova-allow-dhcp-server']
 
         if FLAGS.use_ipv6:
-            networks = [network for (network, _) in network_info if
+            networks = [network for (network, _m) in network_info if
                         network['gateway_v6']]
 
             if networks:
                 instance_secgroup_filter_children.\
-                append('nova-allow-ra-server')
+                    append('nova-allow-ra-server')
 
         for security_group in \
                 db.security_group_get_by_instance(ctxt, instance['id']):
@@ -1859,8 +1859,8 @@ class NWFilterFirewall(FirewallDriver):
                                            instance_secgroup_filter_children))
 
         network_filters = self.\
-        _create_network_filters(instance, network_info,
-                                instance_secgroup_filter_name)
+            _create_network_filters(instance, network_info,
+                                    instance_secgroup_filter_name)
 
         for (name, children) in network_filters:
             self._define_filters(name, children)
@@ -1873,7 +1873,7 @@ class NWFilterFirewall(FirewallDriver):
             base_filter = 'nova-base'
 
         result = []
-        for (_, mapping) in network_info:
+        for (_n, mapping) in network_info:
             nic_id = mapping['mac'].replace(':', '')
             instance_filter_name = self._instance_filter_name(instance, nic_id)
             instance_filter_children = [base_filter,
@@ -1996,11 +1996,11 @@ class IptablesFirewallDriver(FirewallDriver):
         return ['-d %s -j $%s' % (ip, chain_name) for ip in ips]
 
     def _filters_for_instance(self, chain_name, network_info):
-        ips_v4 = [ip['ip'] for (_, mapping) in network_info
+        ips_v4 = [ip['ip'] for (_n, mapping) in network_info
                  for ip in mapping['ips']]
         ipv4_rules = self._create_filter(ips_v4, chain_name)
 
-        ips_v6 = [ip['ip'] for (_, mapping) in network_info
+        ips_v6 = [ip['ip'] for (_n, mapping) in network_info
                  for ip in mapping['ip6s']]
 
         ipv6_rules = self._create_filter(ips_v6, chain_name)