diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2020-11-30 06:45:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-30 06:45:50 +0000 |
| commit | 0c17cd4391745818aac513c4cc5bd2e0252bd7b6 (patch) | |
| tree | e9e118b18a3e8217bc1ee5b7649354ccd524fe28 | |
| parent | 852ed20b013ab248ae2bc9c85ba4ad469b6c260c (diff) | |
| parent | 89653f270d5bdb4838da25e4a62976b448fdf0af (diff) | |
Merge "fixed tn allocate fail problem"
| -rw-r--r-- | bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy | 6 | ||||
| -rw-r--r-- | common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy index c47bd85679..e5c1b56d55 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy @@ -99,8 +99,12 @@ class DoAllocateNSSI extends AbstractServiceTaskProcessor { if (response != null) { JobStatusResponse jobStatusResponse = objectMapper.readValue(response, JobStatusResponse.class) - execution.setVariable("nssiAllocateStatus", jobStatusResponse) + if (StringUtils.isBlank(nssiId)) { + nssiAllocateResult.setNssiId(jobStatusResponse.getResponseDescriptor().getNssiId()) + execution.setVariable("nssiAllocateResult", nssiAllocateResult) + } + execution.setVariable("nssiAllocateStatus", jobStatusResponse) if (jobStatusResponse.getResponseDescriptor().getProgress() == 100) { execution.setVariable("jobFinished", true) } diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java b/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java index 8000ca210c..5edeb7e74f 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java @@ -40,10 +40,10 @@ public class AnSliceProfile implements Serializable { @JsonProperty(value = "sliceProfileId", required = true) private String sliceProfileId; - @JsonProperty(value = "sNSSAIList", required = true) + @JsonProperty(value = "snssaiList", required = true) private List<String> sNSSAIList; - @JsonProperty(value = "pLMNIdList", required = true) + @JsonProperty(value = "plmnIdList", required = true) private List<String> pLMNIdList; @JsonProperty(value = "perfReq", required = true) |