From 51e14898d77466bbc5b03d960b5b9962d594bbc6 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Fri, 13 Oct 2017 14:30:35 +0800 Subject: Fallback vfc-lcm sftp download file Change-Id: I980c0ae29c202ecd7e992d7bdbbad77445edc3f2 Issue-ID: VFC-533 Signed-off-by: ying.yunlong --- lcm/pub/utils/toscaparser/basemodel.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lcm/pub/utils/toscaparser/basemodel.py b/lcm/pub/utils/toscaparser/basemodel.py index e6359667..b80b275f 100644 --- a/lcm/pub/utils/toscaparser/basemodel.py +++ b/lcm/pub/utils/toscaparser/basemodel.py @@ -21,6 +21,7 @@ import re import shutil import urllib +import paramiko from toscaparser.functions import GetInput from toscaparser.tosca_template import ToscaTemplate @@ -120,16 +121,16 @@ class BaseInfoModel(object): return localFileName def sftp_get(self, userName, userPwd, hostIp, hostPort, remoteFileName, localFileName): - return - # t = None - # try: - # t = paramiko.Transport(hostIp, int(hostPort)) - # t.connect(username=userName, password=userPwd) - # sftp = paramiko.SFTPClient.from_transport(t) - # sftp.get(remoteFileName, localFileName) - # finally: - # if t is not None: - # t.close() + # return + t = None + try: + t = paramiko.Transport(hostIp, int(hostPort)) + t.connect(username=userName, password=userPwd) + sftp = paramiko.SFTPClient.from_transport(t) + sftp.get(remoteFileName, localFileName) + finally: + if t is not None: + t.close() def ftp_get(self, userName, userPwd, hostIp, hostPort, remoteFileName, localFileName): f = None -- cgit 1.2.3-korg