diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-10-13 11:34:17 +0800 |
|---|---|---|
| committer | ying.yunlong <ying.yunlong@zte.com.cn> | 2017-10-13 11:34:17 +0800 |
| commit | 8b609e18cb331a88aa09e9237d92aed32913e397 (patch) | |
| tree | f16674f44a482781ac4f8267063969b48e7e5e24 | |
| parent | 88989b244c627e8c75cf3e9b3a1f2b812a637966 (diff) | |
Fix vfc-catalog docker job fail issue
Change-Id: I129508daff2a31838044e092644f6ebd3e2f2cf9
Issue-ID: VFC-531
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
| -rw-r--r-- | lcm/pub/utils/toscaparser/basemodel.py | 21 | ||||
| -rw-r--r-- | requirements.txt | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/lcm/pub/utils/toscaparser/basemodel.py b/lcm/pub/utils/toscaparser/basemodel.py index b80b275f..e6359667 100644 --- a/lcm/pub/utils/toscaparser/basemodel.py +++ b/lcm/pub/utils/toscaparser/basemodel.py @@ -21,7 +21,6 @@ import re import shutil import urllib -import paramiko from toscaparser.functions import GetInput from toscaparser.tosca_template import ToscaTemplate @@ -121,16 +120,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 diff --git a/requirements.txt b/requirements.txt index 06c9843d..cc496342 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,5 +26,5 @@ mock==2.0.0 unittest_xml_reporting==1.12.0 # for parser -paramiko==2.0.2 +# paramiko==2.0.2 nfv-toscaparser>=0.5.0 |