11/7: merge casablanca to master

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / onap / so / bpmn / common / scripts / OofUtils.groovy

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 b9bc1c7..46ecc7b 100644 (file)
--- 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
@@ -158,6 +158,8 @@ class OofUtils {
                     utils.log("DEBUG", "Allotted Resource: " + resource.toString(),
                             isDebugEnabled)
                     def serviceResourceId = resource.getResourceId()
+                    def toscaNodeType = resource.getToscaNodeType()
+                    def resourceModuleName = toscaNodeType.substring(toscaNodeType.lastIndexOf(".") + 1)
                     def resourceModelInvariantId = resource.getModelInfo().getModelInvariantUuid()
                     def resourceModelVersionId = resource.getModelInfo().getModelUuid()
                     def resourceModelName = resource.getModelInfo().getModelName()
@@ -173,7 +175,7 @@ class OofUtils {
 
                     String demand =
                             "      {\n" +
-                                    "      \"resourceModuleName\": \"${resourceModelName}\",\n" +
+                                    "      \"resourceModuleName\": \"${resourceModuleName}\",\n" +
                                     "      \"serviceResourceId\": \"${serviceResourceId}\",\n" +
                                     "      \"tenantId\": \"${tenantId}\",\n" +
                                     "      \"resourceModelInfo\": {\n" +
@@ -199,6 +201,8 @@ class OofUtils {
                     utils.log("DEBUG", "VNF Resource: " + vnfResource.toString(),
                             isDebugEnabled)
                     ModelInfo vnfResourceModelInfo = vnfResource.getModelInfo()
+                    def toscaNodeType = vnfResource.getToscaNodeType()
+                    def resourceModuleName = toscaNodeType.substring(toscaNodeType.lastIndexOf(".") + 1)
                     def serviceResourceId = vnfResource.getResourceId()
                     def resourceModelInvariantId = vnfResourceModelInfo.getModelInvariantUuid()
                     def resourceModelName = vnfResourceModelInfo.getModelName()
@@ -211,7 +215,7 @@ class OofUtils {
 
                     String placementDemand =
                             "      {\n" +
-                                    "      \"resourceModuleName\": \"${resourceModelName}\",\n" +
+                                    "      \"resourceModuleName\": \"${resourceModuleName}\",\n" +
                                     "      \"serviceResourceId\": \"${serviceResourceId}\",\n" +
                                     "      \"tenantId\": \"${tenantId}\",\n" +
                                     "      \"resourceModelInfo\": {\n" +
@@ -519,4 +523,12 @@ class OofUtils {
             exceptionUtil.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from CatalogDB.")
         }
     }
+
+     String getMsbHost(DelegateExecution execution) {
+         msbHost = UrnPropertiesReader.getVariable("mso.msb.host", execution, "msb-iag.onap")
+
+         Integer msbPort = UrnPropertiesReader.getVariable("mso.msb.port", execution, "80").toInteger()
+
+         return UriBuilder.fromPath("").host(msbHost).port(msbPort).scheme("http").build().toString()
+    }
 }