diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-11-03 15:16:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-03 15:16:37 +0000 |
| commit | 5d660cbc1a5028f52d63185ab7db0b1b465a981b (patch) | |
| tree | 909c9a5f68ceefccd4955e01b29422ecb528aaf2 /bpmn/MSOCommonBPMN | |
| parent | 402bf528e9a796f6ce31ad36c16316c2b31acc48 (diff) | |
| parent | dbb53cabbff772880134699eb81dee775d7df8df (diff) | |
Merge "Send correct resourceModuleName" into casablanca
Diffstat (limited to 'bpmn/MSOCommonBPMN')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy | 8 |
1 files changed, 6 insertions, 2 deletions
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 197589efa1..c7312c453c 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 @@ -159,6 +159,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() @@ -174,7 +176,7 @@ class OofUtils { String demand = " {\n" + - " \"resourceModuleName\": \"${resourceModelName}\",\n" + + " \"resourceModuleName\": \"${resourceModuleName}\",\n" + " \"serviceResourceId\": \"${serviceResourceId}\",\n" + " \"tenantId\": \"${tenantId}\",\n" + " \"resourceModelInfo\": {\n" + @@ -200,6 +202,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() @@ -212,7 +216,7 @@ class OofUtils { String placementDemand = " {\n" + - " \"resourceModuleName\": \"${resourceModelName}\",\n" + + " \"resourceModuleName\": \"${resourceModuleName}\",\n" + " \"serviceResourceId\": \"${serviceResourceId}\",\n" + " \"tenantId\": \"${tenantId}\",\n" + " \"resourceModelInfo\": {\n" + |