6 files changed, 11 insertions, 1 deletions
diff --git a/nsb_setup.sh b/nsb_setup.sh
index cb44839af..4a8e4db93 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -42,6 +42,16 @@ proxy_env:
   https_proxy: ${https_proxy}
   no_proxy: ${no_proxy}
 EOF
+
+    mkdir -p /etc/systemd/system/docker.service.d
+    cat <<EOF > /etc/systemd/system/docker.service.d/http-proxy.conf
+---
+[Service]
+Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" "NO_PROXY=${no_proxy}"
+EOF
+
+    systemctl daemon-reload
+    systemctl restart docker
 fi
 
 apt-get update > /dev/null 2>&1
diff --git a/tests/unit/test_cmd/__init__.py b/yardstick/tests/unit/test_cmd/__init__.py
index e69de29bb..e69de29bb 100644
--- a/tests/unit/test_cmd/__init__.py
+++ b/yardstick/tests/unit/test_cmd/__init__.py
diff --git a/tests/unit/test_cmd/commands/__init__.py b/yardstick/tests/unit/test_cmd/commands/__init__.py
index e69de29bb..e69de29bb 100644
--- a/tests/unit/test_cmd/commands/__init__.py
+++ b/yardstick/tests/unit/test_cmd/commands/__init__.py
diff --git a/tests/unit/test_cmd/commands/test_env.py b/yardstick/tests/unit/test_cmd/commands/test_env.py
index 13c3ed44a..13c3ed44a 100644
--- a/tests/unit/test_cmd/commands/test_env.py
+++ b/yardstick/tests/unit/test_cmd/commands/test_env.py
diff --git a/tests/unit/test_cmd/commands/test_testcase.py b/yardstick/tests/unit/test_cmd/commands/test_testcase.py
index 7ef157c19..7ef157c19 100644
--- a/tests/unit/test_cmd/commands/test_testcase.py
+++ b/yardstick/tests/unit/test_cmd/commands/test_testcase.py
diff --git a/tests/unit/test_cmd/test_NSBperf.py b/yardstick/tests/unit/test_cmd/test_NSBperf.py
index 19eb0afa0..483e82a13 100644
--- a/tests/unit/test_cmd/test_NSBperf.py
+++ b/yardstick/tests/unit/test_cmd/test_NSBperf.py
@@ -59,7 +59,7 @@ class TestYardstickNSCli(unittest.TestCase):
     def test_handle_list_options(self):
         yardstick_ns_cli = YardstickNSCli()
         CLI_PATH = os.path.dirname(os.path.realpath(__file__))
-        repo_dir = CLI_PATH + "/../../"
+        repo_dir = CLI_PATH + "/../../../"
         test_path = os.path.join(repo_dir, "../samples/vnf_samples/nsut/")
         args = {"list_vnfs": True, "list": False}
         self.assertRaises(SystemExit, yardstick_ns_cli.handle_list_options,