summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/client_utils
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2015-12-24 16:16:49 +0200
committerHanoh Haim <hhaim@cisco.com>2015-12-24 16:16:49 +0200
commit9d1cd91825d48a97ca0ea21fa7bd34900f6c7450 (patch)
treebb3c8585e29f7c6787d0f298e2d2655b21277855 /scripts/automation/trex_control_plane/client_utils
parent32bdea5fd30ffc378a213e773634015a5d5f255f (diff)
parentba297ed1bfdfbf61bc99fe7f75deb800b570c58e (diff)
merge vm random support
Diffstat (limited to 'scripts/automation/trex_control_plane/client_utils')
-rwxr-xr-xscripts/automation/trex_control_plane/client_utils/parsing_opts.py5
-rwxr-xr-xscripts/automation/trex_control_plane/client_utils/yaml_utils.py3
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/client_utils/parsing_opts.py b/scripts/automation/trex_control_plane/client_utils/parsing_opts.py
index 6f9b4c6d..5cb06604 100755
--- a/scripts/automation/trex_control_plane/client_utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/client_utils/parsing_opts.py
@@ -70,7 +70,10 @@ def match_multiplier_common(val, strict_abs = True):
op = None
else:
match = re.match("^(\d+(\.\d+)?)(bps|kbps|mbps|gbps|pps|kpps|mpps|%?)([\+\-])?$", val)
- op = match.group(4)
+ if match:
+ op = match.group(4)
+ else:
+ op = None
result = {}
diff --git a/scripts/automation/trex_control_plane/client_utils/yaml_utils.py b/scripts/automation/trex_control_plane/client_utils/yaml_utils.py
index 60630a04..825d6fc9 100755
--- a/scripts/automation/trex_control_plane/client_utils/yaml_utils.py
+++ b/scripts/automation/trex_control_plane/client_utils/yaml_utils.py
@@ -14,7 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""
-
+import traceback
+import sys
import external_packages
import yaml