From f6f9f0f505844de4ea8b8e75505fa1b42fef7e19 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Sat, 2 May 2020 21:37:26 +0200
Subject: [PATCH] Avoid useless ssh in juju_epc
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
scp + ssh calls are replaced by the right scp call.
Change-Id: Iac2be63fb380486393af65dda8f7fd80bdd41d5f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
functest/opnfv_tests/vnf/epc/juju_epc.py | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 0a4e649c3..e08e7eb5d 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -318,19 +318,12 @@ class JujuEpc(singlevm.VmReady2):
return False
self.__logger.info("Transferring the feature files to Abot_node ...")
- cmd = ['timeout', JujuEpc.juju_timeout,
- 'juju', 'scp', '--', '-r', '-v',
- '{}/featureFiles'.format(self.case_dir), 'abot-epc-basic/0:~/']
+ cmd = ['timeout', '60', 'juju', 'scp', '--', '-r', '-v',
+ '{}/featureFiles'.format(self.case_dir),
+ 'abot-epc-basic/0:/etc/rebaca-test-suite/']
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
- self.__logger.info("Copying the feature files within Abot_node ")
- cmd = ['timeout', JujuEpc.juju_timeout,
- 'juju', 'ssh', 'abot-epc-basic/0',
- 'sudo', 'cp', '-vfR', '~/featureFiles/*',
- '/etc/rebaca-test-suite/featureFiles']
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
- self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
return True
def test_vnf(self):
--
2.16.6