Changeset 227

Timestamp:

08/31/08 19:57:20 (4 months ago)

Author:

pwh

Message:

• bridge_test.rb: Corrected plenty of mistakes in test code and added extra
  tests thanks to rcov.
  

• bridges.yml: Corrected the designated root and base bridge addresses of
  the example bridge.
  

• bridge.rb: Added documentation for the bridge model.
  

Files:

• nethorus/app/models/bridge.rb (modified) (2 diffs)
• nethorus/test/fixtures/bridges.yml (modified) (1 diff)
• nethorus/test/unit/bridge_test.rb (modified) (3 diffs)

nethorus/app/models/bridge.rb

@@ -24 +24 @@
-An object representing a bridge within a device.
-
+= Overview
+
+A bridge object represents an IEEE 802.11 Ethernet bridge.
+
+Each bridge object must be associated with exactly one Device, however one
+Device may have several bridges - this is the case in which several
+instances of Spanning Tree Protocol (STP) are running on a device.
+
+A bridge object may have one or more associated StpPorts.
+
+= Attributes
+
+Each bridge object may have the following attributes:
+
+* *device_id* - a foreign key holding the value of the device to which this bridge belongs.
+* *dot1d_base_bridge_address* (REQUIRED) - the MAC address of this bridge.  This is combined with the value of *dot1d_stp_priority* to make a Bridge ID.
+* *dot1d_base_num_ports* - the number of ports in this bridge.
+* *dot1d_base_type* - the type of bridging this bridge can perform.  The only supported value is 'transparent-only'.
+* *dot1d_stp_protocol_specification* - 
+* *dot1d_stp_priority* - 
+* *dot1d_stp_time_since_topology_change* -
+* *dot1d_stp_topology_changes* - 
+* *dot1d_stp_designated_root* - 
+* *dot1d_stp_root_cost* -
+* *dot1d_stp_root_port* - 
+* *dot1d_stp_max_age* - 
+* *dot1d_stp_hello_time* - 
+* *dot1d_stp_hold_time* - 
+* *dot1d_stp_forward_delay* - 
+* *dot1d_stp_bridge_max_age* - 
+* *dot1d_stp_bridge_hello_time* - 
+* *dot1d_stp_bridge_forward_delay* - 
+* *created_at* - 
+* *updated_at* - 
+
-=end
-
@@ -98 +133 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  def before_validation
-
-= 99
+ 100
-      logger.warn "dot1d_stp_max_age is #{self.dot1d_stp_max_age} - multiplying by 100"
-      self.dot1d_stp_max_age = self.dot1d_stp_max_age * 100
-    end      
-
-
+
+
-      self.dot1d_stp_hello_time = self.dot1d_stp_hello_time * 100
-    end
-    
-
+
+
-      self.dot1d_stp_hold_time = self.dot1d_stp_hold_time * 100
-    end
-    
-
+
+
-      self.dot1d_stp_forward_delay = self.dot1d_stp_forward_delay * 100
-    end
-    
-
+
+
-      self.dot1d_stp_bridge_max_age = self.dot1d_stp_bridge_max_age * 100
-    end
-
-
+
+
+
-      self.dot1d_stp_bridge_hello_time = self.dot1d_stp_bridge_hello_time * 100
-    end
-
-
+
+
-      self.dot1d_stp_bridge_forward_delay = self.dot1d_stp_bridge_forward_delay * 100
-    end

nethorus/test/fixtures/bridges.yml

@@ -1 +1 @@
-test_bridge_1:
-  device_id:                        1
-80001234567890
+0123456789
-  dot1d_base_num_ports:             24
-  dot1d_base_type:                  transparent-only
-  dot1d_stp_protocol_specification: ieee8021d
-  dot1d_stp_priority:               32768
-20001234567890AB
+8000111111111111
-  dot1d_stp_root_cost:              30
-  dot1d_stp_root_port:              1

nethorus/test/unit/bridge_test.rb

@@ -220 +220 @@
-    # Test the dot1d_stp_bridge_max_age
-
+    @bridge.dot1d_stp_bridge_max_age = 4001
+    assert(!@bridge.valid?, "A bridge should not be valid with a dot1d_stp_bridge_max_age of 4001")
+
+    @bridge.dot1d_stp_bridge_max_age = 4000
+    assert(@bridge.valid?, "A bridge should be valid with a dot1d_stp_bridge_max_age of 4000")
+
+    @bridge.dot1d_stp_bridge_max_age = 599
+    assert(!@bridge.valid?, "A bridge should not be valid with a dot1d_stp_bridge_max_age of 599")
+
-    @bridge.dot1d_stp_bridge_max_age = 600
-    assert(@bridge.valid?, "A bridge should be valid with a dot1d_stp_bridge_max_age of 600")
-
-    @bridge.dot1d_stp_bridge_max_age = 599
-    assert(!@bridge.valid?, "A bridge should not be valid with a dot1d_stp_bridge_max_age of 599")
-
-    @bridge.dot1d_stp_bridge_max_age = 4000
-    assert(@bridge.valid?, "A bridge should be valid with a dot1d_stp_bridge_max_age of 4000")
-
-    @bridge.dot1d_stp_bridge_max_age = 4001
-    assert(!@bridge.valid?, "A bridge should not be valid with a dot1d_stp_bridge_max_age of 4001")
-
-    @bridge.dot1d_stp_bridge_max_age = 600
-
-
@@ -282 +281 @@
-    
-    bridge.dot1d_stp_max_age = 1
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -294 +311 @@
-
-    bridge.dot1d_stp_hello_time = 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-