Changeset 221

Timestamp:

08/08/08 22:33:03 (3 months ago)

Author:

pwh

Message:

Fixed a bug in validate_stp_root_bridge_address where the root bridge address and priority weren't checked for length. Also enhanced tests.

Files:

• nethorus/lib/nethorus_functions.rb (modified) (1 diff)
• nethorus/test/functional/common_functions_test.rb (modified) (1 diff)

nethorus/lib/nethorus_functions.rb

@@ -80 +80 @@
-  root_fields = parse_stp_root_bridge_address(stp_root)
-
-root_fields[1].match(/[0-9A-F]{4}/) and root_fields[2].match(/[0-9A-F]{12}
+stp_root.length == 16 and root_fields[1].match(/^[0-9A-F]{4}/) and root_fields[2].match(/[0-9A-F]{12}$
-    return :true
-  else

nethorus/test/functional/common_functions_test.rb

@@ -76 +76 @@
-
-
+  # Test the parse_stp_root_bridge_address function.
+  
+  def test_parse_stp_root_bridge_address
+  
+    root_bridge = "80001234567890AB"
+    
+    root_bridge_components = parse_stp_root_bridge_address(root_bridge)
+    
+    assert(root_bridge_components[1] == "8000", "Root bridge priority for #{root_bridge} should be 8000")
+    assert(root_bridge_components[2] == "1234567890AB", "Root bridge address for #{root_bridge} should be 1234567890AB")
+  
+  end
+
+
+  # Test the validate_stp_root_bridge_address function.
+  
+  def test_validate_stp_root_bridge_address
+  
+    assert(validate_stp_root_bridge_address('80001234567890AB') == :true, "Root bridge 80001234567890 should be valid")
+    assert(validate_stp_root_bridge_address('0000000000000000') == :true, "Root bridge 00000000000000 should be valid")
+    assert(validate_stp_root_bridge_address('000000000000000') == :false, "Root bridge 000000000000000 should not be valid")
+    assert(validate_stp_root_bridge_address('00000000000000000') == :false, "Root bridge 00000000000000000 should not be valid")
+    assert(validate_stp_root_bridge_address('0') == :false, "Root bridge 0 should not be valid")
+  
+  end
+
+
-  # Test the validate_ip_address function.
-