diff options
Diffstat (limited to 'bpmn/MSOCommonBPMN/src')
2 files changed, 11 insertions, 1 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy index 48a8e60095..ff628346b5 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy @@ -89,7 +89,7 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor { } infraRequest.setLastModifiedBy("BPMN") infraRequest.setStatusMessage(statusMessage) - infraRequest.setRequestStatus("COMPLETED") + infraRequest.setRequestStatus("COMPLETE") infraRequest.setProgress(100) if(utils.nodeExists(xml, "vnfId")){ diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java index bc330eeafd..b554d7a9ba 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java @@ -35,6 +35,8 @@ public class ModelInfoServiceInstance extends ModelInfoMetadata implements Seria private String serviceType; @JsonProperty("service-role") private String serviceRole; + @JsonProperty("service-function") + private String serviceFunction; @JsonProperty("environment-context") private String environmentContext; @JsonProperty("workload-context") @@ -77,6 +79,14 @@ public class ModelInfoServiceInstance extends ModelInfoMetadata implements Seria this.serviceRole = serviceRole; } + public String getServiceFunction() { + return serviceFunction; + } + + public void setServiceFunction(String serviceFunction) { + this.serviceFunction = serviceFunction; + } + public String getEnvironmentContext() { return environmentContext; } |