32 files changed, 11 insertions, 13 deletions
diff --git a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
index f23a4469..0a25c0ac 100644
--- a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
+++ b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
@@ -26,7 +26,7 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
 
         self.verify_exists(self.stl_sim)
 
-        self.profiles_path = os.path.join(self.scripts_path, "yaml/")
+        self.profiles_path = os.path.join(self.scripts_path, "stl/yaml/")
 
         self.profiles = {}
         self.profiles['imix_3pkt'] = os.path.join(self.profiles_path, "imix_3pkt.yaml")
diff --git a/scripts/stl/profiles/imix.py b/scripts/stl/imix.py
index 3abce1d4..3abce1d4 100644
--- a/scripts/stl/profiles/imix.py
+++ b/scripts/stl/imix.py
diff --git a/scripts/stl/profiles/__init__.py b/scripts/stl/profiles/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/scripts/stl/profiles/__init__.py
+++ /dev/null
diff --git a/scripts/stl/profiles/syn_attack.py b/scripts/stl/syn_attack.py
index e3ed3d0e..3e3f70d3 100644
--- a/scripts/stl/profiles/syn_attack.py
+++ b/scripts/stl/syn_attack.py
@@ -1,4 +1,4 @@
-from trex_control_plane.stl.api import *
+from trex_stl_lib.api import *
 
 class STLS1(object):
     """ attack 48.0.0.1 at port 80
diff --git a/scripts/stl/profiles/udp_1pkt.py b/scripts/stl/udp_1pkt.py
index 6b49e592..6b86a037 100644
--- a/scripts/stl/profiles/udp_1pkt.py
+++ b/scripts/stl/udp_1pkt.py
@@ -1,5 +1,4 @@
-
-from trex_control_plane.stl.api import *
+from trex_stl_lib.api import *
 
 class STLS1(object):
 
diff --git a/scripts/stl/profiles/udp_1pkt_tuple_gen.py b/scripts/stl/udp_1pkt_tuple_gen.py
index 3fb15597..33915cc0 100644
--- a/scripts/stl/profiles/udp_1pkt_tuple_gen.py
+++ b/scripts/stl/udp_1pkt_tuple_gen.py
@@ -1,5 +1,4 @@
-
-from trex_control_plane.stl.api import *
+from trex_stl_lib.api import *
 
 class STLS1(object):
 
diff --git a/scripts/stl/profiles/udp_rand_len_9k.py b/scripts/stl/udp_rand_len_9k.py
index b975c954..ea348fe5 100644
--- a/scripts/stl/profiles/udp_rand_len_9k.py
+++ b/scripts/stl/udp_rand_len_9k.py
@@ -1,5 +1,5 @@
 
-from trex_control_plane.stl.api import *
+from trex_stl_lib.api import *
 
 class STLS1(object):
 
diff --git a/scripts/yaml/burst_1000_pkt.yaml b/scripts/stl/yaml/burst_1000_pkt.yaml
index 99a121e2..99a121e2 100644
--- a/scripts/yaml/burst_1000_pkt.yaml
+++ b/scripts/stl/yaml/burst_1000_pkt.yaml
diff --git a/scripts/yaml/burst_1pkt.yaml b/scripts/stl/yaml/burst_1pkt.yaml
index 48a62e68..48a62e68 100644
--- a/scripts/yaml/burst_1pkt.yaml
+++ b/scripts/stl/yaml/burst_1pkt.yaml
diff --git a/scripts/yaml/burst_1pkt_1burst.yaml b/scripts/stl/yaml/burst_1pkt_1burst.yaml
index 76c411a8..76c411a8 100644
--- a/scripts/yaml/burst_1pkt_1burst.yaml
+++ b/scripts/stl/yaml/burst_1pkt_1burst.yaml
diff --git a/scripts/yaml/burst_1pkt_vm.yaml b/scripts/stl/yaml/burst_1pkt_vm.yaml
index 246b8813..246b8813 100644
--- a/scripts/yaml/burst_1pkt_vm.yaml
+++ b/scripts/stl/yaml/burst_1pkt_vm.yaml
diff --git a/scripts/yaml/imix_1pkt.yaml b/scripts/stl/yaml/imix_1pkt.yaml
index 46552c82..46552c82 100644
--- a/scripts/yaml/imix_1pkt.yaml
+++ b/scripts/stl/yaml/imix_1pkt.yaml
diff --git a/scripts/yaml/imix_1pkt_2.yaml b/scripts/stl/yaml/imix_1pkt_2.yaml
index bffc72eb..bffc72eb 100644
--- a/scripts/yaml/imix_1pkt_2.yaml
+++ b/scripts/stl/yaml/imix_1pkt_2.yaml
diff --git a/scripts/yaml/imix_1pkt_tuple_gen.yaml b/scripts/stl/yaml/imix_1pkt_tuple_gen.yaml
index 5ca232c4..5ca232c4 100644
--- a/scripts/yaml/imix_1pkt_tuple_gen.yaml
+++ b/scripts/stl/yaml/imix_1pkt_tuple_gen.yaml
diff --git a/scripts/yaml/imix_1pkt_vm.yaml b/scripts/stl/yaml/imix_1pkt_vm.yaml
index 21075fa2..21075fa2 100644
--- a/scripts/yaml/imix_1pkt_vm.yaml
+++ b/scripts/stl/yaml/imix_1pkt_vm.yaml
diff --git a/scripts/yaml/imix_1pkt_vm2.yaml b/scripts/stl/yaml/imix_1pkt_vm2.yaml
index e0a6b771..e0a6b771 100644
--- a/scripts/yaml/imix_1pkt_vm2.yaml
+++ b/scripts/stl/yaml/imix_1pkt_vm2.yaml
diff --git a/scripts/yaml/imix_2pkt.yaml b/scripts/stl/yaml/imix_2pkt.yaml
index 45f2303d..45f2303d 100644
--- a/scripts/yaml/imix_2pkt.yaml
+++ b/scripts/stl/yaml/imix_2pkt.yaml
diff --git a/scripts/yaml/imix_3pkt.yaml b/scripts/stl/yaml/imix_3pkt.yaml
index d8c3ea44..d8c3ea44 100644
--- a/scripts/yaml/imix_3pkt.yaml
+++ b/scripts/stl/yaml/imix_3pkt.yaml
diff --git a/scripts/yaml/imix_3pkt_vm.yaml b/scripts/stl/yaml/imix_3pkt_vm.yaml
index 6ba2c40c..6ba2c40c 100644
--- a/scripts/yaml/imix_3pkt_vm.yaml
+++ b/scripts/stl/yaml/imix_3pkt_vm.yaml
diff --git a/scripts/yaml/imix_scale_1000.yaml b/scripts/stl/yaml/imix_scale_1000.yaml
index bba3df5d..bba3df5d 100644
--- a/scripts/yaml/imix_scale_1000.yaml
+++ b/scripts/stl/yaml/imix_scale_1000.yaml
diff --git a/scripts/yaml/imix_scale_300.yaml b/scripts/stl/yaml/imix_scale_300.yaml
index 8b04979c..8b04979c 100644
--- a/scripts/yaml/imix_scale_300.yaml
+++ b/scripts/stl/yaml/imix_scale_300.yaml
diff --git a/scripts/yaml/ipv4_udp_9000.pcap b/scripts/stl/yaml/ipv4_udp_9000.pcap
index 86385997..86385997 100644
--- a/scripts/yaml/ipv4_udp_9000.pcap
+++ b/scripts/stl/yaml/ipv4_udp_9000.pcap
diff --git a/scripts/yaml/ipv4_udp_9k.pcap b/scripts/stl/yaml/ipv4_udp_9k.pcap
index c5466f78..c5466f78 100644
--- a/scripts/yaml/ipv4_udp_9k.pcap
+++ b/scripts/stl/yaml/ipv4_udp_9k.pcap
diff --git a/scripts/yaml/ipv4_udp_9k_burst_10.pcap b/scripts/stl/yaml/ipv4_udp_9k_burst_10.pcap
index bb71ca79..bb71ca79 100644
--- a/scripts/yaml/ipv4_udp_9k_burst_10.pcap
+++ b/scripts/stl/yaml/ipv4_udp_9k_burst_10.pcap
diff --git a/scripts/yaml/syn_attack_sample.yaml b/scripts/stl/yaml/syn_attack_sample.yaml
index c5734e43..c5734e43 100644
--- a/scripts/yaml/syn_attack_sample.yaml
+++ b/scripts/stl/yaml/syn_attack_sample.yaml
diff --git a/scripts/yaml/syn_packet.pcap b/scripts/stl/yaml/syn_packet.pcap
index 93325547..93325547 100644
--- a/scripts/yaml/syn_packet.pcap
+++ b/scripts/stl/yaml/syn_packet.pcap
diff --git a/scripts/yaml/udp_1518B_no_crc.pcap b/scripts/stl/yaml/udp_1518B_no_crc.pcap
index 145a44ad..145a44ad 100644
--- a/scripts/yaml/udp_1518B_no_crc.pcap
+++ b/scripts/stl/yaml/udp_1518B_no_crc.pcap
diff --git a/scripts/yaml/udp_594B_no_crc.pcap b/scripts/stl/yaml/udp_594B_no_crc.pcap
index 5cde2f7c..5cde2f7c 100644
--- a/scripts/yaml/udp_594B_no_crc.pcap
+++ b/scripts/stl/yaml/udp_594B_no_crc.pcap
diff --git a/scripts/yaml/udp_64B_no_crc.pcap b/scripts/stl/yaml/udp_64B_no_crc.pcap
index ab3f985b..ab3f985b 100644
--- a/scripts/yaml/udp_64B_no_crc.pcap
+++ b/scripts/stl/yaml/udp_64B_no_crc.pcap
diff --git a/scripts/yaml/udp_rand_size.yaml b/scripts/stl/yaml/udp_rand_size.yaml
index ab1d21b9..ab1d21b9 100644
--- a/scripts/yaml/udp_rand_size.yaml
+++ b/scripts/stl/yaml/udp_rand_size.yaml
diff --git a/scripts/yaml/udp_rand_size_9k.yaml b/scripts/stl/yaml/udp_rand_size_9k.yaml
index 0d7d1ec7..0d7d1ec7 100644
--- a/scripts/yaml/udp_rand_size_9k.yaml
+++ b/scripts/stl/yaml/udp_rand_size_9k.yaml
diff --git a/src/gtest/trex_stateless_gtest.cpp b/src/gtest/trex_stateless_gtest.cpp
index 90f0606d..fc6c8152 100644
--- a/src/gtest/trex_stateless_gtest.cpp
+++ b/src/gtest/trex_stateless_gtest.cpp
@@ -994,7 +994,7 @@ TEST_F(basic_vm, vm_syn_attack) {
     vm.Dump(stdout);
 
     CPcapLoader pcap;
-    pcap.load_pcap_file("yaml/syn_packet.pcap",0);
+    pcap.load_pcap_file("stl/yaml/syn_packet.pcap",0);
 
     
 
@@ -1120,7 +1120,7 @@ TEST_F(basic_vm, vm_inc_size_64_128) {
     vm.add_instruction( new StreamVmInstructionWriteToPkt( "rand_pkt_size_var",32+6, -(14+20),true)
                         );
 
-    run_vm_program(vm,"yaml/udp_1518B_no_crc.pcap","stl_vm_inc_size_64_128",20);
+    run_vm_program(vm,"stl/yaml/udp_1518B_no_crc.pcap","stl_vm_inc_size_64_128",20);
 }
 
 TEST_F(basic_vm, vm_random_size_64_128) {
@@ -1150,7 +1150,7 @@ TEST_F(basic_vm, vm_random_size_64_128) {
                         );
 
 
-    run_vm_program(vm,"yaml/udp_1518B_no_crc.pcap","stl_vm_rand_size_64_128",20);
+    run_vm_program(vm,"stl/yaml/udp_1518B_no_crc.pcap","stl_vm_rand_size_64_128",20);
 
 }
 
@@ -1186,7 +1186,7 @@ TEST_F(basic_vm, vm_random_size_64_127_128) {
     bool fail=false;
 
     try {
-       run_vm_program(vm,"yaml/udp_64B_no_crc.pcap","stl_vm_rand_size_64B_127_128",20);
+       run_vm_program(vm,"stl/yaml/udp_64B_no_crc.pcap","stl_vm_rand_size_64B_127_128",20);
      } catch (const TrexException &ex) {
         fail=true;
     }
@@ -1222,7 +1222,7 @@ TEST_F(basic_vm, vm_random_size_500b_0_9k) {
     vm.add_instruction( new StreamVmInstructionWriteToPkt( "rand_pkt_size_var",32+6, -(14+20),true)
                         );
 
-    run_vm_program(vm,"yaml/udp_594B_no_crc.pcap","stl_vm_rand_size_512B_64_128",10);
+    run_vm_program(vm,"stl/yaml/udp_594B_no_crc.pcap","stl_vm_rand_size_512B_64_128",10);
 
 }
 
@@ -2404,7 +2404,7 @@ TEST_F(basic_stl, vm_enable1) {
 
     CEnableVm vm_test;
     vm_test.m_out_file = "exp/stl_vm_enable1";
-    vm_test.m_input_packet = "yaml/udp_594B_no_crc.pcap";
+    vm_test.m_input_packet = "stl/yaml/udp_594B_no_crc.pcap";
     vm_test.run(false);
 }