[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>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
index ac340c7..b14d495 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -10,7 +10,8 @@
mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
-
+mso.workflow.message.endpoint=http://localhost:8080/mso/WorkflowMessage
+mso.catalog.db.endpoint=http://localhost:8090
mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
@@ -30,6 +31,7 @@
mso.sdnc.firewall.yang.model.version=2015-05-15
mso.sdnc.password=3141634BF7E070AA289CF2892C986C0B
mso.sdnc.timeout.firewall.minutes=20
+mso.callbackRetryAttempts=5
mso.sdnc.timeout=PT10S
mso.sdnc.timeout.ucpe.async.hours=120
mso.sdnc.timeout.ucpe.async.minutes=5
@@ -56,7 +58,7 @@
# Example to override default version for a resource:
#mso.workflow.default.aai.vce.version=6
#mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce
-
+mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/
mso.workflow.global.default.aai.version=8
mso.workflow.default.aai.cloud-region.version=9
mso.workflow.default.aai.generic-vnf.version=9