diff options
author | DanielMartinBuckley <daniel.m.buckley@intel.com> | 2018-06-14 16:15:26 +0100 |
---|---|---|
committer | DanielMartinBuckley <daniel.m.buckley@intel.com> | 2018-06-26 19:40:40 +0100 |
commit | e219f22429ad2e6e6060c5c3440df72e014be273 (patch) | |
tree | 1999099a1d5dd2c9be9dc971c30600f8c127d695 | |
parent | 29c68ae66c99a674e83f37dfcf862d41ed800f36 (diff) |
NSB NFVi BNG test fails to run - stops after one step
JIRA: YARDSTICK-1244
When sending the start or stop command to PROX. We sould not send the same core.
We should not send "start 1,1" instead we should send "start 1"
Change-Id: Ie600dc3ed808fd00341e92f13bd52199e68dc51f
Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com>
-rw-r--r-- | yardstick/network_services/vnf_generic/vnf/prox_helpers.py | 20 | ||||
-rw-r--r-- | yardstick/tests/unit/common/test_utils.py | 1 |
2 files changed, 17 insertions, 4 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py index 7816c6d91..5c12e0c1f 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py @@ -398,8 +398,14 @@ class ProxSocketHelper(object): def stop(self, cores, task=''): """ stop specific cores on the remote instance """ - LOG.debug("Stopping cores %s", cores) - self.put_command("stop {} {}\n".format(join_non_strings(',', cores), task)) + + tmpcores = [] + for core in cores: + if core not in tmpcores: + tmpcores.append(core) + + LOG.debug("Stopping cores %s", tmpcores) + self.put_command("stop {} {}\n".format(join_non_strings(',', tmpcores), task)) time.sleep(3) def start_all(self): @@ -409,8 +415,14 @@ class ProxSocketHelper(object): def start(self, cores): """ start specific cores on the remote instance """ - LOG.debug("Starting cores %s", cores) - self.put_command("start {}\n".format(join_non_strings(',', cores))) + + tmpcores = [] + for core in cores: + if core not in tmpcores: + tmpcores.append(core) + + LOG.debug("Starting cores %s", tmpcores) + self.put_command("start {}\n".format(join_non_strings(',', tmpcores))) time.sleep(3) def reset_stats(self): diff --git a/yardstick/tests/unit/common/test_utils.py b/yardstick/tests/unit/common/test_utils.py index 6e7a0bfc4..6247afd18 100644 --- a/yardstick/tests/unit/common/test_utils.py +++ b/yardstick/tests/unit/common/test_utils.py @@ -19,6 +19,7 @@ from six.moves import configparser import time import unittest +import yardstick from yardstick import ssh from yardstick.common import constants from yardstick.common import utils |