changes based on kubeflow upgradation to upload pipeline

Issue-id: AIMLFW-102

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

diff --git a/kfadapter/kfadapter_main.py b/kfadapter/kfadapter_main.py
index 8126c59..d276121 100644 (file)
--- a/kfadapter/kfadapter_main.py
+++ b/kfadapter/kfadapter_main.py
@@ -129,17 +129,17 @@ def get_pipeline_id(pipe_name):
             uploaded_file = request.files['file']
             LOGGER.debug("Uploading received for %s", uploaded_file.filename)
             if uploaded_file.filename != '':
-                uploaded_file_path = "/tmp/" + uploaded_file.filename
+                uploaded_file_path = "/tmp/" + uploaded_file.filename + ".yaml"
                 uploaded_file.save(uploaded_file_path)
                 LOGGER.debug("File uploaded :%s", uploaded_file_path)
                 description = request.form['description']
                 pipe_info = KFCONNECT_KF_OBJ.upload_pipeline_with_versions(
-                    pipe_name,
-                    uploaded_file_path,
-                    description)
+                     pipe_name,
+                     uploaded_file_path,
+                     description)
                 LOGGER.debug("Pipeline uploaded :%s", pipe_name)
                 pipe_dict['name'] = pipe_name
-                pipe_dict['id'] = pipe_info.id
+                pipe_dict['id'] = pipe_info.pipeline_id
                 os.remove(uploaded_file_path)
             else:
                 raise Exception("Error saving file from POST")

diff --git a/test/test_kfadapter_main.py b/test/test_kfadapter_main.py
index ca3602a..7d99e54 100644 (file)
--- a/test/test_kfadapter_main.py
+++ b/test/test_kfadapter_main.py
@@ -119,11 +119,11 @@ class testKfadapterApi(TestCase):
         pipeline_id = "pipeline-id"
 
         pipeline_info = ApiPipeline()
-        pipeline_info.id = pipeline_id
+        pipeline_info.pipeline_id = pipeline_id
         mock_upload_pipeline_with_versions.return_value = pipeline_info
         
         files = {}
-        files['file'] = (io.BytesIO(b"pipeline-file"), 'pipeline.zip')
+        files['file'] = (io.BytesIO(b"pipeline-file"), 'pipeline')
         files['description'] = "pipeline-description"
 
         # when