summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
diff options
context:
space:
mode:
authorMarcus G K Williams <marcus.williams@intel.com>2018-05-23 14:24:04 -0700
committerMarcus G K Williams <marcus.williams@intel.com>2018-05-23 15:37:35 -0700
commitae6d0eb4d796211a78a6d6a3505127c4928ac02d (patch)
tree8759a690ea7a4aeb6f4037899fe1d8bc874cd65b /bpmn/MSOCommonBPMN
parent31ebc611022f89151d8b82d78d09d2f597071bd8 (diff)
Removing license from OOF Homing Demand
OOF does not support License deman in Beijing Issue-ID: SO-573 Change-Id: Ia7e013949773595b520ed4cbd0bbe8cb0f18922c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy10
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java6
2 files changed, 4 insertions, 12 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" +
"}"
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
index d7239fe0c1..9020701ed3 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
@@ -731,11 +731,7 @@ public class OofHomingTest extends WorkflowTest {
"\"serviceName\":\"null\",\"modelInfo\":{\"modelType\":\"\",\"modelInvariantId\":" +
"\"testModelInvariantId\",\"modelVersionId\":\"testModelUuid\",\"modelName\":\"testModelName\"," +
"\"modelVersion\":\"testModelVersion\",\"modelCustomizationName\":\"" +
- "\"}},\"licenseInfo\":{\"licenseDemands\":[{\"resourceModuleName\":\"VNF\",\"serviceResourceId\":" +
- "\"testResourceIdVNF\",\"resourceInstanceType\":\"VNF\",\"resourceModelInfo\":{\"modelInvariantId\":" +
- "\"testModelInvariantIdVNF\",\"modelVersionId\":\"testVnfModelUuid\",\"modelName\":" +
- "\"testModelNameVNF\",\"modelType\":\"testModelTypeVNF\",\"modelVersion\":\"testModelVersionVNF\"," +
- "\"modelCustomizationName\":\"\"}}]}}";
+ "\"}}}";
return request;
}