Merge "wan-connection bug fix for ccvpn integration test"

Former-commit-id: 2608b727fbaa26beacd94530aadc5170f580e837

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 02fb888..9a795ca 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -79,6 +79,7 @@ MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
 IS_PRIMARY_CLUSTER=${IS_PRIMARY_CLUSTER:-false}
 MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1}
+INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
 
 #
 # Wait for database
@@ -91,7 +92,12 @@ do
 done
 echo -e "\nmysql ready"
 
-if [ ! -f ${SDNC_HOME}/.installed ]
+if [ ! -d ${INSTALLED_DIR} ]
+then
+    mkdir -p ${INSTALLED_DIR}
+fi
+
+if [ ! -f ${INSTALLED_DIR}/.installed ]
 then
        echo "Installing SDN-C database"
        ${SDNC_HOME}/bin/installSdncDb.sh
@@ -108,7 +114,7 @@ then
 
     if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
 
-       echo "Installed at `date`" > ${SDNC_HOME}/.installed
+       echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
 fi
 
 exec ${ODL_HOME}/bin/karaf server

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 863c77f..f7fd565 100644 (file)
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -38,6 +38,9 @@ restapi.ss.mS.vlan.tag.unassign.templatefile=self-serve-mS-vlan-tag-unassignment
 restapi.ss.mS.mac.address.assign.templatefile=self-serve-mS-mac-address-assign.json
 restapi.ss.mS.mac.address.unassign.templatefile=self-serve-mS-mac-address-unassign.json
 
+# Default cloud owner
+cloud-region.cloud-owner=CloudOwner
+
 # URLs
 restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
 restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/