move regression to trex-core

slight fixes of hltapi + vm in packet builder
update yaml lib version from 3.01 to 3.11

2 files changed, 6 insertions, 2 deletions

diff --git a/scripts/automation/trex_control_plane/client_utils/external_packages.py b/scripts/automation/trex_control_plane/client_utils/external_packages.py
index 3982a1b2..9d8c4dcf 100755
--- a/scripts/automation/trex_control_plane/client_utils/external_packages.py
+++ b/scripts/automation/trex_control_plane/client_utils/external_packages.py
@@ -8,7 +8,7 @@ ROOT_PATH           = os.path.abspath(os.path.join(CURRENT_PATH, os.pardir))
 PATH_TO_PYTHON_LIB  = os.path.abspath(os.path.join(ROOT_PATH, os.pardir, os.pardir, 'external_libs'))
 
 CLIENT_UTILS_MODULES = ['dpkt-1.8.6',
-                        'PyYAML-3.01/lib',
+                        'yaml-3.11',
                         'texttable-0.8.4'
                         ]
 
diff --git a/scripts/automation/trex_control_plane/client_utils/packet_builder.py b/scripts/automation/trex_control_plane/client_utils/packet_builder.py
index d8070c74..1ca01a33 100755
--- a/scripts/automation/trex_control_plane/client_utils/packet_builder.py
+++ b/scripts/automation/trex_control_plane/client_utils/packet_builder.py
@@ -692,7 +692,7 @@ class CTRexPktBuilder(object):
                 None
             """
             super(CTRexPktBuilder.CTRexVM, self).__init__()
-            self.vm_variables = {}
+            self.vm_variables = {'instructions': [], 'split_by_var': ""}
             self._inst_by_offset = {}   # this data structure holds only offset-related instructions, ordered in tuples
             self._off_inst_by_name = {}
 
@@ -807,6 +807,10 @@ class CTRexPktBuilder(object):
                 list holds variables data of VM
 
             """
+
+            return self.vm_variables
+            # !!! TODO: review code below !!!
+
             # at first, dump all CTRexVMFlowVariable instructions
             ret_val = [var.dump()
                        for key, var in self.vm_variables.items()]