diff options
| author |   Marcus G K Williams <marcus.williams@intel.com> | 2017-09-28 14:56:12 -0700 |
|---|---|---|
| committer | Marcus G K Williams <marcus.williams@intel.com> | 2017-10-04 10:23:30 -0700 |
| commit | a3d1f087bedc18368de3cfa17ce72a97a9d521b0 (patch) | |
| tree | 06a6e02e277aeb2b6fb122f8c1ce7eff6fc7b7e0 /dgbuilder/svclogic | |
| parent | c7e9728a0e11599ddd62c3ba4eb441fac25a008d (diff) | |
Fix dgbuilder mysql upload
Since code moved from sdnc to
ccsdk dgbuilder has not been able
to upload or activate directed graphs
to test them in containers for development
purposes. This patch updates parts of
dgbuilder that pointed to sdnc.
Issue-Id: SDNC-92
Change-Id: I8021312df8c97673ed71232783183e92a06b7bd3
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
Former-commit-id: 4783e789681d753fc27e5ada1a6b17cc7d7df084
Diffstat (limited to 'dgbuilder/svclogic')
| -rw-r--r-- | dgbuilder/svclogic/dg.xml | 7 | ||||
| -rw-r--r-- | dgbuilder/svclogic/svclogic.properties | 10 | ||||
| -rwxr-xr-x | dgbuilder/svclogic/svclogic.sh | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/dgbuilder/svclogic/dg.xml b/dgbuilder/svclogic/dg.xml index e8e101eb..6fe1484c 100644 --- a/dgbuilder/svclogic/dg.xml +++ b/dgbuilder/svclogic/dg.xml @@ -1,2 +1,5 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='ModuleName' version='1.0.0'><method rpc='rpcName' mode='sync'> -</method></service-logic> +<service-logic + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='ModuleName' version='1.0.0'> + <method rpc='rpcName' mode='sync'></method> +</service-logic> diff --git a/dgbuilder/svclogic/svclogic.properties b/dgbuilder/svclogic/svclogic.properties index 69ffd84c..94e272de 100644 --- a/dgbuilder/svclogic/svclogic.properties +++ b/dgbuilder/svclogic/svclogic.properties @@ -1,5 +1,5 @@ -org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database = sdnctl
-org.openecomp.sdnc.sli.jdbc.user = sdnctl
-org.openecomp.sdnc.sli.jdbc.password = gamma
+org.onap.ccsdk.sli.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.database=sdnctl
+org.onap.ccsdk.sli.jdbc.user=sdnctl
+org.onap.ccsdk.sli.jdbc.password=gamma
diff --git a/dgbuilder/svclogic/svclogic.sh b/dgbuilder/svclogic/svclogic.sh index b54e521b..629b5527 100755 --- a/dgbuilder/svclogic/svclogic.sh +++ b/dgbuilder/svclogic/svclogic.sh @@ -1,7 +1,7 @@ #!/bin/bash #echo "PROJECT_HOME:$PROJECT_HOME" -MYSQL_JDBC_DRIVER=${MYSQL_JDBC_DRIVER:-$PROJECT_HOME/svclogic/lib/mysql-connector-java-5.1.31.jar} +MYSQL_JDBC_DRIVER=${MYSQL_JDBC_DRIVER:-$PROJECT_HOME/svclogic/lib/mariadb-java-client-2.1.1.jar} JARDIR="$PROJECT_HOME/svclogic/lib" #JARDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -11,4 +11,4 @@ do CLASSPATH=$CLASSPATH:${jar} done #echo "CLASSPATH is ${CLASSPATH}" -java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.openecomp.sdnc.sli.SvcLogicParser $* +java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.onap.ccsdk.sli.core.sli.SvcLogicParser $* |