diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
| commit | f2320939a5deec2db2948788479199931e1f9176 (patch) | |
| tree | fc1b12908503d5b7d67cefe34e0c5fb0f908d2a6 /scripts/automation/regression/trex.py | |
| parent | 1eed7e59f23d3ab9b957d9822eefe72877e291da (diff) | |
| parent | d04442ab671f768a1b645fb887d4a9cd575c7852 (diff) | |
Merge branch 'master' into cpu_per_core
Conflicts:
scripts/automation/trex_control_plane/server/singleton_daemon.py
Diffstat (limited to 'scripts/automation/regression/trex.py')
| -rw-r--r-- | scripts/automation/regression/trex.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/automation/regression/trex.py b/scripts/automation/regression/trex.py index a0a1d42d..44f2faba 100644 --- a/scripts/automation/regression/trex.py +++ b/scripts/automation/regression/trex.py @@ -38,6 +38,8 @@ class CTRexScenario: is_copied = False GAManager = None no_daemon = False + router_image = None + debug_image = False class CTRexRunner: """This is an instance for generating a CTRexRunner""" |