Merge pull request #1886 from anarkiwi/master

pylint.

Author: anarkiwi

tests/test_config.py

@@ -26,6 +26,7 @@ def tearDown(self):
         shutil.rmtree(self.tmpdir)
 
     def conf_file_name(self):
+        """Return path to test config file in test directory."""
         return os.path.join(self.tmpdir, 'faucet.yaml')
 
     def create_config_file(self, config):
@@ -45,7 +46,7 @@ def run_function_with_config(self, config, function, before_function=None):
             before_function()
         try:
             function(conf_file, LOGNAME)
-        except cp.InvalidConfigError as err:
+        except cp.InvalidConfigError as _err:
             return False
         return True
 
@@ -523,6 +524,7 @@ def test_invalid_interfaces(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_unresolved_mirror_ports(self):
+        """Test invalid mirror port name."""
         config = """
 vlans:
     office:
@@ -562,6 +564,7 @@ def test_resolved_mirror_port(self):
         self.check_config_success(config, cp.dp_parser)
 
     def test_vlans_on_mirror_ports(self):
+        """Test invalid VLANs configured on a mirror port."""
         config = """
 vlans:
     office:
@@ -579,6 +582,7 @@ def test_vlans_on_mirror_ports(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_unresolved_output_ports(self):
+        """Test invalid output port name."""
         config = """
 vlans:
     office:
@@ -601,6 +605,7 @@ def test_unresolved_output_ports(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_unknown_output_ports(self):
+        """Test invalid mirror ACL port."""
         config = """
 vlans:
     office:
@@ -674,6 +679,7 @@ def test_single_range_valid_config(self):
         self.assertEqual(len(dp.ports), 1)
 
     def test_port_range_invalid_config(self):
+        """Test invalid characters used in interface_ranges."""
         config = """
 vlans:
     office:
@@ -688,6 +694,7 @@ def test_port_range_invalid_config(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_no_actions(self):
+        """Test ACL with invalid actions section."""
         config = """
 acls:
     office-vlan-protect:
@@ -709,6 +716,7 @@ def test_acl_no_actions(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_invalid_ipv4(self):
+        """Test invalid IPv4 address in ACL."""
         config = """
 acls:
     office-vlan-protect:
@@ -730,6 +738,7 @@ def test_acl_invalid_ipv4(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_invalid_ipv6(self):
+        """Test invalid IPv6 address in ACL."""
         config = """
 acls:
     office-vlan-protect:
@@ -751,6 +760,7 @@ def test_acl_invalid_ipv6(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_invalid_mask(self):
+        """Test invalid IPv4 mask in ACL."""
         config = """
 acls:
     office-vlan-protect:
@@ -772,6 +782,7 @@ def test_acl_invalid_mask(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_invalid_udp_port(self):
+        """Test invalid UDP port in ACL."""
         config = """
 acls:
     access-port-protect:
@@ -792,6 +803,7 @@ def test_acl_invalid_udp_port(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_invalid_rule_name(self):
+        """Test invalid name for rule in ACL."""
         config = """
 acls:
     access-port-protect:
@@ -812,6 +824,7 @@ def test_acl_invalid_rule_name(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acl_and_acls_vlan_invalid(self):
+        """Test cannot have acl_in and acls_in together."""
         config = """
 acls:
     access-port-protect:
@@ -835,7 +848,7 @@ def test_acl_and_acls_vlan_invalid(self):
 """
         self.check_config_failure(config, cp.dp_parser)
 
-    def test_inconsistent_acl_exact_match(self):
+    def test_inconsistent_exact_match(self):
         """Test that ACLs have consistent exact_match."""
         config = """
 acls:
@@ -887,6 +900,7 @@ def test_acl_and_acls_port_invalid(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_acls_vlan_valid(self):
+        """Test ACLs can be combined on VLAN."""
         config = """
 acls:
     access-port-protect:
@@ -910,6 +924,7 @@ def test_acls_vlan_valid(self):
         self.check_config_success(config, cp.dp_parser)
 
     def test_acls_port_valid(self):
+        """Test ACLs can be combined on a port."""
         config = """
 acls:
     access-port-protect:
@@ -933,10 +948,12 @@ def test_acls_port_valid(self):
         self.check_config_success(config, cp.dp_parser)
 
     def test_invalid_char(self):
+        """Test config file with invalid characters."""
         config = b'\x63\xe1'
         self.check_config_failure(config, cp.dp_parser)
 
     def test_perm_denied(self):
+        """Test config file has no read permission."""
 
         def unreadable():
             """Make config unreadable."""
@@ -946,6 +963,7 @@ def unreadable():
         self.check_config_failure(config, cp.dp_parser, before_function=unreadable)
 
     def test_missing_route_config(self):
+        """Test missing IP gateway for route."""
         config = """
 vlans:
     office:
@@ -964,6 +982,7 @@ def test_missing_route_config(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_invalid_dp_conf(self):
+        """Test invalid DP header config."""
         config = """
 vlans:
     office:
@@ -1034,6 +1053,7 @@ def test_invalid_key(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_invalid_acl_formation(self):
+        """Test missing ACL name."""
         config = """
 acls:
 #   office-vlan-protect:
@@ -1643,6 +1663,7 @@ def test_unknown_port_key(self):
         self.check_config_failure(config, cp.dp_parser)
 
     def test_meter_config(self):
+        """Test valid meter config."""
         config = """
 meters:
     lossymeter:

tests/test_valve.py

@@ -152,6 +152,8 @@ class ValveTestBase(unittest.TestCase):
                     system_name: "faucet"
                     port_descr: "first_port"
                 loop_protect: True
+                receive_lldp: True
+                max_hosts: 1
             p2:
                 number: 2
                 native_vlan: v200
@@ -370,23 +372,25 @@ def packet_outs_from_flows(flows):
 
     def learn_hosts(self):
         """Learn some hosts."""
-        self.rcv_packet(1, 0x100, {
-            'eth_src': self.P1_V100_MAC,
-            'eth_dst': self.UNKNOWN_MAC,
-            'ipv4_src': '10.0.0.1',
-            'ipv4_dst': '10.0.0.2'})
-        self.rcv_packet(2, 0x200, {
-            'eth_src': self.P2_V200_MAC,
-            'eth_dst': self.P3_V200_MAC,
-            'ipv4_src': '10.0.0.2',
-            'ipv4_dst': '10.0.0.3',
-            'vid': 0x200})
-        self.rcv_packet(3, 0x200, {
-            'eth_src': self.P3_V200_MAC,
-            'eth_dst': self.P2_V200_MAC,
-            'ipv4_src': '10.0.0.3',
-            'ipv4_dst': '10.0.0.4',
-            'vid': 0x200})
+        # TODO: verify learn caching.
+        for _ in range(2):
+            self.rcv_packet(1, 0x100, {
+                'eth_src': self.P1_V100_MAC,
+                'eth_dst': self.UNKNOWN_MAC,
+                'ipv4_src': '10.0.0.1',
+                'ipv4_dst': '10.0.0.2'})
+            self.rcv_packet(2, 0x200, {
+                'eth_src': self.P2_V200_MAC,
+                'eth_dst': self.P3_V200_MAC,
+                'ipv4_src': '10.0.0.2',
+                'ipv4_dst': '10.0.0.3',
+                'vid': 0x200})
+            self.rcv_packet(3, 0x200, {
+                'eth_src': self.P3_V200_MAC,
+                'eth_dst': self.P2_V200_MAC,
+                'ipv4_src': '10.0.0.3',
+                'ipv4_dst': '10.0.0.4',
+                'vid': 0x200})
 
     def verify_flooding(self, matches):
         """Verify flooding for a packet, depending on the DP implementation."""