Merge "Update underlay DGs for VoLTE use case"
authorDan Timoney <dtimoney@att.com>
Wed, 4 Oct 2017 21:01:54 +0000 (21:01 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 4 Oct 2017 21:01:54 +0000 (21:01 +0000)
25 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
installation/sdnc/src/main/resources/sdnctl.dump
installation/src/main/yaml/docker-compose.yml
platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json
platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml

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 $*
index 8be4c6a..4f9dc41 100644 (file)
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN;
-SET @@SESSION.SQL_LOG_BIN= 0;
+
+--
+-- Table structure for table `ACCESS_LOG`
+--
+
+DROP TABLE IF EXISTS `ACCESS_LOG`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ACCESS_LOG` (
+  `access_log_seq` int(11) NOT NULL AUTO_INCREMENT,
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `method` varchar(12) DEFAULT NULL,
+  `version` varchar(12) DEFAULT NULL,
+  `status` varchar(12) DEFAULT NULL,
+  `url` varchar(256) DEFAULT NULL,
+  `remote_address` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`access_log_seq`)
+) ENGINE=InnoDB AUTO_INCREMENT=1034 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `ADDRESS_PLAN_POLICIES`
+--
+
+DROP TABLE IF EXISTS `ADDRESS_PLAN_POLICIES`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ADDRESS_PLAN_POLICIES` (
+  `key_name` varchar(255) NOT NULL,
+  `key_value_source_type` varchar(255) NOT NULL,
+  `key_value_source` varchar(255) NOT NULL,
+  PRIMARY KEY (`key_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 --
 -- Table structure for table `AGNOSTIC_NOTIFICATION_URL`
@@ -60,7 +92,7 @@ CREATE TABLE `AIC_AVAIL_ZONE_POOL` (
   `aic_site_id` varchar(100) NOT NULL,
   `status` varchar(40) NOT NULL,
   `availability_zone` varchar(100) NOT NULL,
-  `token` varchar(5) NOT NULL,
+  `token` int(4) NOT NULL,
   `vnf_id` varchar(80) DEFAULT NULL,
   `service_type` varchar(100) NOT NULL,
   `vnf_type` varchar(20) DEFAULT NULL,
@@ -79,6 +111,7 @@ DROP TABLE IF EXISTS `AIC_HOSTNAME`;
 CREATE TABLE `AIC_HOSTNAME` (
   `hostname` varchar(20) NOT NULL,
   `cust_id` int(11) NOT NULL,
+  `aic_site_id` varchar(100) DEFAULT NULL,
   `vendor_code` varchar(1) NOT NULL,
   `virtual_device_type` varchar(2) DEFAULT NULL,
   `device_sequence` varchar(3) NOT NULL,
@@ -147,6 +180,22 @@ CREATE TABLE `AIC_SWITCH` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `AIC_ZONE_CLOUD_REGION_ID`
+--
+
+DROP TABLE IF EXISTS `AIC_ZONE_CLOUD_REGION_ID`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AIC_ZONE_CLOUD_REGION_ID` (
+  `zone_region_id` varchar(255) NOT NULL,
+  `cilli_code` varchar(255) NOT NULL,
+  `location_id` varchar(255) NOT NULL DEFAULT '',
+  `city_state_country` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`zone_region_id`,`cilli_code`,`location_id`,`city_state_country`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `ALLOCATION_ITEM`
 --
@@ -169,7 +218,31 @@ CREATE TABLE `ALLOCATION_ITEM` (
   UNIQUE KEY `allocation_item_id` (`allocation_item_id`),
   UNIQUE KEY `IX2_ALLOCATION_ITEM` (`resource_id`,`resource_set_id`),
   KEY `IX1_ALLOCATION_ITEM` (`resource_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=10104 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=5764 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `ALLOTTED_RESOURCE_MODEL`
+--
+
+DROP TABLE IF EXISTS `ALLOTTED_RESOURCE_MODEL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ALLOTTED_RESOURCE_MODEL` (
+  `customization_uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  `uuid` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `naming_policy` varchar(255) DEFAULT NULL,
+  `ecomp_generated_naming` char(1) DEFAULT NULL,
+  `depending_service` varchar(255) DEFAULT NULL,
+  `role` varchar(255) DEFAULT NULL,
+  `type` varchar(255) DEFAULT NULL,
+  `service_dependency` varchar(255) DEFAULT NULL,
+  `allotted_resource_type` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`customization_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -186,6 +259,98 @@ CREATE TABLE `ALTS_CREDENTIALS` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `ASDC_ARTIFACTS`
+--
+
+DROP TABLE IF EXISTS `ASDC_ARTIFACTS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ASDC_ARTIFACTS` (
+  `asdc_artifacts_id` int(11) NOT NULL AUTO_INCREMENT,
+  `service_uuid` varchar(50) DEFAULT NULL,
+  `distribution_id` varchar(50) DEFAULT NULL,
+  `service_name` varchar(255) DEFAULT NULL,
+  `service_description` varchar(255) DEFAULT NULL,
+  `resource_uuid` varchar(255) DEFAULT NULL,
+  `resource_instance_name` varchar(255) DEFAULT NULL,
+  `resource_name` varchar(255) DEFAULT NULL,
+  `resource_version` varchar(50) DEFAULT NULL,
+  `resource_type` varchar(50) DEFAULT NULL,
+  `artifact_uuid` varchar(50) DEFAULT NULL,
+  `artifact_type` varchar(50) DEFAULT NULL,
+  `artifact_version` varchar(25) DEFAULT NULL,
+  `artifact_description` varchar(255) DEFAULT NULL,
+  `internal_version` int(11) DEFAULT NULL,
+  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `artifact_name` varchar(255) DEFAULT NULL,
+  `artifact_content` longtext,
+  PRIMARY KEY (`asdc_artifacts_id`),
+  UNIQUE KEY `asdc_artifacts_id` (`asdc_artifacts_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `ASDC_REFERENCE`
+--
+
+DROP TABLE IF EXISTS `ASDC_REFERENCE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ASDC_REFERENCE` (
+  `asdc_reference_id` int(11) NOT NULL AUTO_INCREMENT,
+  `service_type` varchar(50) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `vnfc_type` varchar(50) DEFAULT NULL,
+  `file_category` varchar(50) DEFAULT NULL,
+  `action` varchar(50) DEFAULT NULL,
+  `artifact_type` varchar(50) DEFAULT NULL,
+  `artifact_name` varchar(255) NOT NULL,
+  PRIMARY KEY (`asdc_reference_id`),
+  UNIQUE KEY `asdc_reference_id` (`asdc_reference_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+
+--
+-- Table structure for table `BLOB_TEST`
+--
+
+DROP TABLE IF EXISTS `BLOB_TEST`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `BLOB_TEST` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `odl` varchar(20) DEFAULT NULL,
+  `communities` mediumblob,
+  `status` enum('NEW','COMPLETE','FAILED') NOT NULL DEFAULT 'NEW',
+  `retry_count` int(11) DEFAULT '-1',
+  PRIMARY KEY (`seq`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CAPABILITY`
+--
+
+DROP TABLE IF EXISTS `CAPABILITY`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CAPABILITY` (
+  `capability_id` int(11) NOT NULL AUTO_INCREMENT,
+  `capability_name` varchar(50) NOT NULL,
+  `implementation_name` varchar(100) NOT NULL,
+  `operation_name` varchar(50) NOT NULL,
+  `operation_description` varchar(100) NOT NULL,
+  `input_definition` longtext,
+  `output_definition` longtext,
+  `dependency_definition` longtext,
+  `tags` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`capability_id`),
+  UNIQUE KEY `capability_id` (`capability_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `CITY_CODE`
 --
@@ -201,7 +366,158 @@ CREATE TABLE `CITY_CODE` (
   `country_code` varchar(10) NOT NULL,
   PRIMARY KEY (`city_code_id`),
   KEY `IN1_CITY_CODE` (`city`,`state`,`country_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=37773 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=37822 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CLI_UPDATES`
+--
+
+DROP TABLE IF EXISTS `CLI_UPDATES`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CLI_UPDATES` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `status` enum('NEW','COMPLETE','FAILED') NOT NULL DEFAULT 'NEW',
+  `create_timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `last_processed_timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `target_address` varchar(128) DEFAULT NULL,
+  `cli_text` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`seq`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CONFIGFILES`
+--
+
+DROP TABLE IF EXISTS `CONFIGFILES`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CONFIGFILES` (
+  `config_file_id` int(11) NOT NULL AUTO_INCREMENT,
+  `external_version` varchar(50) DEFAULT NULL,
+  `data_source` varchar(25) DEFAULT NULL,
+  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `service_instance_id` varchar(50) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `vnfc_type` varchar(50) DEFAULT NULL,
+  `file_category` varchar(50) DEFAULT NULL,
+  `file_name` varchar(255) DEFAULT NULL,
+  `file_content` longtext,
+  `action` varchar(50) DEFAULT NULL,
+  `vnf_id` varchar(50) DEFAULT NULL,
+  `vm_name` varchar(50) DEFAULT NULL,
+  `vnf_name` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`config_file_id`),
+  UNIQUE KEY `config_file_id` (`config_file_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CONFIGURE_ACTION_DG`
+--
+
+DROP TABLE IF EXISTS `CONFIGURE_ACTION_DG`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CONFIGURE_ACTION_DG` (
+  `configure_action_dg_id` int(11) NOT NULL AUTO_INCREMENT,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `action` varchar(50) DEFAULT NULL,
+  `init_config_dg` varchar(50) DEFAULT NULL,
+  `generate_config_dg` varchar(50) DEFAULT NULL,
+  `download_config_dg` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`configure_action_dg_id`),
+  UNIQUE KEY `configure_action_dg_id` (`configure_action_dg_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CONFIG_CONTENT`
+--
+
+DROP TABLE IF EXISTS `CONFIG_CONTENT`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CONFIG_CONTENT` (
+  `config_content_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_id` varchar(50) NOT NULL,
+  `content_type` varchar(50) NOT NULL,
+  `template_name` varchar(50) DEFAULT NULL,
+  `originator_id` varchar(50) DEFAULT NULL,
+  `service_description` varchar(100) DEFAULT NULL,
+  `action` varchar(50) DEFAULT NULL,
+  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `service_type` varchar(50) DEFAULT NULL,
+  `service_instance_id` varchar(50) DEFAULT NULL,
+  `vnf_id` varchar(50) DEFAULT NULL,
+  `vnf_name` varchar(50) DEFAULT NULL,
+  `vm_name` varchar(50) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `vnfc_type` varchar(50) DEFAULT NULL,
+  `host_ip_address` varchar(50) DEFAULT NULL,
+  `config_indicator` varchar(25) DEFAULT NULL,
+  `pending_delete` varchar(1) DEFAULT NULL,
+  `content` longtext,
+  PRIMARY KEY (`config_content_id`),
+  UNIQUE KEY `config_content_id` (`creation_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CONFIG_FILE_REFERENCE`
+--
+
+DROP TABLE IF EXISTS `CONFIG_FILE_REFERENCE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CONFIG_FILE_REFERENCE` (
+  `config_file_reference_id` int(11) NOT NULL AUTO_INCREMENT,
+  `site_location` varchar(50) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `import_type` varchar(50) DEFAULT NULL,
+  `file_type` varchar(50) DEFAULT NULL,
+  `source_server_name` varchar(255) DEFAULT NULL,
+  `source_file_path` varchar(255) DEFAULT NULL,
+  `target_file_path` varchar(255) DEFAULT NULL,
+  `name` varchar(50) DEFAULT NULL,
+  `file_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`config_file_reference_id`),
+  UNIQUE KEY `config_file_reference_id` (`config_file_reference_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CONFIG_TRANSACTION_LOG`
+--
+
+DROP TABLE IF EXISTS `CONFIG_TRANSACTION_LOG`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CONFIG_TRANSACTION_LOG` (
+  `config_transaction_log_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_id` varchar(50) DEFAULT NULL,
+  `message_type` varchar(50) DEFAULT NULL,
+  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `message` longtext,
+  PRIMARY KEY (`config_transaction_log_id`),
+  UNIQUE KEY `config_transaction_log_id` (`config_transaction_log_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `COUNTRY_ASN_MAPPING`
+--
+
+DROP TABLE IF EXISTS `COUNTRY_ASN_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `COUNTRY_ASN_MAPPING` (
+  `asn` int(5) NOT NULL,
+  `iso_2char` varchar(5) NOT NULL,
+  `iso_3char` varchar(5) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -213,12 +529,52 @@ DROP TABLE IF EXISTS `CUSTOMER`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `CUSTOMER` (
   `cust_id` int(11) NOT NULL AUTO_INCREMENT,
-  `customer_name` varchar(60) NOT NULL,
+  `customer_name` varchar(256) DEFAULT NULL,
   `grua` varchar(4) NOT NULL,
   `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`cust_id`),
   UNIQUE KEY `IU1_CUSTOMER` (`customer_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=186 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=155 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CUSTOMER2CONNECTION_MAPPING`
+--
+
+DROP TABLE IF EXISTS `CUSTOMER2CONNECTION_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CUSTOMER2CONNECTION_MAPPING` (
+  `customer2connection_id` int(11) NOT NULL AUTO_INCREMENT,
+  `service_instance_id` varchar(80) NOT NULL,
+  `instance_type` varchar(20) NOT NULL,
+  `originating_service_instance_id` varchar(80) DEFAULT NULL,
+  `originating_service_type` varchar(20) DEFAULT NULL,
+  `service_type` varchar(30) DEFAULT NULL,
+  `connection_id` varchar(100) NOT NULL,
+  `status` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`customer2connection_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `CUSTOMER2CONNECTION_MAPPING_NEW`
+--
+
+DROP TABLE IF EXISTS `CUSTOMER2CONNECTION_MAPPING_NEW`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CUSTOMER2CONNECTION_MAPPING_NEW` (
+  `customer2connection_id` int(11) NOT NULL AUTO_INCREMENT,
+  `service_instance_id` varchar(80) NOT NULL,
+  `instance_type` varchar(20) NOT NULL,
+  `originating_service_instance_id` varchar(80) DEFAULT NULL,
+  `originating_service_type` varchar(20) DEFAULT NULL,
+  `service_type` varchar(30) DEFAULT NULL,
+  `connection_id` varchar(100) NOT NULL,
+  `status` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`customer2connection_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -235,10 +591,13 @@ CREATE TABLE `DATA_OBJECT_MAPPING` (
   `service_type` varchar(50) NOT NULL,
   `data_object_key2` varchar(100) NOT NULL,
   `data_object_key2_type` varchar(50) NOT NULL,
+  `data_object_key3` varchar(100) DEFAULT NULL,
+  `data_object_key3_type` varchar(50) DEFAULT NULL,
+  `service` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`serial_key`),
   KEY `IX1_DATA_OBJECT_MAPPING` (`data_object_key`,`data_object_type`,`service_type`),
   KEY `IX2_DATA_OBJECT_MAPPING` (`service_type`,`data_object_key2`,`data_object_key2_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=3211 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -252,7 +611,7 @@ CREATE TABLE `DEVICE2CONNECTION_MAPPING` (
   `vnf_host_name` varchar(100) NOT NULL,
   `e2e_vpn_key` varchar(30) NOT NULL,
   `service_type` varchar(30) NOT NULL,
-  `connection_id` bigint(20) NOT NULL,
+  `connection_id` varchar(100) NOT NULL,
   PRIMARY KEY (`vnf_host_name`,`e2e_vpn_key`,`service_type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -274,9 +633,10 @@ CREATE TABLE `DEVICE2IPADDRESS_CONSUMPTION` (
   `address_type` varchar(30) NOT NULL,
   `ip_consumed` varchar(50) NOT NULL,
   `vnf_type` varchar(30) NOT NULL,
+  `secondary_key` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`serial_key`),
   KEY `IX1_DEVICEIPADDRESS_CONSUMPTION` (`device_id`,`device_type`,`ip_version`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=1357 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -299,6 +659,109 @@ CREATE TABLE `DEVICE2IPADDRESS_MAPPING` (
   `status` varchar(30) NOT NULL,
   PRIMARY KEY (`serial_key`),
   KEY `IX1_DEVICE2IPADDRESS_MAPPING` (`device_id`,`device_type`,`secondary_key`,`secondary_key_type`,`address`,`address_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=4734 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `DEVICE_AUTHENTICATION`
+--
+
+DROP TABLE IF EXISTS `DEVICE_AUTHENTICATION`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `DEVICE_AUTHENTICATION` (
+  `device_authentication_id` int(11) NOT NULL AUTO_INCREMENT,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `user_name` varchar(50) DEFAULT NULL,
+  `password` varchar(100) DEFAULT NULL,
+  `protocol` varchar(100) DEFAULT NULL,
+  `port_number` int(11) DEFAULT NULL,
+  PRIMARY KEY (`device_authentication_id`),
+  UNIQUE KEY `device_authentication_id` (`device_authentication_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `DEVICE_INTERFACE_LOG`
+--
+
+DROP TABLE IF EXISTS `DEVICE_INTERFACE_LOG`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `DEVICE_INTERFACE_LOG` (
+  `device_interface_log_id` int(11) NOT NULL AUTO_INCREMENT,
+  `service_instance_id` varchar(50) DEFAULT NULL,
+  `request_id` varchar(50) DEFAULT NULL,
+  `creation_date` datetime NOT NULL,
+  `log` longtext,
+  PRIMARY KEY (`device_interface_log_id`),
+  UNIQUE KEY `device_interface_log_id` (`device_interface_log_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `DEVICE_INTERFACE_PROTOCOL`
+--
+
+DROP TABLE IF EXISTS `DEVICE_INTERFACE_PROTOCOL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `DEVICE_INTERFACE_PROTOCOL` (
+  `device_interface_protocol_id` int(11) NOT NULL AUTO_INCREMENT,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `protocol` varchar(50) DEFAULT NULL,
+  `module` varchar(50) DEFAULT NULL,
+  `dg_rpc` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`device_interface_protocol_id`),
+  UNIQUE KEY `device_interface_protocol_id` (`device_interface_protocol_id`),
+  UNIQUE KEY `vnf_type` (`vnf_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `DOWNLOAD_CONFIG_TEMPLATE`
+--
+
+DROP TABLE IF EXISTS `DOWNLOAD_CONFIG_TEMPLATE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `DOWNLOAD_CONFIG_TEMPLATE` (
+  `download_config_template_id` int(11) NOT NULL AUTO_INCREMENT,
+  `vnf_type` varchar(50) NOT NULL,
+  `protocol` varchar(50) NOT NULL,
+  `template` longtext,
+  PRIMARY KEY (`download_config_template_id`),
+  UNIQUE KEY `download_config_template_id` (`download_config_template_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `DOWNLOAD_DG_REFERENCE`
+--
+
+DROP TABLE IF EXISTS `DOWNLOAD_DG_REFERENCE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `DOWNLOAD_DG_REFERENCE` (
+  `download_dg_reference_id` int(11) NOT NULL AUTO_INCREMENT,
+  `protocol` varchar(50) NOT NULL,
+  `download_config_dg` varchar(50) NOT NULL,
+  PRIMARY KEY (`download_dg_reference_id`),
+  UNIQUE KEY `download_dg_reference_id` (`download_dg_reference_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `EIPAM_CLIENT_KEY_INDEX`
+--
+
+DROP TABLE IF EXISTS `EIPAM_CLIENT_KEY_INDEX`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `EIPAM_CLIENT_KEY_INDEX` (
+  `vnf_name_prefix` varchar(100) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`vnf_name_prefix`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -315,14 +778,39 @@ CREATE TABLE `EIPAM_IP_ASSIGNMENTS` (
   `service_type` varchar(40) NOT NULL,
   `ip_address` varchar(40) DEFAULT NULL,
   `prefix_length` int(2) DEFAULT NULL,
-  `status` varchar(20) DEFAULT NULL,
+  `status` varchar(255) DEFAULT NULL,
   `service_instance_id` varchar(80) DEFAULT NULL,
   `last_modified_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `prev_status` varchar(20) DEFAULT NULL,
+  `info` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`plan_name`,`client_key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `EIPAM_IP_POOLS`
+--
+
+DROP TABLE IF EXISTS `EIPAM_IP_POOLS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `EIPAM_IP_POOLS` (
+  `pool_id` int(11) NOT NULL AUTO_INCREMENT,
+  `key_name` varchar(50) NOT NULL,
+  `key_value` varchar(255) NOT NULL,
+  `level` int(2) NOT NULL,
+  `plan_name` varchar(50) NOT NULL,
+  `address_family` varchar(10) NOT NULL,
+  `parent_pool` varchar(255) NOT NULL,
+  `service_instance_id` varchar(255) DEFAULT NULL,
+  `network_id` varchar(255) DEFAULT NULL,
+  `created_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `delete_failure` varchar(20) DEFAULT NULL,
+  `delete_request_id` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`pool_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=339 DEFAULT CHARSET=latin1 COMMENT='This table will capture the pools being created by SDN-C in EIPAM_IP_POOLS. There is no data migration for existing vPE pool data.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `EIPAM_IP_SUBNETS`
 --
@@ -333,13 +821,20 @@ DROP TABLE IF EXISTS `EIPAM_IP_SUBNETS`;
 CREATE TABLE `EIPAM_IP_SUBNETS` (
   `entity_id` int(6) NOT NULL,
   `service_type` varchar(40) NOT NULL,
-  `plan_name` varchar(40) NOT NULL,
+  `plan_name` varchar(50) NOT NULL,
   `address_family` varchar(10) NOT NULL,
   `ip_address` varchar(40) NOT NULL,
   `prefix_length` int(3) NOT NULL,
   `status` varchar(20) NOT NULL,
   `last_modified_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`entity_id`)
+  `network_id` varchar(255) DEFAULT NULL,
+  `pool_id` int(11) DEFAULT NULL,
+  `dealloc_failure` varchar(20) DEFAULT NULL,
+  `dealloc_request_id` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`entity_id`),
+  KEY `FK_EIPAM_IP_SUBNETS_EIPAM_IP_POOLS` (`pool_id`),
+  CONSTRAINT `EIPAM_IP_SUBNETS_ibfk_1` FOREIGN KEY (`pool_id`) REFERENCES `EIPAM_IP_POOLS` (`pool_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  CONSTRAINT `FK_EIPAM_IP_SUBNETS_EIPAM_IP_POOLS` FOREIGN KEY (`pool_id`) REFERENCES `EIPAM_IP_POOLS` (`pool_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -352,8 +847,8 @@ DROP TABLE IF EXISTS `EIPAM_IP_SUBNET_KEYS`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `EIPAM_IP_SUBNET_KEYS` (
   `entity_id` int(6) NOT NULL,
-  `key_name` varchar(255) NOT NULL,
-  `key_value` varchar(50) NOT NULL,
+  `key_name` varchar(50) NOT NULL,
+  `key_value` varchar(255) NOT NULL,
   `level` int(2) NOT NULL,
   PRIMARY KEY (`entity_id`,`key_name`,`key_value`,`level`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -382,9 +877,46 @@ CREATE TABLE `EIPAM_REQUEST_KEY` (
   `address_type` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`key_name_1`,`address_family`),
   UNIQUE KEY `IX1_EIPAM_REQUEST_KEY` (`serial_key`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `EXTERNAL_DATA`
+--
+
+DROP TABLE IF EXISTS `EXTERNAL_DATA`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `EXTERNAL_DATA` (
+  `external_data_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_id` int(11) DEFAULT NULL,
+  `param_name` varchar(30) NOT NULL,
+  `param_value` varchar(50) NOT NULL,
+  PRIMARY KEY (`external_data_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `FLOW_UPDATES`
+--
+
+DROP TABLE IF EXISTS `FLOW_UPDATES`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `FLOW_UPDATES` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `status` enum('NEW','COMPLETE','FAILED') NOT NULL DEFAULT 'NEW',
+  `create_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `last_processed_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `odl` varchar(128) DEFAULT NULL,
+  `address_family` enum('IPV4','IPV6') DEFAULT NULL,
+  `destination_prefix` varchar(50) DEFAULT NULL,
+  `communities` varchar(6000) DEFAULT NULL,
+  `route_key` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`seq`)
+) ENGINE=InnoDB AUTO_INCREMENT=276 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `GENERIC_L3_NETWORK`
 --
@@ -448,6 +980,20 @@ CREATE TABLE `GENERIC_L3_NETWORK_VPN_BINDING` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `GENERIC_RESOURCE_NAME`
+--
+
+DROP TABLE IF EXISTS `GENERIC_RESOURCE_NAME`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `GENERIC_RESOURCE_NAME` (
+  `type` varchar(50) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  PRIMARY KEY (`type`,`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `GENERIC_VNF`
 --
@@ -610,6 +1156,27 @@ CREATE TABLE `GENERIC_VPN_BINDING` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `GET_CONFIG_TEMPLATE`
+--
+
+DROP TABLE IF EXISTS `GET_CONFIG_TEMPLATE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `GET_CONFIG_TEMPLATE` (
+  `get_config_template_id` int(11) NOT NULL AUTO_INCREMENT,
+  `vnf_type` varchar(50) NOT NULL,
+  `device_interface_protocol_id` int(11) NOT NULL,
+  `xml_processing` varchar(1) DEFAULT NULL,
+  `xml_protocol` varchar(30) DEFAULT NULL,
+  `template` longtext,
+  PRIMARY KEY (`get_config_template_id`),
+  UNIQUE KEY `get_config_template_id` (`get_config_template_id`),
+  KEY `get_config_template_ibfk_1` (`device_interface_protocol_id`),
+  CONSTRAINT `get_config_template_ibfk_1` FOREIGN KEY (`device_interface_protocol_id`) REFERENCES `DEVICE_INTERFACE_PROTOCOL` (`device_interface_protocol_id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `HOSTNAME`
 --
@@ -637,7 +1204,6 @@ CREATE TABLE `HOSTNAME` (
   KEY `IN4_HOSTNAME` (`parent_hostname`),
   CONSTRAINT `FK1_HOSTNAME` FOREIGN KEY (`cust_id`) REFERENCES `CUSTOMER` (`cust_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
   CONSTRAINT `FK2_HOSTNAME` FOREIGN KEY (`loc_id`) REFERENCES `LOCATION` (`loc_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK3_HOSTNAME` FOREIGN KEY (`vendor_code`) REFERENCES `VENDOR_CODE` (`vendor_code`) ON DELETE NO ACTION ON UPDATE NO ACTION,
   CONSTRAINT `FK4_HOSTNAME` FOREIGN KEY (`parent_hostname`) REFERENCES `HOSTNAME` (`hostname`) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -658,6 +1224,24 @@ CREATE TABLE `IPV4_ADDRESS_POOL` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `LINK_MASTER`
+--
+
+DROP TABLE IF EXISTS `LINK_MASTER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `LINK_MASTER` (
+  `link_interface_ip` varchar(20) NOT NULL,
+  `source_crs_name` varchar(20) NOT NULL,
+  `destination_crs_name` varchar(20) NOT NULL,
+  `max_reserved_bw` int(11) DEFAULT NULL,
+  `default_cost` int(11) DEFAULT NULL,
+  `bundle_name` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`link_interface_ip`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `LINTERFACE_VLAN`
 --
@@ -692,7 +1276,7 @@ CREATE TABLE `LOCATION` (
   PRIMARY KEY (`loc_id`),
   KEY `IN1_LOCATION_IDX` (`city_code_id`),
   CONSTRAINT `FK1_LOCATION` FOREIGN KEY (`city_code_id`) REFERENCES `CITY_CODE` (`city_code_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=112 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=327 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -711,7 +1295,7 @@ CREATE TABLE `MAX_PORT_SPEED` (
   `unit` varchar(10) NOT NULL,
   PRIMARY KEY (`max_port_speed_id`),
   UNIQUE KEY `max_port_speed_id` (`max_port_speed_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -730,30 +1314,77 @@ CREATE TABLE `MAX_SERVER_SPEED` (
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`max_server_speed_id`),
   UNIQUE KEY `max_server_speed_id` (`max_server_speed_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `NBNC_BORDER_ELEMENT`
+-- Table structure for table `NAMING_POLICY_VM_NAME_INDEX`
 --
 
-DROP TABLE IF EXISTS `NBNC_BORDER_ELEMENT`;
+DROP TABLE IF EXISTS `NAMING_POLICY_VM_NAME_INDEX`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `NBNC_BORDER_ELEMENT` (
-  `be_id` varchar(32) NOT NULL,
-  `be_type` varchar(16) NOT NULL,
-  `be_name` varchar(32) DEFAULT NULL,
-  `be_host_vnf_id` varchar(32) DEFAULT NULL,
-  `service_type_array` varchar(512) DEFAULT NULL,
-  `tangibility` varchar(16) DEFAULT NULL,
-  `usage_order` smallint(6) DEFAULT NULL,
-  `vlan_start` smallint(6) DEFAULT NULL,
-  `vlan_end` smallint(6) DEFAULT NULL,
-  `ipv4_subnet` varchar(18) DEFAULT NULL,
-  `ipv6_subnet` varchar(68) DEFAULT NULL,
-  `network_ip` varchar(48) DEFAULT NULL,
-  `be_location` varchar(16) DEFAULT NULL,
+CREATE TABLE `NAMING_POLICY_VM_NAME_INDEX` (
+  `vm_name_prefix` varchar(255) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`vm_name_prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NAMING_POLICY_VNFC_NAME_INDEX`
+--
+
+DROP TABLE IF EXISTS `NAMING_POLICY_VNFC_NAME_INDEX`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NAMING_POLICY_VNFC_NAME_INDEX` (
+  `vnfc_name_prefix` varchar(255) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`vnfc_name_prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NBNC_ASSIGN_VPN_OVERRIDE`
+--
+
+DROP TABLE IF EXISTS `NBNC_ASSIGN_VPN_OVERRIDE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_ASSIGN_VPN_OVERRIDE` (
+  `vpn_id` varchar(12) NOT NULL DEFAULT '',
+  `vpn_rt` varchar(16) NOT NULL DEFAULT '',
+  `service_type` varchar(16) NOT NULL DEFAULT '',
+  `be_location` varchar(16) NOT NULL DEFAULT '',
+  `be_type` varchar(32) NOT NULL DEFAULT '',
+  `be_id` varchar(32) DEFAULT NULL,
+  `description` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`vpn_id`,`vpn_rt`,`service_type`,`be_location`,`be_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NBNC_BORDER_ELEMENT`
+--
+
+DROP TABLE IF EXISTS `NBNC_BORDER_ELEMENT`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_BORDER_ELEMENT` (
+  `be_id` varchar(32) NOT NULL,
+  `be_type` varchar(16) NOT NULL,
+  `be_name` varchar(32) DEFAULT NULL,
+  `be_host_vnf_id` varchar(32) DEFAULT NULL,
+  `service_type` varchar(16) DEFAULT NULL,
+  `tangibility` varchar(16) DEFAULT NULL,
+  `usage_order` smallint(6) DEFAULT NULL,
+  `vlan_start` smallint(6) DEFAULT NULL,
+  `vlan_end` smallint(6) DEFAULT NULL,
+  `ipv4_subnet` varchar(18) DEFAULT NULL,
+  `ipv6_subnet` varchar(68) DEFAULT NULL,
+  `network_ip` varchar(48) DEFAULT NULL,
+  `be_location` varchar(16) DEFAULT NULL,
   `description` varchar(128) DEFAULT NULL,
   `updated_timestamp` timestamp NULL DEFAULT NULL,
   `log_link_model_uuid` varchar(64) DEFAULT NULL,
@@ -869,6 +1500,84 @@ CREATE TABLE `NBNC_SERVICE_VLAN` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `NCS_EXPECTED_ASYNC_REQUESTS`
+--
+
+DROP TABLE IF EXISTS `NCS_EXPECTED_ASYNC_REQUESTS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NCS_EXPECTED_ASYNC_REQUESTS` (
+  `ncs_request_id` varchar(255) NOT NULL,
+  `mso_gp_request_id` varchar(255) NOT NULL,
+  `service_instance_id` varchar(255) NOT NULL,
+  `sdn_module_name` varchar(255) NOT NULL,
+  `sdn_rpc_name` varchar(255) NOT NULL,
+  `sdn_service_action` varchar(255) DEFAULT NULL,
+  `ncs_rpc` varchar(255) NOT NULL,
+  `ncs_sub_action` varchar(255) DEFAULT NULL,
+  `status` varchar(255) NOT NULL DEFAULT 'inProgress',
+  `creation_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`ncs_request_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NETWORK_INSTANCE_NAME_INDEX`
+--
+
+DROP TABLE IF EXISTS `NETWORK_INSTANCE_NAME_INDEX`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NETWORK_INSTANCE_NAME_INDEX` (
+  `network_instance_name_prefix` varchar(255) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`network_instance_name_prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NETWORK_MODEL`
+--
+
+DROP TABLE IF EXISTS `NETWORK_MODEL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NETWORK_MODEL` (
+  `customization_uuid` varchar(255) NOT NULL,
+  `service_uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  `uuid` varchar(255) DEFAULT NULL,
+  `network_type` varchar(255) DEFAULT NULL,
+  `network_role` varchar(255) DEFAULT NULL,
+  `network_technology` varchar(255) DEFAULT NULL,
+  `network_scope` varchar(255) DEFAULT NULL,
+  `naming_policy` varchar(255) DEFAULT NULL,
+  `ecomp_generated_naming` char(1) DEFAULT NULL,
+  `is_shared_network` char(1) DEFAULT NULL,
+  `is_external_network` char(1) DEFAULT NULL,
+  `is_provider_network` char(1) DEFAULT NULL,
+  `physical_network_name` varchar(255) DEFAULT NULL,
+  `is_bound_to_vpn` char(1) DEFAULT NULL,
+  `vpn_binding` varchar(255) DEFAULT NULL,
+  `use_ipv4` char(1) DEFAULT NULL,
+  `ipv4_dhcp_enabled` char(1) DEFAULT NULL,
+  `ipv4_ip_version` char(1) DEFAULT NULL,
+  `ipv4_cidr_mask` varchar(255) DEFAULT NULL,
+  `eipam_v4_address_plan` varchar(255) DEFAULT NULL,
+  `use_ipv6` char(1) DEFAULT NULL,
+  `ipv6_dhcp_enabled` char(1) DEFAULT NULL,
+  `ipv6_ip_version` char(1) DEFAULT NULL,
+  `ipv6_cidr_mask` varchar(255) DEFAULT NULL,
+  `eipam_v6_address_plan` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`customization_uuid`),
+  KEY `FK_NETWORK_MODEL` (`service_uuid`),
+  CONSTRAINT `FK_NETWORK_MODEL` FOREIGN KEY (`service_uuid`) REFERENCES `SERVICE_MODEL` (`service_uuid`) ON DELETE NO ACTION ON UPDATE NO ACTION
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `NETWORK_PROFILE`
 --
@@ -910,6 +1619,35 @@ CREATE TABLE `NODE_TYPES` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `OBJECT_GROUPING`
+--
+
+DROP TABLE IF EXISTS `OBJECT_GROUPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `OBJECT_GROUPING` (
+  `group_id` varchar(128) NOT NULL,
+  `group_type` varchar(128) NOT NULL,
+  PRIMARY KEY (`group_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `OBJECT_GROUP_MEMBER_TRACKING`
+--
+
+DROP TABLE IF EXISTS `OBJECT_GROUP_MEMBER_TRACKING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `OBJECT_GROUP_MEMBER_TRACKING` (
+  `group_id` varchar(128) NOT NULL,
+  `key_id` varchar(128) NOT NULL,
+  `key_type` varchar(128) NOT NULL,
+  PRIMARY KEY (`group_id`,`key_id`,`key_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `PARAMETERS`
 --
@@ -919,13 +1657,45 @@ DROP TABLE IF EXISTS `PARAMETERS`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `PARAMETERS` (
   `name` varchar(100) NOT NULL,
-  `value` varchar(24) NOT NULL,
+  `value` varchar(128) NOT NULL,
   `category` varchar(24) DEFAULT NULL,
   `memo` varchar(128) DEFAULT NULL,
   PRIMARY KEY (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `PE_INV`
+--
+
+DROP TABLE IF EXISTS `PE_INV`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `PE_INV` (
+  `EQUIP_ID` int(11) DEFAULT NULL,
+  `EQUIP_TYPE` varchar(20) DEFAULT NULL,
+  `PTNII_EQUIP_NAME` varchar(20) DEFAULT NULL,
+  `IP_ADDR` varchar(15) DEFAULT NULL,
+  `ROUTER_PROV_STATUS` varchar(50) DEFAULT NULL,
+  `REGION` varchar(16) DEFAULT NULL,
+  `COUNTRY_ABBR` varchar(50) DEFAULT NULL,
+  `EQUIP_NAME_CODE` varchar(50) DEFAULT NULL,
+  `AS_NUMBER` varchar(5) DEFAULT NULL,
+  `LOOPBACK1` varchar(15) DEFAULT NULL,
+  `LOOPBACK2` varchar(15) DEFAULT NULL,
+  `LOOPBACK3` varchar(15) DEFAULT NULL,
+  `LOOPBACK40` varchar(15) DEFAULT NULL,
+  `LOOPBACK65535` varchar(15) DEFAULT NULL,
+  `INMS_LIST` varchar(20) DEFAULT NULL,
+  `ENCRYPTED_ACCESS_FLAG` varchar(50) DEFAULT NULL,
+  `SW_NAME` varchar(100) DEFAULT NULL,
+  `NMIPADDR` varchar(15) DEFAULT NULL,
+  `CREATE_DATE` datetime DEFAULT NULL,
+  `MOD_DATE` datetime DEFAULT NULL,
+  `FCN_CODE` varchar(50) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `PHYSICAL_LINK`
 --
@@ -976,6 +1746,22 @@ CREATE TABLE `PINTERFACE` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `POLICY_UPDATE_NOTIFICATION`
+--
+
+DROP TABLE IF EXISTS `POLICY_UPDATE_NOTIFICATION`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `POLICY_UPDATE_NOTIFICATION` (
+  `policy_name` varchar(255) NOT NULL,
+  `version_id` varchar(255) NOT NULL,
+  `update_type` varchar(255) NOT NULL,
+  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`policy_name`,`version_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `PORTAL_USERS`
 --
@@ -984,10 +1770,36 @@ DROP TABLE IF EXISTS `PORTAL_USERS`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `PORTAL_USERS` (
-  `email` varchar(64) NOT NULL,
-  `password` varbinary(255) NOT NULL,
+  `attuid` varchar(6) NOT NULL,
+  `firstName` varchar(25) DEFAULT NULL,
+  `lastName` varchar(25) DEFAULT NULL,
+  `role` varchar(25) DEFAULT NULL,
   `privilege` char(1) NOT NULL,
-  PRIMARY KEY (`email`)
+  `last_login` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`attuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+
+--
+-- Table structure for table `PREPARE_FILE_RELATIONSHIP`
+--
+
+DROP TABLE IF EXISTS `PREPARE_FILE_RELATIONSHIP`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `PREPARE_FILE_RELATIONSHIP` (
+  `prepare_file_relationship_id` int(11) NOT NULL AUTO_INCREMENT,
+  `service_instance_id` varchar(50) DEFAULT NULL,
+  `request_id` varchar(255) DEFAULT NULL,
+  `config_file_id` int(11) DEFAULT NULL,
+  `asdc_artifacts_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`prepare_file_relationship_id`),
+  UNIQUE KEY `prepare_file_relationship_id` (`prepare_file_relationship_id`),
+  KEY `ie_prepare_file_relationship` (`config_file_id`),
+  KEY `ie2_prepare_file_relationship` (`asdc_artifacts_id`),
+  CONSTRAINT `prepare_file_relationship_ibfk_2` FOREIGN KEY (`asdc_artifacts_id`) REFERENCES `ASDC_ARTIFACTS` (`asdc_artifacts_id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+  CONSTRAINT `prepare_file_replationship_ibfk_1` FOREIGN KEY (`config_file_id`) REFERENCES `CONFIGFILES` (`config_file_id`) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1004,10 +1816,11 @@ CREATE TABLE `PRE_LOAD_VNF_DATA` (
   `svc_action` varchar(40) DEFAULT '',
   `status` varchar(10) NOT NULL DEFAULT 'pending',
   `filename` varchar(100) NOT NULL,
+  `attuid` varchar(8) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `preload_data` longblob,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=105 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=295 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1023,10 +1836,11 @@ CREATE TABLE `PRE_LOAD_VNF_NETWORK_DATA` (
   `svc_action` varchar(40) DEFAULT '',
   `status` varchar(10) NOT NULL DEFAULT 'pending',
   `filename` varchar(100) NOT NULL,
+  `attuid` varchar(8) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `preload_data` longblob,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=104 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=278 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1047,7 +1861,7 @@ CREATE TABLE `PSERVER` (
   `equip_model` varchar(255) DEFAULT '',
   `fqdn` varchar(255) DEFAULT '',
   `pserver_selflink` varchar(255) DEFAULT '',
-  `ipv4_oam_address` varchar(40) DEFAULT NULL,
+  `ipv4_oam_address` varchar(15) DEFAULT '',
   `serial_number` varchar(255) DEFAULT '',
   `pserver_id` varchar(255) DEFAULT '',
   `internet_topology` varchar(40) DEFAULT '',
@@ -1075,7 +1889,49 @@ CREATE TABLE `RANGE_RULE` (
   `min_value` int(11) NOT NULL,
   `max_value` int(11) NOT NULL,
   PRIMARY KEY (`range_rule_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `REQUEST_PROGRESS`
+--
+
+DROP TABLE IF EXISTS `REQUEST_PROGRESS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `REQUEST_PROGRESS` (
+  `request_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_type` varchar(20) DEFAULT NULL,
+  `service_instance_id` varchar(80) NOT NULL,
+  `request_instance_type` varchar(20) NOT NULL,
+  `originating_service_instance_id` varchar(80) DEFAULT NULL,
+  `originating_service_type` varchar(20) DEFAULT NULL,
+  `overall_status` varchar(20) DEFAULT NULL,
+  `status_date` varchar(80) DEFAULT NULL,
+  `message` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`request_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `REQUEST_PROGRESS_STATE`
+--
+
+DROP TABLE IF EXISTS `REQUEST_PROGRESS_STATE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `REQUEST_PROGRESS_STATE` (
+  `request_progress_state_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_id` int(11) DEFAULT NULL,
+  `service_instance_id` varchar(80) NOT NULL,
+  `request_instance_type` varchar(20) NOT NULL,
+  `progress_state` varchar(30) DEFAULT NULL,
+  `transaction_status` varchar(20) DEFAULT NULL,
+  `status_date` varchar(80) DEFAULT NULL,
+  `response_code` varchar(20) DEFAULT NULL,
+  `message` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`request_progress_state_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1097,7 +1953,7 @@ CREATE TABLE `RESOURCE` (
   PRIMARY KEY (`resource_id`),
   UNIQUE KEY `resource_id` (`resource_id`),
   UNIQUE KEY `IX1_RESOURCE` (`asset_id`,`resource_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=179 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1129,7 +1985,7 @@ DROP TABLE IF EXISTS `RESOURCE_LOCK`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `RESOURCE_LOCK` (
   `resource_lock_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_name` varchar(50) NOT NULL,
+  `resource_name` varchar(256) DEFAULT NULL,
   `lock_holder` varchar(100) NOT NULL,
   `lock_count` smallint(6) NOT NULL,
   `lock_time` datetime NOT NULL,
@@ -1137,7 +1993,7 @@ CREATE TABLE `RESOURCE_LOCK` (
   PRIMARY KEY (`resource_lock_id`),
   UNIQUE KEY `resource_lock_id` (`resource_lock_id`),
   UNIQUE KEY `IX1_RESOURCE_LOCK` (`resource_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2951 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=29681 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1160,7 +2016,7 @@ CREATE TABLE `RESOURCE_RULE` (
   `hard_limit_expression` varchar(2000) NOT NULL,
   PRIMARY KEY (`resource_rule_id`),
   UNIQUE KEY `resource_rule_id` (`resource_rule_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1179,6 +2035,35 @@ CREATE TABLE `RESOURCE_THRESHOLD` (
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `ROUTER_MASTER`
+--
+
+DROP TABLE IF EXISTS `ROUTER_MASTER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ROUTER_MASTER` (
+  `crs_name` varchar(20) NOT NULL,
+  `loopback_ip` varchar(20) NOT NULL,
+  PRIMARY KEY (`crs_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `ROUTING_CHARACTERISTIC_MAPPING`
+--
+
+DROP TABLE IF EXISTS `ROUTING_CHARACTERISTIC_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ROUTING_CHARACTERISTIC_MAPPING` (
+  `network_role` varchar(255) NOT NULL,
+  `vrf_name` varchar(255) NOT NULL,
+  `routing_characteristic` varchar(255) NOT NULL,
+  PRIMARY KEY (`network_role`,`vrf_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `SERVICE_HOMING`
 --
@@ -1219,6 +2104,20 @@ CREATE TABLE `SERVICE_HOMING_BACKUP` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `SERVICE_INSTANCE_NAME_INDEX`
+--
+
+DROP TABLE IF EXISTS `SERVICE_INSTANCE_NAME_INDEX`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_INSTANCE_NAME_INDEX` (
+  `service_instance_name_prefix` varchar(255) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`service_instance_name_prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `SERVICE_MANAGER_CREDENTIALS`
 --
@@ -1233,6 +2132,57 @@ CREATE TABLE `SERVICE_MANAGER_CREDENTIALS` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `SERVICE_MODEL`
+--
+
+DROP TABLE IF EXISTS `SERVICE_MODEL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_MODEL` (
+  `service_uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `description` varchar(1024) DEFAULT NULL,
+  `type` varchar(255) DEFAULT NULL,
+  `category` varchar(255) DEFAULT NULL,
+  `ecomp_naming` char(1) DEFAULT NULL,
+  `service_instance_name_prefix` varchar(255) DEFAULT NULL,
+  `filename` varchar(100) DEFAULT NULL,
+  `naming_policy` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`service_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `SERVICE_PROXY`
+--
+
+DROP TABLE IF EXISTS `SERVICE_PROXY`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_PROXY` (
+  `port_mirror_service_uuid` varchar(255) NOT NULL,
+  `service_proxy_name` varchar(255) NOT NULL,
+  `source_service_uuid` varchar(255) NOT NULL,
+  `resources_vendor` varchar(255) DEFAULT NULL,
+  `resource_vendor_release` varchar(255) DEFAULT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `category` varchar(255) DEFAULT NULL,
+  `subcategory` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `role` varchar(255) NOT NULL,
+  `uuid` varchar(255) DEFAULT NULL,
+  `customization_uuid` varchar(255) DEFAULT NULL,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`port_mirror_service_uuid`,`service_proxy_name`),
+  KEY `FK_SERVICE_PROXY_SOURCE_TO_SERVICE_MODE` (`source_service_uuid`),
+  CONSTRAINT `FK_SERVICE_PROXY_MIRROR_TO_SERVICE_MODE` FOREIGN KEY (`port_mirror_service_uuid`) REFERENCES `SERVICE_MODEL` (`service_uuid`) ON DELETE CASCADE ON UPDATE NO ACTION
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `SERVICE_RESOURCE`
 --
@@ -1250,7 +2200,51 @@ CREATE TABLE `SERVICE_RESOURCE` (
   PRIMARY KEY (`service_instance_id`,`service_change_number`),
   UNIQUE KEY `service_resource_id` (`service_resource_id`),
   KEY `IX1_SERVICE_RESOURCE` (`service_instance_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2203 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=955 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `SERVICE_TYPE_MAPPING`
+--
+
+DROP TABLE IF EXISTS `SERVICE_TYPE_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_TYPE_MAPPING` (
+  `sdnc_service_type` varchar(128) NOT NULL,
+  `ncs_service_type` varchar(128) NOT NULL,
+  PRIMARY KEY (`sdnc_service_type`,`ncs_service_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `SUBNETPOOL_MAPPING`
+--
+
+DROP TABLE IF EXISTS `SUBNETPOOL_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SUBNETPOOL_MAPPING` (
+  `aic_cloud_region` varchar(16) NOT NULL,
+  `ntc` varchar(32) NOT NULL,
+  `lcp` varchar(32) NOT NULL,
+  `aic_region_id` varchar(255) NOT NULL,
+  PRIMARY KEY (`aic_cloud_region`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `SUPPORTED_SEQUENCE_NUMBER`
+--
+
+DROP TABLE IF EXISTS `SUPPORTED_SEQUENCE_NUMBER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SUPPORTED_SEQUENCE_NUMBER` (
+  `resource_sequence_number` varchar(10) NOT NULL,
+  `resource_type` varchar(10) NOT NULL,
+  PRIMARY KEY (`resource_sequence_number`,`resource_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1267,10 +2261,50 @@ CREATE TABLE `SVC_LOGIC` (
   `mode` varchar(5) NOT NULL,
   `active` varchar(1) NOT NULL,
   `graph` longblob,
+  `modified_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `md5sum` varchar(128) DEFAULT NULL,
   PRIMARY KEY (`module`,`rpc`,`version`,`mode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `TABLE_CLEANUP_CONFIGURATION`
+--
+
+DROP TABLE IF EXISTS `TABLE_CLEANUP_CONFIGURATION`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TABLE_CLEANUP_CONFIGURATION` (
+  `table_name` varchar(255) NOT NULL COMMENT 'The name of the table the cleanup will be performed on',
+  `days_old` int(11) NOT NULL COMMENT 'Records older than the current date minus DAYS_OLD will be deleted',
+  `date_column` varchar(255) NOT NULL COMMENT 'The name of the column containing the date to be checked',
+  `commit_interval` int(11) NOT NULL DEFAULT '2500' COMMENT 'The maximum number of rows a commit may contain',
+  `query_clause` varchar(1000) DEFAULT NULL COMMENT 'An optional additional query clause to further restrict deletion criteria',
+  `child_table_name` varchar(255) DEFAULT NULL,
+  `child_table_pk` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`table_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This table will be used by the table clean-up script, tableCleanup.sh, to drive what tables should be purged and what the purge criteria are.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `TASK_TEMPLATE`
+--
+
+DROP TABLE IF EXISTS `TASK_TEMPLATE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TASK_TEMPLATE` (
+  `task_template_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_type` varchar(20) DEFAULT NULL,
+  `task_name` varchar(30) NOT NULL,
+  `task_category` varchar(50) NOT NULL,
+  `ecomp_task` varchar(50) NOT NULL,
+  `initial_load` varchar(1) NOT NULL,
+  `service` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`task_template_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `TENANT`
 --
@@ -1286,6 +2320,19 @@ CREATE TABLE `TENANT` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `TESTTBL`
+--
+
+DROP TABLE IF EXISTS `TESTTBL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TESTTBL` (
+  `pk` varchar(25) NOT NULL,
+  `col1` varchar(25) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `THRESHOLD_NOTIFICATION`
 --
@@ -1301,6 +2348,158 @@ CREATE TABLE `THRESHOLD_NOTIFICATION` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `TMP_AIC_AVAIL_ZONE_POOL`
+--
+
+DROP TABLE IF EXISTS `TMP_AIC_AVAIL_ZONE_POOL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TMP_AIC_AVAIL_ZONE_POOL` (
+  `aic_site_id` varchar(100) NOT NULL,
+  `status` varchar(40) NOT NULL,
+  `availability_zone` varchar(100) NOT NULL,
+  `token` int(4) NOT NULL,
+  `vnf_id` varchar(80) DEFAULT NULL,
+  `service_type` varchar(100) NOT NULL,
+  `vnf_type` varchar(20) DEFAULT NULL,
+  `hypervisor` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`aic_site_id`,`availability_zone`,`token`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `TOPOLOGY_PARAMETER`
+--
+
+DROP TABLE IF EXISTS `TOPOLOGY_PARAMETER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TOPOLOGY_PARAMETER` (
+  `parameter_id` int(11) NOT NULL,
+  `parameter_name` varchar(20) NOT NULL,
+  `parameter_set` int(11) NOT NULL,
+  `create_update_time` datetime NOT NULL,
+  `create_update_user` varchar(40) NOT NULL,
+  PRIMARY KEY (`parameter_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `TOPOLOGY_PARAMETER_ENTRIES`
+--
+
+DROP TABLE IF EXISTS `TOPOLOGY_PARAMETER_ENTRIES`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TOPOLOGY_PARAMETER_ENTRIES` (
+  `parameter_entry_id` int(11) NOT NULL,
+  `parameter_name` varchar(255) NOT NULL,
+  `parameter_value` varchar(64) NOT NULL,
+  `create_update_time` datetime NOT NULL,
+  `create_update_user` varchar(40) NOT NULL,
+  PRIMARY KEY (`parameter_entry_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `TOPOLOGY_PARAMETER_TO_ENTRIES`
+--
+
+DROP TABLE IF EXISTS `TOPOLOGY_PARAMETER_TO_ENTRIES`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TOPOLOGY_PARAMETER_TO_ENTRIES` (
+  `parameter_id` int(11) DEFAULT NULL,
+  `parameter_entry_id` int(11) DEFAULT NULL,
+  `entry_order` int(11) DEFAULT NULL,
+  `create_update_time` datetime DEFAULT NULL,
+  `create_update_user` varchar(40) NOT NULL,
+  KEY `FK1_TOPOLOGY_PARAMETER_TO_ENTRIES` (`parameter_id`),
+  KEY `FK2_TOPOLOGY_PARAMETER_TO_ENTRIES` (`parameter_entry_id`),
+  CONSTRAINT `FK1_TOPOLOGY_PARAMETER_TO_ENTRIES` FOREIGN KEY (`parameter_id`) REFERENCES `TOPOLOGY_PARAMETER` (`parameter_id`),
+  CONSTRAINT `FK2_TOPOLOGY_PARAMETER_TO_ENTRIES` FOREIGN KEY (`parameter_entry_id`) REFERENCES `TOPOLOGY_PARAMETER_ENTRIES` (`parameter_entry_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `TRANSACTION_LOG`
+--
+
+DROP TABLE IF EXISTS `TRANSACTION_LOG`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TRANSACTION_LOG` (
+  `serial_key` int(10) NOT NULL AUTO_INCREMENT,
+  `log_time` varchar(40) NOT NULL,
+  `request_id` varchar(80) DEFAULT NULL,
+  `svc_request_id` varchar(80) DEFAULT NULL,
+  `x_ecomp_request_id` varchar(80) DEFAULT NULL,
+  `graph_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`serial_key`)
+) ENGINE=InnoDB AUTO_INCREMENT=249 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+
+--
+-- Table structure for table `UPLOAD_CONFIG`
+--
+
+DROP TABLE IF EXISTS `UPLOAD_CONFIG`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `UPLOAD_CONFIG` (
+  `upload_config_id` int(11) NOT NULL AUTO_INCREMENT,
+  `request_id` varchar(50) DEFAULT NULL,
+  `originator_id` varchar(50) DEFAULT NULL,
+  `service_description` varchar(100) DEFAULT NULL,
+  `action` varchar(50) DEFAULT NULL,
+  `upload_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `vnf_id` varchar(50) DEFAULT NULL,
+  `vnf_name` varchar(50) DEFAULT NULL,
+  `vm_name` varchar(50) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `vnfc_type` varchar(50) DEFAULT NULL,
+  `host_ip_address` varchar(50) DEFAULT NULL,
+  `config_indicator` varchar(25) DEFAULT NULL,
+  `pending_delete` varchar(1) DEFAULT NULL,
+  `content` longtext,
+  PRIMARY KEY (`upload_config_id`),
+  UNIQUE KEY `upload_config_id` (`upload_config_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `USED_SEQUENCE_NUMBER`
+--
+
+DROP TABLE IF EXISTS `USED_SEQUENCE_NUMBER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `USED_SEQUENCE_NUMBER` (
+  `resource_sequence_number` varchar(10) NOT NULL,
+  `resource_type` varchar(10) NOT NULL,
+  `zone_region_id` varchar(50) NOT NULL,
+  PRIMARY KEY (`resource_sequence_number`,`resource_type`,`zone_region_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `USER_TRACE`
+--
+
+DROP TABLE IF EXISTS `USER_TRACE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `USER_TRACE` (
+  `user_trace_seq` int(11) NOT NULL AUTO_INCREMENT,
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `identity` varchar(12) DEFAULT NULL,
+  `action` varchar(128) DEFAULT NULL,
+  `description` varchar(256) DEFAULT NULL,
+  PRIMARY KEY (`user_trace_seq`)
+) ENGINE=InnoDB AUTO_INCREMENT=392 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 --
 -- Table structure for table `VENDOR_CODE`
@@ -1311,8 +2510,185 @@ DROP TABLE IF EXISTS `VENDOR_CODE`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `VENDOR_CODE` (
   `vendor_code` varchar(1) NOT NULL,
-  `vendor` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`vendor_code`)
+  `vendor` varchar(45) NOT NULL DEFAULT '',
+  PRIMARY KEY (`vendor_code`,`vendor`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VFC_MODEL`
+--
+
+DROP TABLE IF EXISTS `VFC_MODEL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VFC_MODEL` (
+  `customization_uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  `uuid` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `naming_policy` varchar(255) DEFAULT NULL,
+  `ecomp_generated_naming` char(1) DEFAULT NULL,
+  `nfc_function` varchar(255) DEFAULT NULL,
+  `nfc_naming_code` varchar(255) DEFAULT NULL,
+  `vm_type` varchar(255) DEFAULT NULL,
+  `vm_type_tag` varchar(255) DEFAULT NULL,
+  `vm_image_name` varchar(255) DEFAULT NULL,
+  `vm_flavor_name` varchar(255) DEFAULT NULL,
+  `high_availability` varchar(255) DEFAULT NULL,
+  `nfc_naming` varchar(255) DEFAULT NULL,
+  `min_instances` int(11) DEFAULT NULL,
+  `max_instances` int(11) DEFAULT NULL,
+  PRIMARY KEY (`customization_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VFC_TO_NETWORK_ROLE_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VFC_TO_NETWORK_ROLE_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VFC_TO_NETWORK_ROLE_MAPPING` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `vfc_customization_uuid` varchar(255) NOT NULL,
+  `network_role` varchar(255) NOT NULL,
+  `vm_type` varchar(255) DEFAULT NULL,
+  `network_role_tag` varchar(255) DEFAULT NULL,
+  `ipv4_count` int(11) NOT NULL,
+  `ipv6_count` int(11) NOT NULL,
+  `ipv4_use_dhcp` char(1) DEFAULT NULL,
+  `ipv6_use_dhcp` char(1) DEFAULT NULL,
+  `ipv4_ip_version` char(1) DEFAULT NULL,
+  `ipv6_ip_version` char(1) DEFAULT NULL,
+  `extcp_subnetpool_id` varchar(512) DEFAULT NULL,
+  `ipv4_floating_count` int(11) DEFAULT NULL,
+  `ipv6_floating_count` int(11) DEFAULT NULL,
+  `ipv4_address_plan_name` varchar(512) DEFAULT NULL,
+  `ipv6_address_plan_name` varchar(512) DEFAULT NULL,
+  `ipv4_vrf_name` varchar(512) DEFAULT NULL,
+  `ipv6_vrf_name` varchar(512) DEFAULT NULL,
+  `subnet_role` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`seq`),
+  KEY `IX1_VFC_TO_NETWORK_ROLE_MAPPING` (`vfc_customization_uuid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1791 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VF_MODEL`
+--
+
+DROP TABLE IF EXISTS `VF_MODEL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VF_MODEL` (
+  `customization_uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  `uuid` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `naming_policy` varchar(255) DEFAULT NULL,
+  `ecomp_generated_naming` char(1) DEFAULT NULL,
+  `avail_zone_max_count` int(11) DEFAULT NULL,
+  `nf_function` varchar(255) DEFAULT NULL,
+  `nf_code` varchar(255) DEFAULT NULL,
+  `nf_type` varchar(255) DEFAULT NULL,
+  `nf_role` varchar(255) DEFAULT NULL,
+  `vendor` varchar(255) DEFAULT NULL,
+  `vendor_version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`customization_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VF_MODULE_MODEL`
+--
+
+DROP TABLE IF EXISTS `VF_MODULE_MODEL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VF_MODULE_MODEL` (
+  `customization_uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) DEFAULT NULL,
+  `uuid` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `vf_module_type` varchar(255) DEFAULT NULL,
+  `availability_zone_count` int(11) DEFAULT NULL,
+  `ecomp_generated_vm_assignments` char(1) DEFAULT NULL,
+  PRIMARY KEY (`customization_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VF_MODULE_TO_VFC_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VF_MODULE_TO_VFC_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VF_MODULE_TO_VFC_MAPPING` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `vf_module_customization_uuid` varchar(255) NOT NULL,
+  `vfc_customization_uuid` varchar(255) NOT NULL,
+  `vm_type` varchar(255) NOT NULL,
+  `vm_count` int(11) NOT NULL,
+  PRIMARY KEY (`seq`),
+  KEY `IX1_VF_MODULE_TO_VFC_MAPPING` (`vf_module_customization_uuid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1591 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VF_TO_NETWORK_ROLE_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VF_TO_NETWORK_ROLE_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VF_TO_NETWORK_ROLE_MAPPING` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `vf_customization_uuid` varchar(255) NOT NULL,
+  `network_role` varchar(255) NOT NULL,
+  PRIMARY KEY (`seq`),
+  KEY `IX1_VF_TO_NETWORK_ROLE_MAPPING` (`vf_customization_uuid`)
+) ENGINE=InnoDB AUTO_INCREMENT=348 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VIPR_CONFIGURATION`
+--
+
+DROP TABLE IF EXISTS `VIPR_CONFIGURATION`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VIPR_CONFIGURATION` (
+  `seq` int(11) NOT NULL AUTO_INCREMENT,
+  `serial_number` varchar(255) DEFAULT NULL,
+  `vnf_id` varchar(255) DEFAULT NULL,
+  `vnf_name` varchar(255) DEFAULT NULL,
+  `ecomp_service_instance_id` varchar(255) DEFAULT NULL,
+  `vm_name` varchar(255) DEFAULT NULL,
+  `cloud_region_id` varchar(255) DEFAULT NULL,
+  `cloud_owner` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`seq`)
+) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VIPR_SZ_MANAGER_KEY`
+--
+
+DROP TABLE IF EXISTS `VIPR_SZ_MANAGER_KEY`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VIPR_SZ_MANAGER_KEY` (
+  `vipr_sz_manager_ip_addr` varchar(40) NOT NULL,
+  `vipr_sz_manager_state` varchar(10) DEFAULT NULL,
+  `vipr_sz_manager_api_key` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`vipr_sz_manager_ip_addr`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1432,6 +2808,20 @@ CREATE TABLE `VLAN_RANGES` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VM_NAME_INDEX`
+--
+
+DROP TABLE IF EXISTS `VM_NAME_INDEX`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VM_NAME_INDEX` (
+  `vm_name_prefix` varchar(255) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`vm_name_prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `VM_NETWORKS`
 --
@@ -1492,6 +2882,50 @@ CREATE TABLE `VNF` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VNFC_DG_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VNFC_DG_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VNFC_DG_MAPPING` (
+  `vnfc_dg_mapping_id` int(11) NOT NULL AUTO_INCREMENT,
+  `action` varchar(50) DEFAULT NULL,
+  `api_version` varchar(10) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `vnfc_type` varchar(50) DEFAULT NULL,
+  `dg_name` varchar(50) NOT NULL,
+  `dg_version` varchar(50) DEFAULT NULL,
+  `dg_module` varchar(50) NOT NULL,
+  PRIMARY KEY (`vnfc_dg_mapping_id`),
+  UNIQUE KEY `input_constraint` (`action`,`api_version`,`vnf_type`,`vnfc_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VNFC_REFERENCE`
+--
+
+DROP TABLE IF EXISTS `VNFC_REFERENCE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VNFC_REFERENCE` (
+  `vnfc_reference_id` int(11) NOT NULL AUTO_INCREMENT,
+  `action` varchar(50) NOT NULL,
+  `vnf_type` varchar(50) NOT NULL,
+  `vm_instance` int(11) NOT NULL,
+  `vnfc_instance` int(11) NOT NULL,
+  `vnfc_type` varchar(50) NOT NULL,
+  `vnfc_function_code` varchar(50) NOT NULL,
+  `ipaddress_v4_oam_vip` varchar(50) DEFAULT NULL,
+  `group_notation_type` varchar(50) DEFAULT NULL,
+  `group_notation_value` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`vnfc_reference_id`),
+  UNIQUE KEY `vnfc_reference_id` (`vnfc_reference_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `VNF_IMAGE`
 --
@@ -1521,7 +2955,7 @@ CREATE TABLE `VNF_MODEL_LICENSES` (
   `license_assignment_group` varchar(255) NOT NULL,
   `license_required` tinyint(1) DEFAULT NULL,
   `entitlement_assignment_group` varchar(255) DEFAULT NULL,
-  `entitlement_required` tinyint(1) DEFAULT NULL,
+  `entitlement_required` tinyint(1) DEFAULT '0',
   `feature_group_uuid` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`att_part_number`,`license_assignment_group`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -1542,6 +2976,20 @@ CREATE TABLE `VNF_MODEL_LICENSE_FEATURES` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VNF_NAME_INDEX`
+--
+
+DROP TABLE IF EXISTS `VNF_NAME_INDEX`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VNF_NAME_INDEX` (
+  `vnf_name_prefix` varchar(255) NOT NULL,
+  `index_number` int(11) NOT NULL,
+  PRIMARY KEY (`vnf_name_prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `VNF_NETWORKS`
 --
@@ -1612,6 +3060,20 @@ CREATE TABLE `VNF_PROFILE` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VNF_SERVICE_TO_NETWORK_ROLE_FILTER`
+--
+
+DROP TABLE IF EXISTS `VNF_SERVICE_TO_NETWORK_ROLE_FILTER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VNF_SERVICE_TO_NETWORK_ROLE_FILTER` (
+  `vnf_service_type` varchar(60) NOT NULL,
+  `network_role_filter` varchar(60) NOT NULL,
+  PRIMARY KEY (`vnf_service_type`,`network_role_filter`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `VPE_LOCK`
 --
@@ -1626,6 +3088,37 @@ CREATE TABLE `VPE_LOCK` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VPE_MAC_ADDRESS_POOL`
+--
+
+DROP TABLE IF EXISTS `VPE_MAC_ADDRESS_POOL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VPE_MAC_ADDRESS_POOL` (
+  `id` int(11) NOT NULL,
+  `mac_address` varchar(50) NOT NULL,
+  `sw_name` varchar(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING` (
+  `id` int(11) NOT NULL,
+  `hostname` varchar(50) NOT NULL,
+  `assigned_user` varchar(25) NOT NULL,
+  `assigned_date` date DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `VPE_POOL`
 --
@@ -1651,6 +3144,8 @@ CREATE TABLE `VPE_POOL` (
   `as_number` varchar(20) NOT NULL,
   `loopback5000` varchar(16) DEFAULT NULL,
   `loopback10` varchar(16) DEFAULT NULL,
+  `aic_version` varchar(50) DEFAULT NULL,
+  `vpe_capacity` int(11) NOT NULL,
   PRIMARY KEY (`aic_site_id`,`vpe_name`,`availability_zone`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1679,6 +3174,34 @@ CREATE TABLE `VPLSPE_POOL` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VPN_BINDINGS`
+--
+
+DROP TABLE IF EXISTS `VPN_BINDINGS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VPN_BINDINGS` (
+  `network_customization_uuid` varchar(255) NOT NULL,
+  `binding_uuid` varchar(255) NOT NULL,
+  PRIMARY KEY (`network_customization_uuid`,`binding_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `VRR_FUNCTION_CODE_VMTYPE_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VRR_FUNCTION_CODE_VMTYPE_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VRR_FUNCTION_CODE_VMTYPE_MAPPING` (
+  `ptnii_function_code` varchar(128) NOT NULL,
+  `vm_type` varchar(128) NOT NULL,
+  PRIMARY KEY (`ptnii_function_code`,`vm_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `VSERVER`
 --
@@ -1730,6 +3253,21 @@ CREATE TABLE `VSERVER_PSERVER` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `VVIG_VM_INSTANCE_TO_CLOUD_REGION_MAPPING`
+--
+
+DROP TABLE IF EXISTS `VVIG_VM_INSTANCE_TO_CLOUD_REGION_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VVIG_VM_INSTANCE_TO_CLOUD_REGION_MAPPING` (
+  `key_id` varchar(128) NOT NULL,
+  `cloud_region` varchar(128) NOT NULL,
+  `key_type` varchar(128) NOT NULL,
+  PRIMARY KEY (`key_id`,`cloud_region`,`key_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `WAN_COMBO_ALLOWABLE`
 --
@@ -1739,72 +3277,23 @@ DROP TABLE IF EXISTS `WAN_COMBO_ALLOWABLE`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `WAN_COMBO_ALLOWABLE` (
   `combo_sequence` int(11) NOT NULL AUTO_INCREMENT,
+  `topology` varchar(16) DEFAULT 'unknown',
   `internet_topology` varchar(20) DEFAULT NULL,
   `wan1` varchar(40) DEFAULT NULL,
   `wan2` varchar(40) DEFAULT NULL,
-  `new_start_release` char(5) DEFAULT NULL,
+  `new_start_release_flexware` varchar(16) DEFAULT 'unknown',
+  `is_active_flexware` varchar(1) DEFAULT 'N',
+  `new_start_release_dhv` varchar(16) DEFAULT 'unknown',
+  `is_active_dhv` varchar(1) DEFAULT 'N',
+  `ucpe_type` varchar(32) DEFAULT 'stand-alone',
   `description` varchar(128) NOT NULL,
   PRIMARY KEY (`combo_sequence`),
   UNIQUE KEY `IX1_WAN_COMBO_ALLOWABLE` (`internet_topology`,`wan1`,`wan2`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `emp1000`
---
 
-DROP TABLE IF EXISTS `emp1000`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `emp1000` (
-  `firstName` varchar(20) DEFAULT NULL,
-  `lastName` varchar(20) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `linda`
---
-
-DROP TABLE IF EXISTS `linda`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `linda` (
-  `c1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `testit`
---
-
-DROP TABLE IF EXISTS `testit`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `testit` (
-  `c1` varchar(12) DEFAULT NULL,
-  `c2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `testtable`
---
-
-DROP TABLE IF EXISTS `testtable`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `testtable` (
-  `city_code_id` int(11) NOT NULL AUTO_INCREMENT,
-  `city_code` varchar(3) NOT NULL,
-  `city` varchar(150) NOT NULL,
-  `state` varchar(10) NOT NULL,
-  `country_code` varchar(10) NOT NULL,
-  PRIMARY KEY (`city_code_id`),
-  KEY `IN1_testtable` (`city`,`state`,`country_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=37756 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1815,4 +3304,4 @@ SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-11-23 16:01:55
+-- Dump completed on 2017-10-04 18:23:01
index 4b0ef59..ba9bd32 100644 (file)
@@ -24,7 +24,7 @@ services:
 
 
   sdnc:
-    image: nexus3.onap.org:10003/onap/sdnc-image:latest
+    image: nexus3.onap.org:10001/onap/sdnc-image:latest
     depends_on :
       - db
     container_name: sdnc_controller_container
@@ -49,7 +49,7 @@ services:
 
 
   web:
-    image: nexus3.onap.org:10003/onap/admportal-sdnc-image:latest
+    image: nexus3.onap.org:10001/onap/admportal-sdnc-image:latest
     depends_on:
       - db
     container_name: sdnc_portal_container
@@ -75,7 +75,7 @@ services:
 
 
   dgbuilder:
-    image: nexus3.onap.org:10003/onap/ccsdk-dgbuilder-image:latest
+    image: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:latest
     depends_on:
       - db
     container_name:  sdnc_dgbuilder_container
index dcdad12..9b3ea39 100644 (file)
@@ -1 +1 @@
-[{"id":"801f066a.b0dc78","type":"dgstart","name":"DGSTART","outputs":1,"x":157.14285278320312,"y":142.85714721679688,"z":"af933c87.e6ed2","wires":[["e18183e1.8fe97"]]},{"id":"e18183e1.8fe97","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<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='VNF-API' version='${project.version}'>","outputs":1,"x":190.1428680419922,"y":193.96824645996094,"z":"af933c87.e6ed2","wires":[["c2c81abc.5ef068"]]},{"id":"c2c81abc.5ef068","type":"method","name":"preload-vnf-topology-operation","xml":"<method rpc=\"preload-vnf-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":277.4761962890625,"y":239.079345703125,"z":"af933c87.e6ed2","wires":[["d99d320d.a2f5b"]]},{"id":"d99d320d.a2f5b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":205.36505126953125,"y":392.5238037109375,"z":"af933c87.e6ed2","wires":[["32a6de67.f9d9c2"]]},{"id":"fbc3b2b4.65da","type":"comment","name":"preload-vnf-topology-operation","info":"","comments":"","x":738.8550224304199,"y":149.624831199646,"z":"af933c87.e6ed2","wires":[]},{"id":"4ac1b7d7.ddfd18","type":"comment","name":"request-action = PreloadVNFRequest, svc-action = reserve","info":"","comments":"","x":747.6428489685059,"y":187.30159378051758,"z":"af933c87.e6ed2","wires":[]},{"id":"32a6de67.f9d9c2","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vnf-topology-operation-input.request-information.request-action`\">\n<!--\nleaf request-action { \n\t\t\t\ttype enumeration { \n\t\t\t\t\tenum \"VNFActivateRequest\";\n\t\t\t\t\tenum \"ChangeVNFActivateRequest\";\n\t\t\t\t\tenum \"DisconnectVNFRequest\";\n\t\t\t\t\tenum \"PreloadVNFRequest\";\n\t\t\t\t\tenum \"DeletePreloadVNFRequest\";\n\t\t\t\t} \n}\n-->\n\n","comments":"","outputs":1,"x":472.1428527832031,"y":412.6248321533203,"z":"af933c87.e6ed2","wires":[["746b551f.5d126c","e0847cbc.ccd41","8a159dc0.caad9"]]},{"id":"746b551f.5d126c","type":"other","name":"PreloadVNFRequest","xml":"<outcome value='PreloadVNFRequest'>","comments":"","outputs":1,"x":700.1428527832031,"y":413.6248321533203,"z":"af933c87.e6ed2","wires":[["dc3995bf.89a618"]]},{"id":"e0847cbc.ccd41","type":"other","name":"DeletePreloadVNFRequest","xml":"<outcome value='DeletePreloadVNFRequest'>","comments":"","outputs":1,"x":701.7141647338867,"y":787.4819803237915,"z":"af933c87.e6ed2","wires":[["35c06d75.3e6e22"]]},{"id":"d673e349.801f1","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1171.7141647338867,"y":829.4819803237915,"z":"af933c87.e6ed2","wires":[]},{"id":"15c1623d.0bf0de","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1154.7141647338867,"y":869.4819803237915,"z":"af933c87.e6ed2","wires":[]},{"id":"8a159dc0.caad9","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":669.7141647338867,"y":907.4819803237915,"z":"af933c87.e6ed2","wires":[["3fdbbdcc.ec8552"]]},{"id":"3fdbbdcc.ec8552","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":911.796257019043,"y":905.9452981948853,"z":"af933c87.e6ed2","wires":[]},{"id":"dc3995bf.89a618","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":940.1428527832031,"y":412.6248321533203,"z":"af933c87.e6ed2","wires":[["80277d89.896ec","17222165.cf338f","8a225617.3f8438","6c2d3b1f.113b84","ed4d291e.10d3c8","336476ae.fb219a","8681604e.8241e"]]},{"id":"336476ae.fb219a","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1198.1428985595703,"y":649.0534019470215,"z":"af933c87.e6ed2","wires":[]},{"id":"ed4d291e.10d3c8","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1273.1668243408203,"y":609.1408348083496,"z":"af933c87.e6ed2","wires":[]},{"id":"80277d89.896ec","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1219.0517196655273,"y":411.77573585510254,"z":"af933c87.e6ed2","wires":[]},{"id":"8a225617.3f8438","type":"get-resource","name":"get-resource: vnf-profile.vnf-type","xml":"<get-resource plugin=\"`$sql-resource-plugin`\" resource=\"vnf-profile\" key=\"SELECT * from VNF_PROFILE WHERE vnf_type = $preload-vnf-topology-operation-input.vnf-topology-information.vnf-topology-identifier.vnf-type\">\n","comments":"","outputs":1,"x":1251.662986755371,"y":491.2202548980713,"z":"af933c87.e6ed2","wires":[["b689b3e9.ba446","5c0513ef.b3e9ec"]]},{"id":"4b4f249d.14da3c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name=\"error-code\" value=\"404\" />\n\t<parameter name=\"error-message\" value=\"preload vnf-type not found as valid vnf \" />","comments":"","x":1741.9961776733398,"y":490.4424228668213,"z":"af933c87.e6ed2","wires":[]},{"id":"b689b3e9.ba446","type":"success","name":"not found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1528.6629257202148,"y":490.9979648590088,"z":"af933c87.e6ed2","wires":[["4b4f249d.14da3c"]]},{"id":"17222165.cf338f","type":"set","name":"set : sql-resource-plugin","xml":"<set only-if-unset=\"true\">\n<parameter name=\"sql-resource-plugin\" value=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\"/>","comments":"","x":1239.8749618530273,"y":450.65452003479004,"z":"af933c87.e6ed2","wires":[]},{"id":"6c2d3b1f.113b84","type":"set","name":"set: preload-data += input","xml":"<set>\n<parameter name=\"preload-data.\" value=\"preload-vnf-topology-operation-input.\" />\n","comments":"","x":1231.083511352539,"y":569.6862754821777,"z":"af933c87.e6ed2","wires":[]},{"id":"5c0513ef.b3e9ec","type":"success","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1520.9406356811523,"y":532.543436050415,"z":"af933c87.e6ed2","wires":[["4b4f249d.14da3c"]]},{"id":"35c06d75.3e6e22","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":940.7141647338867,"y":788.4819803237915,"z":"af933c87.e6ed2","wires":[["79961f40.3cf","d673e349.801f1","15c1623d.0bf0de"]]},{"id":"79961f40.3cf","type":"get-resource","name":"get-resource: vnf-profile.vnf-type","xml":"<get-resource plugin=\"`$sql-resource-plugin`\" resource=\"generic-vnf\" key=\"SELECT * FROM VNF_PROFILE vnf-type = $preload-vnf-topology-operation-input.vnf-topology-information.vnf-topology-identifier.vnf-type\">\n","comments":"","outputs":1,"x":1209.7141647338867,"y":788.4819803237915,"z":"af933c87.e6ed2","wires":[["1fd023bc.5199cc"]]},{"id":"1fd023bc.5199cc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1476.7141647338867,"y":787.4819803237915,"z":"af933c87.e6ed2","wires":[["b6d0d5d9.aebe58"]]},{"id":"b6d0d5d9.aebe58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name=\"error-code\" value=\"3000\" />\n\t<parameter name=\"error-message\" value=\"preload vnf-type cannot be deleted while vnf is in use\" />","comments":"","x":1690.7141647338867,"y":787.4819803237915,"z":"af933c87.e6ed2","wires":[]},{"id":"9e800613.ce4818","type":"comment","name":"request-action = DeletePreloadVNFRequest, svc-action = delete","info":"","comments":"","x":756.1428527832031,"y":224.6248321533203,"z":"af933c87.e6ed2","wires":[]},{"id":"8681604e.8241e","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1213.8571548461914,"y":529.857177734375,"z":"af933c87.e6ed2","wires":[]}]
\ No newline at end of file
+[{"id":"d3e2dd72.f3eb28","type":"dgstart","name":"DGSTART","outputs":1,"x":153,"y":80,"z":"ec010968.e7b3c8","wires":[["89fa3693.857fc"]]},{"id":"89fa3693.857fc","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<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='VNF-API' version='${project.version}'>","outputs":1,"x":186.00001525878906,"y":131.11109924316406,"z":"ec010968.e7b3c8","wires":[["f67f175f.4ffd08"]]},{"id":"f67f175f.4ffd08","type":"method","name":"preload-vnf-topology-operation","xml":"<method rpc=\"preload-vnf-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":273.3333435058594,"y":176.22219848632812,"z":"ec010968.e7b3c8","wires":[["84f2afd6.541b48"]]},{"id":"84f2afd6.541b48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":201.22219848632812,"y":329.6666564941406,"z":"ec010968.e7b3c8","wires":[["8428aef3.294fb"]]},{"id":"433e4bbb.0041a4","type":"comment","name":"preload-vnf-topology-operation","info":"","comments":"","x":734.7121696472168,"y":86.76768398284912,"z":"ec010968.e7b3c8","wires":[]},{"id":"c245f742.938de8","type":"comment","name":"request-action = PreloadVNFRequest, svc-action = reserve","info":"","comments":"","x":743.4999961853027,"y":124.4444465637207,"z":"ec010968.e7b3c8","wires":[]},{"id":"8428aef3.294fb","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vnf-topology-operation-input.request-information.request-action`\">\n<!--\nleaf request-action { \n\t\t\t\ttype enumeration { \n\t\t\t\t\tenum \"VNFActivateRequest\";\n\t\t\t\t\tenum \"ChangeVNFActivateRequest\";\n\t\t\t\t\tenum \"DisconnectVNFRequest\";\n\t\t\t\t\tenum \"PreloadVNFRequest\";\n\t\t\t\t\tenum \"DeletePreloadVNFRequest\";\n\t\t\t\t} \n}\n-->\n\n","comments":"","outputs":1,"x":468,"y":349.76768493652344,"z":"ec010968.e7b3c8","wires":[["224db7b9.99c05","25c7df15.e2ee68","d922a69b.5847a"]]},{"id":"224db7b9.99c05","type":"other","name":"PreloadVNFRequest","xml":"<outcome value='PreloadVNFRequest'>","comments":"","outputs":1,"x":696,"y":350.76768493652344,"z":"ec010968.e7b3c8","wires":[["168570d4.1b2c0f"]]},{"id":"25c7df15.e2ee68","type":"other","name":"DeletePreloadVNFRequest","xml":"<outcome value='DeletePreloadVNFRequest'>","comments":"","outputs":1,"x":697.5713119506836,"y":724.6248331069946,"z":"ec010968.e7b3c8","wires":[["7234c5f6.8e775c"]]},{"id":"c8fc1b0d.1f04b","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1167.5713119506836,"y":766.6248331069946,"z":"ec010968.e7b3c8","wires":[]},{"id":"293e913d.2d205e","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1150.5713119506836,"y":806.6248331069946,"z":"ec010968.e7b3c8","wires":[]},{"id":"d922a69b.5847a","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":665.5713119506836,"y":844.6248331069946,"z":"ec010968.e7b3c8","wires":[["3f1f5721.c4719"]]},{"id":"3f1f5721.c4719","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":907.6534042358398,"y":843.0881509780884,"z":"ec010968.e7b3c8","wires":[]},{"id":"168570d4.1b2c0f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":936,"y":349.76768493652344,"z":"ec010968.e7b3c8","wires":[["2dfc339a.33eb4c","1be7681f.50003","256a1875.9f523","88afcd6b.4398f","cb33cf00.3b6b58","84940a76.3bc3a"]]},{"id":"cb33cf00.3b6b58","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1194.0000457763672,"y":586.1962547302246,"z":"ec010968.e7b3c8","wires":[]},{"id":"88afcd6b.4398f","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1269.0239715576172,"y":546.2836875915527,"z":"ec010968.e7b3c8","wires":[]},{"id":"2dfc339a.33eb4c","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1214.9088668823242,"y":348.91858863830566,"z":"ec010968.e7b3c8","wires":[]},{"id":"1be7681f.50003","type":"set","name":"set : sql-resource-plugin","xml":"<set only-if-unset=\"true\">\n<parameter name=\"sql-resource-plugin\" value=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\"/>","comments":"","x":1235.7321090698242,"y":387.79737281799316,"z":"ec010968.e7b3c8","wires":[]},{"id":"256a1875.9f523","type":"set","name":"set: preload-data += input","xml":"<set>\n<parameter name=\"preload-data.\" value=\"preload-vnf-topology-operation-input.\" />\n","comments":"","x":1226.940658569336,"y":506.82912826538086,"z":"ec010968.e7b3c8","wires":[]},{"id":"7234c5f6.8e775c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":936.5713119506836,"y":725.6248331069946,"z":"ec010968.e7b3c8","wires":[["c8fc1b0d.1f04b","293e913d.2d205e"]]},{"id":"8fe855d2.3e6538","type":"comment","name":"request-action = DeletePreloadVNFRequest, svc-action = delete","info":"","comments":"","x":752,"y":161.76768493652344,"z":"ec010968.e7b3c8","wires":[]},{"id":"84940a76.3bc3a","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1209.7143020629883,"y":467.0000305175781,"z":"ec010968.e7b3c8","wires":[]}]
\ No newline at end of file
index 5c0f25d..6e84ef7 100644 (file)
@@ -13,24 +13,13 @@ leaf request-action {
 \r
 <outcome value='PreloadVNFRequest'><block atomic="true"><set>\r
 <parameter name="ack-final" value="Y"/></set><set only-if-unset="true">\r
-<parameter name="sql-resource-plugin" value="org.openecomp.sdnc.sli.resource.sql.SqlResource"/></set><get-resource plugin="`$sql-resource-plugin`" resource="vnf-profile" key="SELECT * from VNF_PROFILE WHERE vnf_type = $preload-vnf-topology-operation-input.vnf-topology-information.vnf-topology-identifier.vnf-type">\r
-<outcome value='not-found'>\r
-<return status='failure'>\r
-       <parameter name="error-code" value="404" />\r
-       <parameter name="error-message" value="preload vnf-type not found as valid vnf " /></return></outcome><outcome value='failure'>\r
-<return status='failure'>\r
-       <parameter name="error-code" value="404" />\r
-       <parameter name="error-message" value="preload vnf-type not found as valid vnf " /></return></outcome></get-resource><set>\r
+<parameter name="sql-resource-plugin" value="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource"/></set><set>\r
 <parameter name="preload-data." value="" />\r
 </set><set>\r
 <parameter name="preload-data." value="preload-vnf-topology-operation-input." />\r
 </set><set>\r
        <parameter name="preload-data.oper-status.order-status" value="PendingAssignment"/></set><return status="success">\r
-       <parameter name="error-code" value="200" /></return></block></outcome><outcome value='DeletePreloadVNFRequest'><block atomic="true"><get-resource plugin="`$sql-resource-plugin`" resource="generic-vnf" key="SELECT * FROM VNF_PROFILE vnf-type = $preload-vnf-topology-operation-input.vnf-topology-information.vnf-topology-identifier.vnf-type">\r
-<outcome value='success'>\r
-<return status='failure'>\r
-       <parameter name="error-code" value="3000" />\r
-       <parameter name="error-message" value="preload vnf-type cannot be deleted while vnf is in use" /></return></outcome></get-resource><set>\r
+       <parameter name="error-code" value="200" /></return></block></outcome><outcome value='DeletePreloadVNFRequest'><block atomic="true"><set>\r
 <parameter name="preload-data." value="" />\r
 </set><return status="success">\r
        <parameter name="error-code" value="200" /></return></block></outcome><outcome value="Other">\r
@@ -40,4 +29,4 @@ leaf request-action {
        <parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>\r
 \r
  \r
-</return></outcome></switch></block></method></service-logic>
+</return></outcome></switch></block></method></service-logic>\r