From 3cd24313eadd753ed170b74f17cd70f1d3e0aa96 Mon Sep 17 00:00:00 2001 From: rajdeep11 Date: Thu, 27 Jun 2024 03:11:56 +0530 Subject: [PATCH] changes based on kubeflow upgradation to list pipelines Issue-id: AIMLFW-102 Change-Id: I893940f75016608fadf09771bcd6eaa5da0b0e19 Signed-off-by: rajdeep11 --- kfadapter/kfadapter_main.py | 9 ++------- test/test_kfadapter_main.py | 15 ++++++--------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/kfadapter/kfadapter_main.py b/kfadapter/kfadapter_main.py index 48a04cb..5376b2c 100644 --- a/kfadapter/kfadapter_main.py +++ b/kfadapter/kfadapter_main.py @@ -310,14 +310,9 @@ def list_pipelines(): for pipeline in pipeline_list.pipelines: pipe_super_dict = {} pipe_param_dict = {} - pipe_super_dict['id'] = pipeline.id + pipe_super_dict['id'] = pipeline.pipeline_id pipe_super_dict['description'] = pipeline.description - if pipeline.parameters is not None: - for parameter in pipeline.parameters: - pipe_param_dict[parameter.name] = parameter.value - - pipe_super_dict['parameters'] = pipe_param_dict - pipe_dict[pipeline.name] = pipe_super_dict + pipe_dict[pipeline.display_name] = pipe_super_dict except:# pylint: disable=bare-except tbk = traceback.format_exc() LOGGER.error(tbk) diff --git a/test/test_kfadapter_main.py b/test/test_kfadapter_main.py index fe5e75e..3a1afc0 100644 --- a/test/test_kfadapter_main.py +++ b/test/test_kfadapter_main.py @@ -189,16 +189,12 @@ class testKfadapterApi(TestCase): @patch("kfadapter.kfadapter_kfconnect.KfConnect.get_kf_list_pipelines") def test_get_pipelines(self, mock_get_kf_list_pipelines): - # given - parameter = ApiParameter() - parameter.name = "param1" - parameter.value = "value1" - + + #given pipeline = ApiPipeline() - pipeline.id = "pipeline-id" + pipeline.pipeline_id = "pipeline-id" pipeline.description = "pipeline-description" - - pipeline.parameters = [parameter] + pipeline.display_name= "pipeline-name" pipeline_list = ApiListPipelinesResponse() pipeline_list.pipelines = [pipeline] @@ -212,7 +208,8 @@ class testKfadapterApi(TestCase): mock_get_kf_list_pipelines.assert_called_once() self.assertEqual(response.content_type, "application/json") self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.get_data(), b'{"null":{"description":"pipeline-description","id":"pipeline-id","parameters":{"param1":"value1"}}}\n') + print(response.get_data()) + self.assertEqual(response.get_data(), b'{"pipeline-name":{"description":"pipeline-description","id":"pipeline-id"}}\n') @patch("kfadapter.kfadapter_kfconnect.KfConnect.get_kf_pipeline_desc") -- 2.16.6