Fix/span test for sonic (floodlight#15)

* Replace fixed port number with variable
macauleycheng · Feb 14, 2020 · aac7893 · aac7893
1 parent 83d59c2
commit aac7893
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/mars/span_test.py b/mars/span_test.py
@@ -80,8 +80,8 @@ class SetAndGetTest(SPANTest):
 
     def runTest(self):
         session_id = 1
-        source_port = 46
-        target_port = 48
+        source_port = cfg.leaf0['port46'].number
+        target_port = cfg.leaf0['port48'].number
         direction = 'both'
 
         span = (
@@ -137,8 +137,8 @@ def runTest(self):
         ports = sorted(config["port_map"].keys())
 
         session_id = 1
-        source_port = 46
-        target_port = 48
+        source_port = cfg.leaf0['port46'].number
+        target_port = cfg.leaf0['port48'].number
 
         for direction in ['rx', 'both']:
             span = (
@@ -194,8 +194,8 @@ def runTest(self):
         )
 
         session_id = 1
-        source_port = 48
-        target_port = 46
+        source_port = cfg.leaf0['port48'].number
+        target_port = cfg.leaf0['port46'].number
 
         for direction in ['tx', 'both']:
             span = (
@@ -252,8 +252,8 @@ def runTest(self):
         ports = sorted(config["port_map"].keys())
 
         session_id = 1
-        source_port = 46
-        target_port = 46
+        source_port = cfg.leaf0['port46'].number
+        target_port = cfg.leaf1['port46'].number
         direction = 'rx'
 
         for direction in ['rx', 'both']:
@@ -310,8 +310,8 @@ def runTest(self):
         )
 
         session_id = 1
-        source_port = 48
-        target_port = 46
+        source_port = cfg.leaf1['port48'].number
+        target_port = cfg.leaf0['port46'].number
 
         for direction in ['tx', 'both']:
             span = (

diff --git a/mars/utils.py b/mars/utils.py
@@ -653,6 +653,14 @@ def name(self):
             return "{}/{}".format(port_str, tagged_str)
         else:
             return "{}/{}".format(self._port_id, tagged_str)
+    @property
+    def number(self):
+        if self._nos == 'aos':
+            return self._port_id
+        elif self._nos == 'sonic':
+            return self._port_id - 1
+        else:
+            return self._port_id
 
 class PolicyRoute():