summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzm330 <zhangminyj@chinamobile.com>2020-10-30 08:37:10 +0800
committerZhang Min <zhangminyj@chinamobile.com>2020-11-02 02:32:53 +0000
commitd6d16964cb8e19029e36ce16ca5385d4a903252b (patch)
treec7fd7e5c7a058819ad1a2bafcc55cc7db0c653aa
parent1757b2f9727591fd5907f43834dbe9f0b8261740 (diff)
update nst selection request
Issue-ID: SO-2963 Signed-off-by: zm330 <zhangminyj@chinamobile.com> Change-Id: I440d3b1078ff16d3457f0e4c02be0fd2d7be497d
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DoHandleOofRequest.groovy2
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy6
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy3
3 files changed, 6 insertions, 5 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DoHandleOofRequest.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DoHandleOofRequest.groovy
index 1964a189f1..b457bdca46 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DoHandleOofRequest.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DoHandleOofRequest.groovy
@@ -83,7 +83,7 @@ class DoHandleOofRequest extends AbstractServiceTaskProcessor {
execution.setVariable("oofRequestPayload", requestJson)
}
- public void callOofAdapter(DelegateExecution execution) {
+ void callOofAdapter(DelegateExecution execution) {
logger.debug("Start callOofAdapter")
String requestId = execution.getVariable("msoRequestId")
String oofAdapterEndpoint = UrnPropertiesReader.getVariable("mso.adapters.oof.endpoint", execution)
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
index 30cbeaf2d8..ff31c46a3a 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
@@ -540,10 +540,8 @@ class OofUtils {
" \"timeout\": 600,\n" +
" \"callbackUrl\": \"${callbackUrl}\"\n" +
" },\n")
- response.append(" \"serviceProfile\": {\n" +
- " \"serviceProfileParameters\": ")
- response.append(json);
- response.append("\n }\n")
+ response.append(" \"serviceProfile\":")
+ response.append(json)
response.append("\n}\n")
return response.toString()
}
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
index 1d5232f3c5..cfdbe98c34 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
@@ -371,6 +371,9 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
execution.setVariable("needQuerySliceProfile", true)
}
else {
+ if(execution.getVariable("needQuerySliceProfile")){
+ execution.setVariable("needQuerySliceProfile", false)
+ }
processNewNSI(solution, sliceTaskParams)
}
}