X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=083f5b060c08a10b47964365f5bd3c654de8bf21;hp=4bee6e343ef9a6e69f64cb5e91fa03695758836e;hb=5e996684dd0c95089256631c696e4fb9e72e21a2;hpb=8c2e2aaef7289df6b394faccb4b5ae050e33f43a

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 4bee6e343e..083f5b060c 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -1002,15 +1002,15 @@ def _generate_url(testbed, test_name):
         cores = u"4t4c"
     elif u"2t1c" in test_name or \
          (u"-1c-" in test_name and
-          testbed in (u"2n-skx", u"3n-skx", u"2n-clx")):
+          testbed in (u"2n-skx", u"3n-skx", u"2n-clx", u"2n-zn2")):
         cores = u"2t1c"
     elif u"4t2c" in test_name or \
          (u"-2c-" in test_name and
-          testbed in (u"2n-skx", u"3n-skx", u"2n-clx")):
+          testbed in (u"2n-skx", u"3n-skx", u"2n-clx", u"2n-zn2")):
         cores = u"4t2c"
     elif u"8t4c" in test_name or \
          (u"-4c-" in test_name and
-          testbed in (u"2n-skx", u"3n-skx", u"2n-clx")):
+          testbed in (u"2n-skx", u"3n-skx", u"2n-clx", u"2n-zn2")):
         cores = u"8t4c"
     else:
         cores = u""
@@ -1031,7 +1031,7 @@ def _generate_url(testbed, test_name):
     if u"macip-iacl1s" in test_name:
         bsf = u"features-macip-iacl1"
     elif u"macip-iacl10s" in test_name:
-        bsf = u"features-macip-iacl01"
+        bsf = u"features-macip-iacl10"
     elif u"macip-iacl50s" in test_name:
         bsf = u"features-macip-iacl50"
     elif u"iacl1s" in test_name:
@@ -1047,7 +1047,7 @@ def _generate_url(testbed, test_name):
     elif u"oacl50s" in test_name:
         bsf = u"features-oacl50"
     elif u"nat44det" in test_name:
-        bsf = u"nat44det"
+        bsf = u"nat44det-bidir"
     elif u"nat44ed" in test_name and u"udir" in test_name:
         bsf = u"nat44ed-udir"
     elif u"-cps" in test_name and u"ethip4udp" in test_name:
@@ -1064,6 +1064,8 @@ def _generate_url(testbed, test_name):
         bsf = u"features"
     elif u"policer" in test_name:
         bsf = u"features"
+    elif u"adl" in test_name:
+        bsf = u"features"
     elif u"cop" in test_name:
         bsf = u"features"
     elif u"nat" in test_name:
@@ -1079,8 +1081,22 @@ def _generate_url(testbed, test_name):
 
     if u"114b" in test_name and u"vhost" in test_name:
         domain = u"vts"
-    elif u"nat44" in test_name or u"-pps" in test_name or u"-vps" in test_name:
+    elif u"nat44" in test_name or u"-pps" in test_name or u"-cps" in test_name:
         domain = u"nat44"
+        if u"nat44det" in test_name:
+            domain += u"-det-bidir"
+        else:
+            domain += u"-ed"
+        if u"udir" in test_name:
+            domain += u"-unidir"
+        elif u"-ethip4udp-" in test_name:
+            domain += u"-udp"
+        elif u"-ethip4tcp-" in test_name:
+            domain += u"-tcp"
+        if u"-cps" in test_name:
+            domain += u"-cps"
+        elif u"-pps" in test_name:
+            domain += u"-pps"
     elif u"testpmd" in test_name or u"l3fwd" in test_name:
         domain = u"dpdk"
     elif u"memif" in test_name:
@@ -1109,6 +1125,8 @@ def _generate_url(testbed, test_name):
             bsf += u"-hw"
     elif u"ethip4vxlan" in test_name:
         domain = u"ip4_tunnels"
+    elif u"ethip4udpgeneve" in test_name:
+        domain = u"ip4_tunnels"
     elif u"ip4base" in test_name or u"ip4scale" in test_name:
         domain = u"ip4"
     elif u"ip6base" in test_name or u"ip6scale" in test_name: