[MSO-8] Additional fixes for the second rebase

DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file
not reloaded properly when it's wrong (JSON error or model hierarchy
mistake) at MSO startup

Change-Id: I2853030b78499e2a761706b643ea210955e72de3
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

[MSO-8] Restore files removed in patch set 2

Those groovy files must be there

Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
index fba5cbe..53678ec 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
@@ -120,7 +120,11 @@ public class GenerateVfModuleName extends AbstractServiceTaskProcessor{
 							String matchingVfModules = "<vfModules>"

 							for (i in 0..vfModulesSize-1) {

 								def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

-								def personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "persona-model-id")

+								def personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "model-invariant-id")

+								if (!personaModelIdFromAAI) {

+									// check old attribute name

+								   personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "persona-model-id")								  

+								}

 								if (personaModelIdFromAAI != null && personaModelIdFromAAI.equals(personaModelId)) {

 									matchingVfModules = matchingVfModules + utils.removeXmlPreamble(vfModuleXml)

 								}