Merge "First take warning correction"
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 4b2b0e2..79134fe 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 @@
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 @@
licenseDemands = sb.append(licenseDemand)
}
licenseDemands = licenseDemands.substring(0, licenseDemands.length() - 1)
- }
+ }*/
String request =
"{\n" +
@@ -225,12 +226,7 @@
" \"modelVersion\": \"${modelVersion}\",\n" +
" \"modelCustomizationName\": \"\"\n" +
" }\n" +
- " },\n" +
- " \"licenseInfo\": {\n" +
- " \"licenseDemands\": [\n" +
- " ${licenseDemands}\n" +
- " }]\n" +
- " }\n" +
+ " }\n" +
"}"
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
index 3515aa9..4255df3 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
@@ -142,10 +142,17 @@
Properties properties = new Properties();
Map<String, String> globalProperties = PropertyConfiguration.getInstance()
.getProperties("mso.bpmn.urn.properties");
- properties.put("topic.read", globalProperties.get("appc.client.topic.read"));
- properties.put("topic.write", globalProperties.get("appc.client.topic.write"));
+ if (controllerType==null || controllerType.length()==0 || controllerType.equalsIgnoreCase("appc")) {
+ properties.put("topic.read", globalProperties.get("appc.client.topic.read"));
+ properties.put("topic.write", globalProperties.get("appc.client.topic.write"));
+ } else {
+ properties.put("topic.read", globalProperties.get("appc.client.topic." + controllerType + ".read"));
+ properties.put("topic.write", globalProperties.get("appc.client.topic." + controllerType + ".write"));
+ }
properties.put("topic.sdnc.read", globalProperties.get("appc.client.topic.sdnc.read"));
properties.put("topic.sdnc.write", globalProperties.get("appc.client.topic.sdnc.write"));
+ properties.put("sdnc-topic.read", globalProperties.get("appc.client.topic.sdnc.read"));
+ properties.put("sdnc-topic.write", globalProperties.get("appc.client.topic.sdnc.write"));
properties.put("topic.read.timeout", globalProperties.get("appc.client.topic.read.timeout"));
properties.put("client.response.timeout", globalProperties.get("appc.client.response.timeout"));
properties.put("poolMembers", globalProperties.get("appc.client.poolMembers"));
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 d7239fe..9020701 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 @@
"\"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;
}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
index 05c3fa2..694aafc 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
@@ -74,6 +74,8 @@
execution.setVariable("brgWanMacAddress", "")
execution.setVariable("customerLocation", "")
execution.setVariable("homingService", "")
+ execution.setVariable("cloudOwner", "")
+ execution.setVariable("cloudRegionId", "")
//TODO
execution.setVariable("sdncVersion", "1707")
@@ -169,6 +171,17 @@
execution.setVariable("subscriberInfo", subscriberInfo)
utils.log("DEBUG", "Incoming subscriberInfo is: " + subscriberInfo, isDebugEnabled)
+ // extract cloud configuration, split vid_ID into cloudOwner and cloudRegionId
+ String vimId = jsonUtil.getJsonValue(createVcpeServiceRequest,
+ "requestDetails.cloudConfiguration.lcpCloudRegionId")
+ def cloudRegion = vimId.split("_")
+ def cloudOwner = cloudRegion[0].toString()
+ def cloudRegionId = cloudRegion[1].toString()
+ execution.setVariable("cloudOwner", cloudOwner)
+ utils.log("DEBUG","cloudOwner: " + cloudOwner, isDebugEnabled)
+ execution.setVariable("cloudRegionId", cloudRegionId)
+ utils.log("DEBUG","cloudRegionId: " + cloudRegionId, isDebugEnabled)
+
/*
* Extracting User Parameters from incoming Request and converting into a Map
*/
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
index d101988..ea48104 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
@@ -449,6 +449,8 @@
<camunda:in source="subscriberInfo" target="subscriberInfo" />
<camunda:in source="homingService" target="homingService" />
<camunda:in source="customerLocation" target="customerLocation" />
+ <camunda:in source="cloudOwner" target="cloudOwner" />
+ <camunda:in source="cloudRegionId" target="cloudRegionId" />
</bpmn2:extensionElements>
<bpmn2:incoming>SequenceFlow_11efpvh</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1jbuf1t</bpmn2:outgoing>
diff --git a/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml
index fedfe31..a840093 100644
--- a/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml
@@ -37,7 +37,7 @@
<column name="MODEL_NAME" not-null="true" length="20"/>
</property>
<property name="action" type="string" >
- <column name="ACTION" not-null="true" length="20"/>
+ <column name="ACTION" not-null="true" length="40"/>
</property>
<property name="version" type="string">
<column name="VERSION_STR" not-null="true" length="20"/>
@@ -59,4 +59,4 @@
</property>
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
index 2332324..4a0b5fb 100644
--- a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
@@ -70,7 +70,7 @@
<column name="MODEL_ID" not-null="true"/>
</property>
<property name="action" type="string" >
- <column name="ACTION" not-null="true" length="20"/>
+ <column name="ACTION" not-null="true" length="40"/>
</property>
</properties>
<property name="schemaVersion" column="SCHEMA_VERSION" type="string" length="20"/>
@@ -84,4 +84,4 @@
<column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
</property>
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
index 4490dba..9081bb8 100644
--- a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
@@ -36,7 +36,7 @@
<column name="MODEL_NAME" not-null="true" length="20"/>
</property>
<property name="action" type="string" >
- <column name="ACTION" not-null="true" length="20"/>
+ <column name="ACTION" not-null="true" length="40"/>
</property>
<property name="version" type="string">
<column name="VERSION_STR" not-null="true" length="20"/>
@@ -58,4 +58,4 @@
</property>
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
index 75be1c7..bdd54f7 100644
--- a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
@@ -44,7 +44,7 @@
<column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
</property>
- <property name="action" column="ACTION" type="string" length="20" insert="false" update="false" />
+ <property name="action" column="ACTION" type="string" length="40" insert="false" update="false" />
<property name="version" column="VERSION_STR" type="string" length="20"/>
<property name="description" column="DESCRIPTION" type="string" length="1200"/>
<property name="serviceParamXSD" column="SERVICE_PARAM_XSD" type="string" length="2048"/>
diff --git a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
index d2ca635..8bb138a 100644
--- a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
@@ -37,7 +37,7 @@
<column name="VNF_COMPONENT_TYPE" not-null="true" length="45"/>
</property>
<property name="action" type="string">
- <column name="ACTION" not-null="true" length="20"/>
+ <column name="ACTION" not-null="true" length="40"/>
</property>
<property name="serviceType" column="SERVICE_TYPE" type="string" length="45"/>
<property name="version" column="VERSION" type="string" length="20"/>
diff --git a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
index 910cb9b..0857070 100644
--- a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
@@ -37,7 +37,7 @@
<column name="VF_MODULE_ID" not-null="false" length="100" />
</property>
<property name="action" type="string">
- <column name="ACTION" not-null="true" length="20" />
+ <column name="ACTION" not-null="true" length="40" />
</property>
<property name="version" type="string">
<column name="VERSION_STR" not-null="true" length="20" />