Fix vfc-catalog docker job fail issue 73/18673/1
authorying.yunlong <ying.yunlong@zte.com.cn>
Fri, 13 Oct 2017 03:34:17 +0000 (11:34 +0800)
committerying.yunlong <ying.yunlong@zte.com.cn>
Fri, 13 Oct 2017 03:34:17 +0000 (11:34 +0800)
Change-Id: I129508daff2a31838044e092644f6ebd3e2f2cf9
Issue-ID: VFC-531
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
lcm/pub/utils/toscaparser/basemodel.py
requirements.txt

index b80b275..e635966 100644 (file)
@@ -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
index 06c9843..cc49634 100644 (file)
@@ -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