vpp_device: Multiple NICs (suitegen)

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I81958fbf6ef240d53a0fb8708ca882baf02f606c

2 files changed, 5 insertions, 4 deletions

diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
index 95708e888d..ae4c26a1ba 100755
--- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh
+++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
@@ -35,15 +35,16 @@ common_dirs || die
 check_prerequisites || die
 get_test_code "${1-}" || die
 get_test_tag_string || die
-select_topology || die
 select_arch_os || die
 gather_build || die
 check_download_dir || die
 activate_virtualenv || die
 generate_tests || die
 archive_tests || die
+prepare_topology || die
+select_topology || die
 activate_docker_topology || die
-select_vpp_device_tags || die
+select_tags || die
 compose_pybot_arguments || die
 set_environment_variables || die
 run_pybot || die
diff --git a/resources/libraries/bash/entry/check/tc_naming.sh b/resources/libraries/bash/entry/check/tc_naming.sh
index bc2ac32671..f392ad7b9a 100644
--- a/resources/libraries/bash/entry/check/tc_naming.sh
+++ b/resources/libraries/bash/entry/check/tc_naming.sh
@@ -64,7 +64,7 @@ r_testc_rules=(
     #'(ipsec[[:digit:]]+tnlhw|ipsec[[:digit:]]+tnlsw|'
     #'srhip6|tcp|udp|lispip6|lispip4|vxlan){0,1}'
     #'(http){0,1}-'
-    '(.*)-(dev|ndrpdr|bps|cps|rps|reconf)$'
+    '(.*)-(scapy|ndrpdr|bps|cps|rps|reconf)$'
     )
 s_suite_rules=(
     'number of SUT nodes'
@@ -83,7 +83,7 @@ r_suite_rules=(
     #'(ipsec[[:digit:]]+tnlhw|ipsec[[:digit:]]+tnlsw|'
     #'srhip6|tcp|udp|lispip6|lispip4|vxlan){0,1}'
     #'(http){0,1}-'
-    '(.*)-(dev|ndrpdr|bps|cps|rps|reconf)$'
+    '(.*)-(scapy|ndrpdr|bps|cps|rps|reconf)$'
     )
 
 rm -f "tc_naming.log" || die