Merge "Fix dgbuilder mysql upload"
authorDan Timoney <dtimoney@att.com>
Wed, 4 Oct 2017 21:00:44 +0000 (21:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 4 Oct 2017 21:00:44 +0000 (21:00 +0000)
21 files changed:
dgbuilder/build_pom_for_yang_compile
dgbuilder/createReleaseDir.sh
dgbuilder/nodes/dge/dgelogic/block.html
dgbuilder/nodes/dge/dgelogic/configure.html
dgbuilder/nodes/dge/dgelogic/delete.html
dgbuilder/nodes/dge/dgelogic/execute.html
dgbuilder/nodes/dge/dgelogic/exists.html
dgbuilder/nodes/dge/dgelogic/get-resource.html
dgbuilder/nodes/dge/dgelogic/is-available.html
dgbuilder/nodes/dge/dgelogic/notify.html
dgbuilder/nodes/dge/dgelogic/record.html
dgbuilder/nodes/dge/dgelogic/release.html
dgbuilder/nodes/dge/dgelogic/reserve.html
dgbuilder/nodes/dge/dgelogic/switchNode.html
dgbuilder/nodes/dge/dgelogic/update.html
dgbuilder/nodes/dge/dgemain/serviceLogic.html
dgbuilder/red/server.js
dgbuilder/releases/sdnc1.0/conf/svclogic.properties
dgbuilder/svclogic/dg.xml
dgbuilder/svclogic/svclogic.properties
dgbuilder/svclogic/svclogic.sh

index 9ea090a..549708c 100755 (executable)
@@ -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>
index ccfd1d9..c3ca0a4 100755 (executable)
@@ -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
index 656ad28..fadf8a8 100644 (file)
@@ -74,7 +74,7 @@
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
 <pre>&lt;block&gt;
-  &lt;record plugin=&quot;org.openecomp.sdnc.sli.recording.FileRecorder&quot;&gt;
+  &lt;record plugin=&quot;org.onap.ccsdk.sli.core.sli.recording.FileRecorder&quot;&gt;
     &lt;parameter name=&quot;file&quot; value=&quot;/tmp/sample_r1.log&quot; /&gt;
     &lt;parameter name=&quot;field1&quot; value=&quot;__TIMESTAMP__&quot;/&gt;
     &lt;parameter name=&quot;field2&quot; value=&quot;RESERVED&quot;/&gt;
index a0e340e..69db763 100644 (file)
@@ -83,7 +83,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;configure adaptor=&quot;org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor&quot;
+<pre>&lt;configure adaptor=&quot;org.onap.ccsdk.sli.core.sli.adaptor.emt.EmtAdaptor&quot;
            key=&quot;$uni-circuit-id&quot; activate=&quot;true&quot;&gt;
   &lt;parameter name=&quot;circuit.id&quot; value=&quot;$uni-circuit-id&quot; /&gt;
   &lt;parameter name=&quot;subscriber.name&quot; value=&quot;$subscriber-name&quot; /&gt;
@@ -98,7 +98,7 @@
   &lt;parameter name=&quot;mtu&quot; value=&quot;$asePort.resource-mtu&quot; /&gt;
   &lt;outcome value=&quot;success&quot;&gt;
     &lt;block&gt;
-      &lt;record plugin=&quot;org.openecomp.sdnc.sli.recording.FileRecorder&quot;&gt;
+      &lt;record plugin=&quot;org.onap.ccsdk.sli.core.sli.recording.FileRecorder&quot;&gt;
         &lt;parameter name=&quot;file&quot; value=&quot;/tmp/sampler1.log&quot; /&gt;
         &lt;parameter name=&quot;field1&quot; value=&quot;__TIMESTAMP__&quot;/&gt;
         &lt;parameter name=&quot;field2&quot; value=&quot;ACTIVE&quot;/&gt;
index 2b867e6..e81a964 100644 (file)
@@ -71,7 +71,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;delete plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;delete plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
         resource=&quot;ase-port&quot;
         key=&quot;uni_circuit_id == $uni-circuit-id&quot;&gt;
   &lt;outcome value=&quot;true&quot;&gt;
index 70b15e2..6980cf1 100644 (file)
@@ -74,7 +74,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;execute plugin=&quot;org.openecomp.sdnc.sli.plugin.HelloWorld&quot;
+<pre>&lt;execute plugin=&quot;org.onap.ccsdk.sli.core.sli.plugin.HelloWorld&quot;
            method=&quot;log&quot;&gt;
   &lt;parameter name=&quot;message&quot; value=&quot;Hello, world!&quot; /&gt;
   &lt;outcome value=&quot;success&quot;&gt;
index fd5afc4..0d1c669 100644 (file)
@@ -71,7 +71,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;exists plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;exists plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
         resource=&quot;ase-port&quot;
         key=&quot;uni_circuit_id == $uni-circuit-id&quot;&gt;
   &lt;outcome value=&quot;true&quot;&gt;
index 247cd04..b0b59d0 100644 (file)
@@ -74,7 +74,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;get-resource plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;get-resource plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
               resource=&quot;ase-port&quot;
               key=&quot;uni_circuit_id == $uni-circuit-id&quot;&gt;
   &lt;outcome value=&quot;success&quot;&gt;
index 1a70f58..60d2b0e 100644 (file)
@@ -71,7 +71,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;is-available plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;is-available plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
               resource=&quot;ase-port&quot;
               key=&quot;resource-emt-clli == $edge-device-clli and speed &gt;= $uni-cir-value&quot;&gt;
   &lt;outcome value=&quot;true&quot;&gt;
index 6423ad3..d006e25 100644 (file)
@@ -71,7 +71,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;notify plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;notify plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
             resource=&quot;network-connection&quot; action=&quot;DELETE&quot; &gt;
   &lt;parameter name=&quot;message&quot; value=&quot;Hello, world!&quot; /&gt;
   &lt;outcome value=&quot;success&quot;&gt;
index f536011..3eb7a2e 100644 (file)
@@ -74,7 +74,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;record plugin=&quot;org.openecomp.sdnc.sli.recording.FileRecorder&quot;&gt;
+<pre>&lt;record plugin=&quot;org.onap.ccsdk.sli.core.sli.recording.FileRecorder&quot;&gt;
   &lt;parameter name=&quot;file&quot; value=&quot;/tmp/sample_r1.log&quot; /&gt;
   &lt;parameter name=&quot;field1&quot; value=&quot;__TIMESTAMP__&quot;/&gt;
   &lt;parameter name=&quot;field2&quot; value=&quot;ACTIVE&quot;/&gt;
index 2ea8cea..d39d410 100644 (file)
@@ -74,7 +74,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;release plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;release plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
          resource=&quot;ase-port&quot;
          key=&quot;uni_circuit_id == $uni-circuit-id&quot;&gt;
   &lt;outcome value=&quot;success&quot;&gt;
index 59bfb3a..4094555 100644 (file)
@@ -74,7 +74,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;reserve plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;reserve plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
          resource=&quot;ase-port&quot;
          key=&quot;resource-emt-clli == $edge-device-clli and speed &gt;= $uni-cir-value&quot;
          select=&quot;min(speed)&quot;&gt;
index 57f82c9..5cbcfea 100644 (file)
@@ -61,7 +61,7 @@
 <div class="source">
 <pre>&lt;switch test=&quot;$uni-cir-units&quot;&gt;
   &lt;outcome value=&quot;Mbps&quot;&gt;
-    &lt;reserve plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+    &lt;reserve plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
                          resource=&quot;ase-port&quot;
                          key=&quot;resource-emt-clli == $edge-device-clli and speed &gt;= $uni-cir-value&quot;
                          pfx=&quot;asePort&quot;&gt;
@@ -80,7 +80,7 @@
     &lt;/reserve&gt;
   &lt;/outcome&gt;
   &lt;outcome value=&quot;Gbps&quot;&gt;
-    &lt;reserve plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+    &lt;reserve plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
                          resource=&quot;ase-port&quot;
                          key=&quot;resource-emt-clli == $edge-device-clli and speed &gt;= $uni-cir-value*1000&quot;
                          pfx=&quot;asePort&quot;&gt;
index c166773..0b3b9bb 100644 (file)
@@ -71,7 +71,7 @@
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <div class="source">
-<pre>&lt;update plugin=&quot;org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource&quot;
+<pre>&lt;update plugin=&quot;org.onap.ccsdk.sli.core.sli.resource.samplesvc.SampleServiceResource&quot;
             resource=&quot;network-connection&quot; action=&quot;DELETE&quot; &gt;
   &lt;parameter name=&quot;message&quot; value=&quot;Hello, world!&quot; /&gt;
   &lt;outcome value=&quot;success&quot;&gt;
index 7b9871c..ca8ac8c 100644 (file)
@@ -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,
                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"};
index a5eb922..91bee45 100644 (file)
@@ -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";
index e1c102b..1d98959 100644 (file)
@@ -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
index e8e101e..6fe1484 100644 (file)
@@ -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>
index 69ffd84..94e272d 100644 (file)
@@ -1,5 +1,5 @@
-org.openecomp.sdnc.sli.dbtype = jdbc\r
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl\r
-org.openecomp.sdnc.sli.jdbc.database = sdnctl\r
-org.openecomp.sdnc.sli.jdbc.user = sdnctl\r
-org.openecomp.sdnc.sli.jdbc.password = gamma\r
+org.onap.ccsdk.sli.dbtype = jdbc\r
+org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl\r
+org.onap.ccsdk.sli.jdbc.database=sdnctl\r
+org.onap.ccsdk.sli.jdbc.user=sdnctl\r
+org.onap.ccsdk.sli.jdbc.password=gamma\r
index b54e521..629b552 100755 (executable)
@@ -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 $*