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 | |
| 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
21 files changed, 48 insertions, 45 deletions
diff --git a/dgbuilder/build_pom_for_yang_compile b/dgbuilder/build_pom_for_yang_compile index 9ea090a6..549708c4 100755 --- a/dgbuilder/build_pom_for_yang_compile +++ b/dgbuilder/build_pom_for_yang_compile @@ -6,13 +6,13 @@ model_pom_content=$(cat <<EOF <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.sdnc.core</groupId> - <artifactId>root</artifactId> - <version>${1}</version> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli-core</artifactId> + <version>${1}</version> </parent> <artifactId>yangApp-model</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <build> <plugins> diff --git a/dgbuilder/createReleaseDir.sh b/dgbuilder/createReleaseDir.sh index ccfd1d96..c3ca0a41 100755 --- a/dgbuilder/createReleaseDir.sh +++ b/dgbuilder/createReleaseDir.sh @@ -95,11 +95,11 @@ fi if [ ! -e "./$svclogicPropFile" ] then - echo "org.openecomp.sdnc.sli.dbtype=jdbc" >$svclogicPropFile - echo "org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl" >>$svclogicPropFile - echo "org.openecomp.sdnc.sli.jdbc.database=sdnctl" >>$svclogicPropFile - echo "org.openecomp.sdnc.sli.jdbc.user=sdnctl" >>$svclogicPropFile - echo "org.openecomp.sdnc.sli.jdbc.password=gamma" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.core.sli.dbtype=jdbc" >$svclogicPropFile + echo "org.onap.ccsdk.sli.core.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.core.sli.jdbc.database=sdnctl" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.core.sli.jdbc.user=sdnctl" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.core.sli.jdbc.password=gamma" >>$svclogicPropFile fi if [ ! -e "${appDir}/flowShareUsers.js" ] then diff --git a/dgbuilder/nodes/dge/dgelogic/block.html b/dgbuilder/nodes/dge/dgelogic/block.html index 656ad28d..fadf8a8c 100644 --- a/dgbuilder/nodes/dge/dgelogic/block.html +++ b/dgbuilder/nodes/dge/dgelogic/block.html @@ -74,7 +74,7 @@ <h5><a name="Example"></a>Example</h5> <div class="source"> <pre><block> - <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder"> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> <parameter name="file" value="/tmp/sample_r1.log" /> <parameter name="field1" value="__TIMESTAMP__"/> <parameter name="field2" value="RESERVED"/> diff --git a/dgbuilder/nodes/dge/dgelogic/configure.html b/dgbuilder/nodes/dge/dgelogic/configure.html index a0e340e8..69db7638 100644 --- a/dgbuilder/nodes/dge/dgelogic/configure.html +++ b/dgbuilder/nodes/dge/dgelogic/configure.html @@ -83,7 +83,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor" +<pre><configure adaptor="org.onap.ccsdk.sli.core.sli.adaptor.emt.EmtAdaptor" key="$uni-circuit-id" activate="true"> <parameter name="circuit.id" value="$uni-circuit-id" /> <parameter name="subscriber.name" value="$subscriber-name" /> @@ -98,7 +98,7 @@ <parameter name="mtu" value="$asePort.resource-mtu" /> <outcome value="success"> <block> - <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder"> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> <parameter name="file" value="/tmp/sampler1.log" /> <parameter name="field1" value="__TIMESTAMP__"/> <parameter name="field2" value="ACTIVE"/> diff --git a/dgbuilder/nodes/dge/dgelogic/delete.html b/dgbuilder/nodes/dge/dgelogic/delete.html index 2b867e69..e81a9645 100644 --- a/dgbuilder/nodes/dge/dgelogic/delete.html +++ b/dgbuilder/nodes/dge/dgelogic/delete.html @@ -71,7 +71,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><delete plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><delete plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="uni_circuit_id == $uni-circuit-id"> <outcome value="true"> diff --git a/dgbuilder/nodes/dge/dgelogic/execute.html b/dgbuilder/nodes/dge/dgelogic/execute.html index 70b15e25..6980cf18 100644 --- a/dgbuilder/nodes/dge/dgelogic/execute.html +++ b/dgbuilder/nodes/dge/dgelogic/execute.html @@ -74,7 +74,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><execute plugin="org.openecomp.sdnc.sli.plugin.HelloWorld" +<pre><execute plugin="org.onap.ccsdk.sli.core.sli.plugin.HelloWorld" method="log"> <parameter name="message" value="Hello, world!" /> <outcome value="success"> diff --git a/dgbuilder/nodes/dge/dgelogic/exists.html b/dgbuilder/nodes/dge/dgelogic/exists.html index fd5afc4d..0d1c6697 100644 --- a/dgbuilder/nodes/dge/dgelogic/exists.html +++ b/dgbuilder/nodes/dge/dgelogic/exists.html @@ -71,7 +71,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><exists plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><exists plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="uni_circuit_id == $uni-circuit-id"> <outcome value="true"> diff --git a/dgbuilder/nodes/dge/dgelogic/get-resource.html b/dgbuilder/nodes/dge/dgelogic/get-resource.html index 247cd049..b0b59d07 100644 --- a/dgbuilder/nodes/dge/dgelogic/get-resource.html +++ b/dgbuilder/nodes/dge/dgelogic/get-resource.html @@ -74,7 +74,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><get-resource plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><get-resource plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="uni_circuit_id == $uni-circuit-id"> <outcome value="success"> diff --git a/dgbuilder/nodes/dge/dgelogic/is-available.html b/dgbuilder/nodes/dge/dgelogic/is-available.html index 1a70f588..60d2b0ee 100644 --- a/dgbuilder/nodes/dge/dgelogic/is-available.html +++ b/dgbuilder/nodes/dge/dgelogic/is-available.html @@ -71,7 +71,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><is-available plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><is-available plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value"> <outcome value="true"> diff --git a/dgbuilder/nodes/dge/dgelogic/notify.html b/dgbuilder/nodes/dge/dgelogic/notify.html index 6423ad35..d006e252 100644 --- a/dgbuilder/nodes/dge/dgelogic/notify.html +++ b/dgbuilder/nodes/dge/dgelogic/notify.html @@ -71,7 +71,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><notify plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><notify plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="network-connection" action="DELETE" > <parameter name="message" value="Hello, world!" /> <outcome value="success"> diff --git a/dgbuilder/nodes/dge/dgelogic/record.html b/dgbuilder/nodes/dge/dgelogic/record.html index f5360110..3eb7a2e6 100644 --- a/dgbuilder/nodes/dge/dgelogic/record.html +++ b/dgbuilder/nodes/dge/dgelogic/record.html @@ -74,7 +74,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><record plugin="org.openecomp.sdnc.sli.recording.FileRecorder"> +<pre><record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> <parameter name="file" value="/tmp/sample_r1.log" /> <parameter name="field1" value="__TIMESTAMP__"/> <parameter name="field2" value="ACTIVE"/> diff --git a/dgbuilder/nodes/dge/dgelogic/release.html b/dgbuilder/nodes/dge/dgelogic/release.html index 2ea8cea9..d39d4109 100644 --- a/dgbuilder/nodes/dge/dgelogic/release.html +++ b/dgbuilder/nodes/dge/dgelogic/release.html @@ -74,7 +74,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><release plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><release plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="uni_circuit_id == $uni-circuit-id"> <outcome value="success"> diff --git a/dgbuilder/nodes/dge/dgelogic/reserve.html b/dgbuilder/nodes/dge/dgelogic/reserve.html index 59bfb3ad..40945559 100644 --- a/dgbuilder/nodes/dge/dgelogic/reserve.html +++ b/dgbuilder/nodes/dge/dgelogic/reserve.html @@ -74,7 +74,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><reserve plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><reserve plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value" select="min(speed)"> diff --git a/dgbuilder/nodes/dge/dgelogic/switchNode.html b/dgbuilder/nodes/dge/dgelogic/switchNode.html index 57f82c97..5cbcfea7 100644 --- a/dgbuilder/nodes/dge/dgelogic/switchNode.html +++ b/dgbuilder/nodes/dge/dgelogic/switchNode.html @@ -61,7 +61,7 @@ <div class="source"> <pre><switch test="$uni-cir-units"> <outcome value="Mbps"> - <reserve plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" + <reserve plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value" pfx="asePort"> @@ -80,7 +80,7 @@ </reserve> </outcome> <outcome value="Gbps"> - <reserve plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" + <reserve plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="ase-port" key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value*1000" pfx="asePort"> diff --git a/dgbuilder/nodes/dge/dgelogic/update.html b/dgbuilder/nodes/dge/dgelogic/update.html index c166773c..0b3b9bbd 100644 --- a/dgbuilder/nodes/dge/dgelogic/update.html +++ b/dgbuilder/nodes/dge/dgelogic/update.html @@ -71,7 +71,7 @@ <div class="section"> <h5><a name="Example"></a>Example</h5> <div class="source"> -<pre><update plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource" +<pre><update plugin="org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource" resource="network-connection" action="DELETE" > <parameter name="message" value="Hello, world!" /> <outcome value="success"> diff --git a/dgbuilder/nodes/dge/dgemain/serviceLogic.html b/dgbuilder/nodes/dge/dgemain/serviceLogic.html index 7b9871ca..ca8ac8c4 100644 --- a/dgbuilder/nodes/dge/dgemain/serviceLogic.html +++ b/dgbuilder/nodes/dge/dgemain/serviceLogic.html @@ -46,7 +46,7 @@ module: {value:""}, version: {value:""}, comments:{value:""}, - xml: {value:"<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='' version=''>\n"}, + xml: {value:"<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='' version=''>\n"}, outputs: {value:1} }, inputs:1, @@ -112,7 +112,7 @@ console.log("version:" + version); //xmlStr= xmlStr.replace("$MODULE",module); //xmlStr= xmlStr.replace("$VERSION",version); - var xmlVal = "<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='" + module + "' version='" + version + "'>" + var xmlVal = "<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='" + module + "' version='" + version + "'>" $("#node-input-xml").val(xmlVal); if(module == "" || version == ""){ this.status = {fill:"red",shape:"dot",text:"Not configured"}; diff --git a/dgbuilder/red/server.js b/dgbuilder/red/server.js index a5eb922d..91bee453 100644 --- a/dgbuilder/red/server.js +++ b/dgbuilder/red/server.js @@ -950,11 +950,11 @@ function createServer(_server,_settings) { //console.log("settingsStr:" + settingsStr); fs.writeFileSync(settingsFile,settingsStr); var svcLogicPropStr = "" ; - svcLogicPropStr += "org.openecomp.sdnc.sli.dbtype=jdbc" + "\n"; - svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://" + dbHost + ":" + dbPort + "/" + dbName + "\n"; - svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.database=" + dbName + "\n"; - svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.user=" + dbUser + "\n"; - svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.password=" + dbPassword; + svcLogicPropStr += "org.onap.ccsdk.sli.dbtype=jdbc" + "\n"; + svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://" + dbHost + ":" + dbPort + "/" + dbName + "\n"; + svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.database=" + dbName + "\n"; + svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.user=" + dbUser + "\n"; + svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.password=" + dbPassword; //create svclogic.properties file in the conf dir var svcPropFile = userDir + "/conf/svclogic.properties"; diff --git a/dgbuilder/releases/sdnc1.0/conf/svclogic.properties b/dgbuilder/releases/sdnc1.0/conf/svclogic.properties index e1c102bd..1d989592 100644 --- a/dgbuilder/releases/sdnc1.0/conf/svclogic.properties +++ b/dgbuilder/releases/sdnc1.0/conf/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
\ No newline at end of file +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
\ No newline at end of file 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 $* |