summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-08-10 19:53:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-10 19:53:49 +0000
commit4e27e2bc0770311feac849c4e3aac9c5ffac4f3d (patch)
treef7d79c85cbbafcf67fadca69a05051fa87ce5db7
parent04ab053f3b1f8118178eeb5b89fdf255ac9f8ab1 (diff)
parent46361cb48f7bf2910e9a5145c95899b8f8f2e555 (diff)
Merge "NSB fixes: docstring, whitespace, etc."
-rw-r--r--tests/unit/common/test_utils.py2
-rw-r--r--yardstick/benchmark/scenarios/networking/vnf_generic.py2
-rw-r--r--yardstick/network_services/utils.py2
-rw-r--r--yardstick/network_services/vnf_generic/vnf/sample_vnf.py3
4 files changed, 3 insertions, 6 deletions
diff --git a/tests/unit/common/test_utils.py b/tests/unit/common/test_utils.py
index f29de5ca0..f25e6cc07 100644
--- a/tests/unit/common/test_utils.py
+++ b/tests/unit/common/test_utils.py
@@ -155,7 +155,7 @@ class TestMacAddressToHex(unittest.TestCase):
self.assertEqual(utils.mac_address_to_hex_list("ea:3e:e1:9a:99:e8"),
['0xea', '0x3e', '0xe1', '0x9a', '0x99', '0xe8'])
-
+
class TranslateToStrTestCase(unittest.TestCase):
def test_translate_to_str_unicode(self):
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py
index af17a3150..e0dd36684 100644
--- a/yardstick/benchmark/scenarios/networking/vnf_generic.py
+++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py
@@ -284,8 +284,6 @@ class NetworkServiceTestCase(base.Scenario):
""" This method should verify if the available resources defined in pod.yaml
match the topology.yaml file.
- :param context_cfg:
- :param topology:
:return: None. Side effect: context_cfg is updated
"""
for node, node_dict in self.context_cfg["nodes"].items():
diff --git a/yardstick/network_services/utils.py b/yardstick/network_services/utils.py
index 38fbda47f..0264bbc1c 100644
--- a/yardstick/network_services/utils.py
+++ b/yardstick/network_services/utils.py
@@ -55,7 +55,7 @@ def provision_tool(connection, tool_path, tool_file=None):
if tool_file:
tool_path = os.path.join(tool_path, tool_file)
bin_path = get_nsb_option("bin_path")
- exit_status, stdout = connection.execute("which %s > /dev/null 2>&1" % tool_path)[:2]
+ exit_status = connection.execute("which %s > /dev/null 2>&1" % tool_path)[0]
if exit_status == 0:
return encodeutils.safe_decode(tool_path, incoming='utf-8').rstrip()
diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
index e08f51784..90053bc36 100644
--- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
@@ -636,8 +636,7 @@ class SampleVNFDeployHelper(object):
build_script = os.path.join(self.SAMPLE_REPO_DIR, 'tools/vnf_build.sh')
time.sleep(2)
http_proxy = os.environ.get('http_proxy', '')
- https_proxy = os.environ.get('https_proxy', '')
- cmd = "sudo -E %s --silent '%s' '%s'" % (build_script, http_proxy, https_proxy)
+ cmd = "sudo -E %s -s -p='%s'" % (build_script, http_proxy)
LOG.debug(cmd)
self.ssh_helper.execute(cmd)
vnf_bin_loc = os.path.join(self.SAMPLE_REPO_DIR, "VNFs", app_name, "build", app_name)