Retrieve worfklows by model

Change logic to retrieve workflows from SO by modelVersionId instead of vnfName

Change-Id: Id8ee8b85670dd4b56ce6a43c120e5ef053e5f617
Issue-ID: VID-444
Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/WorkflowsController.java b/vid-app-common/src/main/java/org/onap/vid/controller/WorkflowsController.java
index a94481b..f413d56 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controller/WorkflowsController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/WorkflowsController.java
@@ -48,8 +48,8 @@ public class WorkflowsController extends VidRestrictedBaseController {
     }
 
     @RequestMapping(value = "workflows", method = RequestMethod.GET)
-    public List<SOWorkflow> getWorkflows(@RequestParam(value = "vnfName") String vnfName){
-        return externalWorkflowsService.getWorkflows(vnfName);
+    public List<SOWorkflow> getWorkflows(@RequestParam(value = "vnfModelId") String vnfModelId){
+        return externalWorkflowsService.getWorkflows(vnfModelId);
     }
 
     @RequestMapping(value = "remote-workflow-parameters/{id}", method = RequestMethod.GET)

diff --git a/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsService.java b/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsService.java
index da909a5..2eae52f 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsService.java
@@ -25,7 +25,7 @@ import org.onap.vid.model.SOWorkflow;
 import org.onap.vid.model.SOWorkflowParameterDefinitions;
 
 public interface ExternalWorkflowsService {
-    List<SOWorkflow> getWorkflows(String vnfName);
+    List<SOWorkflow> getWorkflows(String vnfModelId);
 
     SOWorkflowParameterDefinitions getWorkflowParameterDefinitions(Long workflowId);
 }

diff --git a/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsServiceImpl.java
index 1da03f0..e03b546 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/ExternalWorkflowsServiceImpl.java
@@ -40,8 +40,8 @@ public class ExternalWorkflowsServiceImpl implements ExternalWorkflowsService {
     }
 
     @Override
-    public List<SOWorkflow> getWorkflows(String vnfName) {
-        MsoResponseWrapper2<SOWorkflows> msoResponse = mockedWorkflowsRestClient.getWorkflows(vnfName);
+    public List<SOWorkflow> getWorkflows(String vnfModelId) {
+        MsoResponseWrapper2<SOWorkflows> msoResponse = mockedWorkflowsRestClient.getWorkflows(vnfModelId);
         validateSOResponse(msoResponse, SOWorkflows.class);
         return convertMsoResponseToWorkflowList(msoResponse);
     }

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
index 88caef2..a071a58 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
@@ -660,8 +660,8 @@
         };
 
         vm.loadRemoteWorkFlows = function () {
-          let vnfNames = vm.changeManagement.vnfNames.map(vnfName => vnfName.name);
-          return changeManagementService.getSOWorkflows(vnfNames)
+          let vnfModelIDs = vm.changeManagement.vnfNames.map(vnfName => vnfName.modelVersionId);
+          return changeManagementService.getSOWorkflows(vnfModelIDs)
           .then(function (response) {
             vm.remoteWorkflows = response.data || [];
           }).catch(function (error) {

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
index 2a06e75..4b45b89 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
@@ -41,8 +41,8 @@
                 });
         };
 
-        this.getSOWorkflows = function (vnfNames) {
-            return $http.get(COMPONENT.GET_SO_WORKFLOWS, {params: {vnfName: vnfNames}})
+        this.getSOWorkflows = function (vnfIDs) {
+            return $http.get(COMPONENT.GET_SO_WORKFLOWS, {params: {vnfModelId: vnfIDs}})
             .success(function (response) {
                 return {data: response};
             }).catch(function (ex) {