Avoid useless ssh in juju_epc

scp + ssh calls are replaced by the right scp call.

Change-Id: Iac2be63fb380486393af65dda8f7fd80bdd41d5f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f6f9f0f505844de4ea8b8e75505fa1b42fef7e19)

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 28780dd..76ce369 100644 (file)
--- 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):