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>
}
@RequestMapping(value = "workflows", method = RequestMethod.GET)
}
@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)
}
@RequestMapping(value = "remote-workflow-parameters/{id}", method = RequestMethod.GET)
import org.onap.vid.model.SOWorkflowParameterDefinitions;
public interface ExternalWorkflowsService {
import org.onap.vid.model.SOWorkflowParameterDefinitions;
public interface ExternalWorkflowsService {
- List<SOWorkflow> getWorkflows(String vnfName);
+ List<SOWorkflow> getWorkflows(String vnfModelId);
SOWorkflowParameterDefinitions getWorkflowParameterDefinitions(Long workflowId);
}
SOWorkflowParameterDefinitions getWorkflowParameterDefinitions(Long workflowId);
}
- 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);
}
validateSOResponse(msoResponse, SOWorkflows.class);
return convertMsoResponseToWorkflowList(msoResponse);
}
};
vm.loadRemoteWorkFlows = function () {
};
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) {
.then(function (response) {
vm.remoteWorkflows = response.data || [];
}).catch(function (error) {
- 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) {
.success(function (response) {
return {data: response};
}).catch(function (ex) {