aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/main
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-05-24 00:02:22 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-24 00:02:22 +0000
commitbea4e50d647ceaa1b4771ac062d595da7f9870e5 (patch)
tree7839df56ce049b60918a49cd6ca3a399bec7e276 /bpmn/MSOCommonBPMN/src/main
parentfbbf8e15653b42c27a16cd86ad74dbb286144aef (diff)
parentae6d0eb4d796211a78a6d6a3505127c4928ac02d (diff)
Merge "Removing license from OOF Homing Demand"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy10
1 files changed, 3 insertions, 7 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy
index 4b2b0e20ac..79134fe757 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy
@@ -143,6 +143,7 @@ class OofUtils {
placementDemands = placementDemands.substring(0, placementDemands.length() - 1)
}
+ /* Commenting Out Licensing as OOF doesn't support for Beijing
String licenseDemands = ""
sb = new StringBuilder()
if (vnfResourceList.isEmpty() || vnfResourceList == null) {
@@ -185,7 +186,7 @@ class OofUtils {
licenseDemands = sb.append(licenseDemand)
}
licenseDemands = licenseDemands.substring(0, licenseDemands.length() - 1)
- }
+ }*/
String request =
"{\n" +
@@ -225,12 +226,7 @@ class OofUtils {
" \"modelVersion\": \"${modelVersion}\",\n" +
" \"modelCustomizationName\": \"\"\n" +
" }\n" +
- " },\n" +
- " \"licenseInfo\": {\n" +
- " \"licenseDemands\": [\n" +
- " ${licenseDemands}\n" +
- " }]\n" +
- " }\n" +
+ " }\n" +
"}"