From: imarom <imarom@cisco.com>
Date: Thu, 11 Feb 2016 08:16:24 +0000 (-0500)
Subject: simulator bug and some YAMLs legacy field
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=177b486366a44e38538e33b5cd2ac1e9a141aee0;p=trex.git

simulator bug and some YAMLs legacy field
---

diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py
index 71af88d0..357f54bd 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py
@@ -143,9 +143,9 @@ class STLSim(object):
             try:
                 profile = STLProfile.load(input_file)
             except STLError as e:
-                print format_text("\nError while loading profile '{0}'\n".format(input_file), 'bold')
-                print e.brief() + "\n"
-                return
+                s = format_text("\nError while loading profile '{0}'\n".format(input_file), 'bold')
+                s += "\n" + e.brief()
+                raise STLError(s)
 
             stream_list += profile.get_streams()
 
diff --git a/scripts/stl/yaml/imix_1pkt_vm.yaml b/scripts/stl/yaml/imix_1pkt_vm.yaml
index 99f10aca..22604544 100644
--- a/scripts/stl/yaml/imix_1pkt_vm.yaml
+++ b/scripts/stl/yaml/imix_1pkt_vm.yaml
@@ -4,7 +4,7 @@
   stream:
     self_start: True
     packet:
-      pcap: stl/udp_64B_no_crc.pcap  # pcap should not include CRC
+      pcap: udp_64B_no_crc.pcap  # pcap should not include CRC
     mode:
       type: continuous
       pps: 100
diff --git a/scripts/stl/yaml/imix_2pkt.yaml b/scripts/stl/yaml/imix_2pkt.yaml
index 45f2303d..406c28b4 100644
--- a/scripts/stl/yaml/imix_2pkt.yaml
+++ b/scripts/stl/yaml/imix_2pkt.yaml
@@ -4,19 +4,15 @@
   stream:
     self_start: True
     packet:
-      binary: stl/udp_64B_no_crc.pcap  # pcap should not include CRC
+      pcap: udp_64B_no_crc.pcap  # pcap should not include CRC
     mode:
       type: continuous
       pps: 100
-    rx_stats: []
-    vm: []
 - name: udp_594B
   stream:
     self_start: True
     packet:
-      binary: stl/udp_594B_no_crc.pcap  # pcap should not include CRC
+      pcap: udp_594B_no_crc.pcap  # pcap should not include CRC
     mode:
       type: continuous
       pps: 100
-    rx_stats: []
-    vm: []
\ No newline at end of file