From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Fri, 13 Oct 2017 03:34:17 +0000 (+0800)
Subject: Fix vfc-catalog docker job fail issue
X-Git-Tag: v1.0.1~49
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8b609e18cb331a88aa09e9237d92aed32913e397;p=vfc%2Fnfvo%2Flcm.git

Fix vfc-catalog docker job fail issue

Change-Id: I129508daff2a31838044e092644f6ebd3e2f2cf9
Issue-ID: VFC-531
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

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