changes for kubeflow upgradation

Issue-id: AIMLFW-102

Change-Id: I806082a0f95ae0a016a2ab0a6666a8170685056e
Signed-off-by: rajdeep11 <rajdeep.sin@samsung.com>

diff --git a/kfadapter/kfadapter_kfconnect.py b/kfadapter/kfadapter_kfconnect.py
index eae4fcc..228da5f 100644 (file)
--- a/kfadapter/kfadapter_kfconnect.py
+++ b/kfadapter/kfadapter_kfconnect.py
@@ -213,14 +213,16 @@ class KfConnect:
 
         """
         pipeline_id = self.get_kf_pipeline_id(pipeline_name)
+        if pipeline_id == None:
+            return []
         res_obj = self.kfp_client.list_pipeline_versions(pipeline_id,
                                                          page_size=1000000000)
         if res_obj.total_size is None:
             return []
-        obj_list = res_obj.versions
+        obj_list = res_obj.pipeline_versions
         versions_list = []
         for obj in obj_list:
-            versions_list.append(obj.name)
+            versions_list.append(obj.display_name)
         return versions_list
 
     def get_kf_pipeline_desc(self, pipeline_id):

diff --git a/test/test_kfadapter_kfconnect.py b/test/test_kfadapter_kfconnect.py
index b1971a0..8bb836b 100644 (file)
--- a/test/test_kfadapter_kfconnect.py
+++ b/test/test_kfadapter_kfconnect.py
@@ -17,6 +17,7 @@
 # ==================================================================================
 
 import kfp_server_api
+from mock import patch
 
 from kfadapter.kfadapter_kfconnect import KfConnect
 
@@ -53,7 +54,8 @@ class Test_KfConnect:
     def test_upload_kf_pipeline(self):
         assert None == self.__KFCONNECT.upload_kf_pipeline(pipeline_name='pipeline_name', file='file', desc='desc')
     
-    def test_upload_pipeline_with_versions(self):
+    @patch("kfadapter.kfadapter_kfconnect.KfConnect.get_pl_versions_by_pl_name", return_value={"pipeline_version":""})
+    def test_upload_pipeline_with_versions(self, mock1):
         assert None == self.__KFCONNECT.upload_pipeline_with_versions(pipeline_name='pipeline_name', file='file', desc='desc')
 
     def test_negative_upload_pipeline_with_versions(self):
@@ -63,13 +65,19 @@ class Test_KfConnect:
         except kfp_server_api.exceptions.ApiException as err :
             print(err)
 
-    def test_additional_upload_pipeline_with_versions(self):
+    @patch("kfadapter.kfadapter_kfconnect.KfConnect.get_pl_versions_by_pl_name", return_value={"pipeline_version":""})
+    def test_additional_upload_pipeline_with_versions(self, mock1):
         assert None == self.__KFCONNECT.upload_pipeline_with_versions(pipeline_name='pipeline_name', file='file', desc='desc')
 
     def test_get_pl_versions_by_pl_name(self):
-        assert None != self.__KFCONNECT.get_pl_versions_by_pl_name(pipeline_name='pipeline_name')
+        self.__KFCONNECT.set_kf_client(FakeNegativeKfp())
+        try:
+            assert None != self.__KFCONNECT.get_pl_versions_by_pl_name(pipeline_name='pipeline_name')
+        except kfp_server_api.exceptions.ApiException as err :
+            print(err)
 
     def test_negative_get_pl_versions_by_pl_name(self):
+        self.__KFCONNECT.set_kf_client(FakeNegativeKfp())
         try:
             assert None != self.__KFCONNECT.get_pl_versions_by_pl_name(pipeline_name='pipeline_name')
         except kfp_server_api.exceptions.ApiException as err :