Feature/port class for different nos (floodlight#13)

* Rename original Port class to DevicePort class

* Add new Port class to access port definition by nos

* Rename test_config to cfg

* Use Port class as port member

* Decoupling test port and physical port

mars/config.py

@@ -123,4 +123,8 @@
 
 devices = [spine0, spine1, leaf0, leaf1]
 spines = [spine0, spine1]
-leaves = [leaf0, leaf1]
+leaves = [leaf0, leaf1]
+
+# test ports mapping front ports
+leaf0['front_port'] = [46, 48]
+leaf1['front_port'] = [46, 48]

mars/dhcprelay_test.py

@@ -50,10 +50,33 @@ def setUp(self):
         base_tests.SimpleDataPlane.setUp(self)
 
         setup_configuration()
+        self.port_configuration()
 
     def tearDown(self):
         base_tests.SimpleDataPlane.tearDown(self)
 
+    def port_configuration(self):
+        cfg.leaf0['port46']  = (
+            Port(cfg.leaf0['front_port'][0])
+            .tagged(False)
+            .nos(cfg.leaf0['nos'])
+        )
+        cfg.leaf0['port48'] = (
+            Port(cfg.leaf0['front_port'][1])
+            .tagged(False)
+            .nos(cfg.leaf0['nos'])
+        )
+        cfg.leaf1['port46'] = (
+            Port(cfg.leaf1['front_port'][0])
+            .tagged(False)
+            .nos(cfg.leaf1['nos'])
+        )
+        cfg.leaf1['port48'] = (
+            Port(cfg.leaf1['front_port'][1])
+            .tagged(False)
+            .nos(cfg.leaf1['nos'])
+        )
+
     def generate_discover_pkt(self, client):
         dhcp_discover = (
             Ether(src=client['mac'], dst='ff:ff:ff:ff:ff:ff')/
@@ -191,9 +214,9 @@ def runTest(self):
             t1 = (
                 Tenant('t1')
                 .segment('s1', 'vlan', [s1_vlan_ip], s1_vlan_id)
-                .segment_member('s1', ['46/untag'], cfg.leaf0['id'])
+                .segment_member('s1', [cfg.leaf0['port46'].name], cfg.leaf0['id'])
                 .segment('s2', 'vlan', [s2_vlan_ip], s2_vlan_id)
-                .segment_member('s2', ['46/untag', '48/untag'], cfg.leaf1['id'])
+                .segment_member('s2', [cfg.leaf1['port46'].name, cfg.leaf1['port48'].name], cfg.leaf1['id'])
                 .build()
             )
 
@@ -294,9 +317,9 @@ def runTest(self):
         t1 = (
             Tenant('t1')
             .segment('s1', 'vlan', [s1_vlan_ip], s1_vlan_id)
-            .segment_member('s1', ['46/untag'], cfg.leaf0['id'])
+            .segment_member('s1', [cfg.leaf0['port46'].name], cfg.leaf0['id'])
             .segment('s2', 'vlan', [s2_vlan_ip], s2_vlan_id)
-            .segment_member('s2', ['46/untag', '48/untag'], cfg.leaf1['id'])
+            .segment_member('s2', [cfg.leaf1['port46'].name, cfg.leaf1['port48'].name], cfg.leaf1['id'])
             .build()
         )
 
@@ -397,18 +420,18 @@ def runTest(self):
         t1 = (
             Tenant('t1')
             .segment('s1', 'vlan', [s1_vlan_ip], s1_vlan_id)
-            .segment_member('s1', ['46/untag'], cfg.leaf0['id'])
+            .segment_member('s1', [cfg.leaf0['port46'].name], cfg.leaf0['id'])
             .segment('s2', 'vlan', [s2_vlan_ip], s2_vlan_id)
-            .segment_member('s2', ['48/untag'], cfg.leaf0['id'])
+            .segment_member('s2', [cfg.leaf0['port48'].name], cfg.leaf0['id'])
             .build()
         )
 
         t2 = (
             Tenant('t2')
             .segment('s3', 'vlan', [s3_vlan_ip], s3_vlan_id)
-            .segment_member('s3', ['46/untag'], cfg.leaf1['id'])
+            .segment_member('s3', [cfg.leaf1['port46'].name], cfg.leaf1['id'])
             .segment('s4', 'vlan', [s4_vlan_ip], s4_vlan_id)
-            .segment_member('s4', ['48/untag'], cfg.leaf1['id'])
+            .segment_member('s4', [cfg.leaf1['port48'].name], cfg.leaf1['id'])
             .build()
         )
 

mars/span_test.py

@@ -46,10 +46,33 @@ def setUp(self):
         base_tests.SimpleDataPlane.setUp(self)
 
         setup_configuration()
+        self.port_configuration()
 
     def tearDown(self):
         base_tests.SimpleDataPlane.tearDown(self)
 
+    def port_configuration(self):
+        cfg.leaf0['port46']  = (
+            Port(cfg.leaf0['front_port'][0])
+            .tagged(False)
+            .nos(cfg.leaf0['nos'])
+        )
+        cfg.leaf0['port48'] = (
+            Port(cfg.leaf0['front_port'][1])
+            .tagged(False)
+            .nos(cfg.leaf0['nos'])
+        )
+        cfg.leaf1['port46'] = (
+            Port(cfg.leaf1['front_port'][0])
+            .tagged(False)
+            .nos(cfg.leaf1['nos'])
+        )
+        cfg.leaf1['port48'] = (
+            Port(cfg.leaf1['front_port'][1])
+            .tagged(False)
+            .nos(cfg.leaf1['nos'])
+        )
+
 class SetAndGetTest(SPANTest):
     """
     Test set and get SPAN rest API
@@ -165,8 +188,8 @@ def runTest(self):
         t1 = (
             Tenant('t1')
             .segment('s1', 'vlan', [], s1_vlan_id)
-            .segment_member('s1', ['48/untag'], cfg.leaf0['id'])
-            .segment_member('s1', ['48/untag'], cfg.leaf1['id'])
+            .segment_member('s1', [cfg.leaf0['port48'].name], cfg.leaf0['id'])
+            .segment_member('s1', [cfg.leaf1['port48'].name], cfg.leaf1['id'])
             .build()
         )
 
@@ -282,7 +305,7 @@ def runTest(self):
         t1 = (
             Tenant('t1')
             .segment('s1', 'vlan', [], s1_vlan_id)
-            .segment_member('s1', ['46/untag', '48/untag'], cfg.leaf1['id'])
+            .segment_member('s1', [cfg.leaf1['port46'].name, cfg.leaf1['port48'].name], cfg.leaf1['id'])
             .build()
         )