Enhacing ODL-SLI startODL.sh and installSdncDb.sh

Fixing odlsli.dump [Segmentation fault (core dumped)]

Issue-ID: CCSDK-3173
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I5054b086170e3cc6cf7d714d144c4170459d1c7e

4 files changed, 2187 insertions, 113 deletions

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 6b7b1fbb..ba72274d 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -629,9 +629,12 @@
                                             <run>
                                                 <env>
                                                     <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
+                                                    <!-- Below are not required as installSdncDb.sh handles same -->
+                                                    <!--
                                                     <MYSQL_USER>sdnctl</MYSQL_USER>
                                                     <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
                                                     <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    -->
                                                 </env>
                                                 <network>
                                                     <mode>custom</mode>
@@ -654,9 +657,9 @@
                                             <run>
                                                 <env>
                                                     <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
-                                                    <MYSQL_USER>sdnctl</MYSQL_USER>
-                                                    <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
-                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <SDNC_DB_USER>sdnctl</SDNC_DB_USER>
+                                                    <SDNC_DB_PASSWORD>gamma</SDNC_DB_PASSWORD>
+                                                    <SDNC_DB_DATABASE>sdnctl</SDNC_DB_DATABASE>
                                                     <SDNC_CONFIG_DIR>/opt/onap/ccsdk/data/properties</SDNC_CONFIG_DIR>
                                                     <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
                                                 </env>
diff --git a/odlsli/src/main/resources/odlsli.dump b/odlsli/src/main/resources/odlsli.dump
index e6b6222a..81dc2f55 100644
--- a/odlsli/src/main/resources/odlsli.dump
+++ b/odlsli/src/main/resources/odlsli.dump
@@ -14,8 +14,203 @@
 /*!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`
+--
+
+DROP TABLE IF EXISTS `AGNOSTIC_NOTIFICATION_URL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AGNOSTIC_NOTIFICATION_URL` (
+  `service_type` varchar(128) NOT NULL,
+  `service_instance_id` varchar(128) NOT NULL,
+  `request_id` varchar(128) NOT NULL,
+  `svc_notification_url` varchar(256) NOT NULL,
+  PRIMARY KEY (`service_type`,`service_instance_id`,`request_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `AGNOSTIC_TO_SVC_SPCFC_API`
+--
+
+DROP TABLE IF EXISTS `AGNOSTIC_TO_SVC_SPCFC_API`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AGNOSTIC_TO_SVC_SPCFC_API` (
+  `operation` varchar(128) NOT NULL,
+  `service` varchar(128) NOT NULL,
+  `service_specific_api` varchar(128) NOT NULL,
+  `async_process` varchar(15) DEFAULT NULL,
+  PRIMARY KEY (`operation`,`service`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `AIC_AVAIL_ZONE_POOL`
+--
+
+DROP TABLE IF EXISTS `AIC_AVAIL_ZONE_POOL`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+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,
+  `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 `CUSTOMER`
+--
+
+DROP TABLE IF EXISTS `CUSTOMER`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CUSTOMER` (
+  `cust_id` int(11) NOT NULL AUTO_INCREMENT,
+  `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=155 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `AIC_HOSTNAME`
+--
+
+DROP TABLE IF EXISTS `AIC_HOSTNAME`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AIC_HOSTNAME` (
+  `hostname` varchar(20) NOT NULL,
+  `cust_id` int(11) NOT NULL,
+  `vendor_code` varchar(1) NOT NULL,
+  `virtual_device_type` varchar(2) DEFAULT NULL,
+  `device_sequence` varchar(3) NOT NULL,
+  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`hostname`),
+  UNIQUE KEY `hostname` (`hostname`),
+  KEY `IN1_AIC_HOSTNAME` (`cust_id`),
+  CONSTRAINT `AC1_HOSTNAME` FOREIGN KEY (`cust_id`) REFERENCES `CUSTOMER` (`cust_id`) 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 `AIC_NETWORK`
+--
+
+DROP TABLE IF EXISTS `AIC_NETWORK`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AIC_NETWORK` (
+  `network_id` varchar(100) NOT NULL,
+  `network_name` varchar(100) DEFAULT NULL,
+  `status` varchar(20) DEFAULT NULL,
+  `tenant_id` varchar(100) DEFAULT NULL,
+  `switch_uuid` varchar(100) DEFAULT NULL,
+  `portgroup_name` varchar(100) DEFAULT NULL,
+  `portgroup_id` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`network_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `AIC_SITE`
+--
+
+DROP TABLE IF EXISTS `AIC_SITE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AIC_SITE` (
+  `name` varchar(100) DEFAULT NULL,
+  `aic_site_id` varchar(100) NOT NULL,
+  `vcenter_url` varchar(200) DEFAULT NULL,
+  `vcenter_username` varchar(40) DEFAULT NULL,
+  `vcenter_passwd` varbinary(255) DEFAULT NULL,
+  `city` varchar(100) DEFAULT NULL,
+  `state` varchar(2) DEFAULT NULL,
+  `operational_status` varchar(20) DEFAULT NULL,
+  `oam_gateway_addr` varchar(20) DEFAULT '',
+  PRIMARY KEY (`aic_site_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `AIC_SWITCH`
+--
+
+DROP TABLE IF EXISTS `AIC_SWITCH`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `AIC_SWITCH` (
+  `switch_name` varchar(100) DEFAULT NULL,
+  `physical_network_name` varchar(100) NOT NULL,
+  `aic_site_id` varchar(100) DEFAULT NULL,
+  `uuid` varchar(100) DEFAULT NULL,
+  `availability_zone` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`physical_network_name`)
+) 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`
@@ -39,9 +234,347 @@ 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 */;
+
+--
+-- Table structure for table `ALTS_CREDENTIALS`
+--
+
+DROP TABLE IF EXISTS `ALTS_CREDENTIALS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ALTS_CREDENTIALS` (
+  `alts_username` varchar(255) NOT NULL,
+  `alts_password` varbinary(255) NOT NULL,
+  PRIMARY KEY (`alts_username`)
+) 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`
+--
+
+DROP TABLE IF EXISTS `CITY_CODE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `CITY_CODE` (
+  `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_CITY_CODE` (`city`,`state`,`country_code`)
+) 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` varchar(50) NOT NULL,
+  `request_id` varchar(50) DEFAULT NULL,
+  `message_type` varchar(100) 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 */;
+
+--
+-- 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 */;
 
 --
 -- Table structure for table `DATA_OBJECT_MAPPING`
@@ -57,10 +590,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 */;
 
 --
@@ -74,7 +610,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 */;
@@ -96,9 +632,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 */;
 
 --
@@ -121,6 +658,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 */;
 
@@ -137,15 +777,40 @@ 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`
 --
 
@@ -155,13 +820,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 */;
 
@@ -174,8 +846,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;
@@ -204,10 +876,47 @@ 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`
 --
 
@@ -271,6 +980,23 @@ CREATE TABLE `GENERIC_L3_NETWORK_VPN_BINDING` (
 /*!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,
+  `prefix` varchar(255) NULL,
+  `name_index` int(11) NULL,
+  `context_id` varchar(255) NULL,
+  PRIMARY KEY (`type`,`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `GENERIC_VNF`
 --
 
@@ -433,6 +1159,45 @@ CREATE TABLE `GENERIC_VPN_BINDING` (
 /*!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 `LOCATION`
+--
+
+DROP TABLE IF EXISTS `LOCATION`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `LOCATION` (
+  `loc_id` int(11) NOT NULL AUTO_INCREMENT,
+  `address` varchar(150) NOT NULL,
+  `city_code_id` int(11) NOT NULL,
+  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  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=327 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `HOSTNAME`
 --
 
@@ -459,7 +1224,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 */;
@@ -481,6 +1245,24 @@ CREATE TABLE `IPV4_ADDRESS_POOL` (
 /*!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`
 --
 
@@ -500,24 +1282,6 @@ CREATE TABLE `LINTERFACE_VLAN` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `LOCATION`
---
-
-DROP TABLE IF EXISTS `LOCATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `LOCATION` (
-  `loc_id` int(11) NOT NULL AUTO_INCREMENT,
-  `address` varchar(150) NOT NULL,
-  `city_code_id` int(11) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  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;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `MAX_PORT_SPEED`
 --
 
@@ -533,7 +1297,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 */;
 
 --
@@ -552,10 +1316,294 @@ 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 `NAMING_POLICY_VM_NAME_INDEX`
+--
+
+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 `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,
+  PRIMARY KEY (`be_id`,`be_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `NBNC_IPE`
+--
+
+DROP TABLE IF EXISTS `NBNC_IPE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_IPE` (
+  `ipe_name` varchar(32) NOT NULL,
+  `ipe_location` varchar(16) DEFAULT NULL,
+  `ipe_ip_address` varchar(16) DEFAULT NULL,
+  `ipe_id` varchar(8) DEFAULT NULL,
+  `service_type_array` varchar(512) DEFAULT NULL,
+  `ipe_status` varchar(32) DEFAULT NULL,
+  `updated_timestamp` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`ipe_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NBNC_IPE_PORT`
+--
+
+DROP TABLE IF EXISTS `NBNC_IPE_PORT`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_IPE_PORT` (
+  `port_id` varchar(16) NOT NULL,
+  `ipe_name` varchar(32) NOT NULL,
+  `be_id` varchar(32) NOT NULL,
+  `be_type` varchar(16) NOT NULL,
+  `port_type` varchar(16) DEFAULT NULL,
+  `ae_name` varchar(16) DEFAULT NULL,
+  `description` varchar(128) DEFAULT NULL,
+  `updated_timestamp` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`port_id`,`ipe_name`,`be_id`,`be_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NBNC_MAPPING_SBG_BGF`
+--
+
+DROP TABLE IF EXISTS `NBNC_MAPPING_SBG_BGF`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_MAPPING_SBG_BGF` (
+  `asbg_vlan` smallint(6) NOT NULL,
+  `bgf_vlan` smallint(6) NOT NULL,
+  PRIMARY KEY (`asbg_vlan`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NBNC_SERVICE`
+--
+
+DROP TABLE IF EXISTS `NBNC_SERVICE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_SERVICE` (
+  `service_type` varchar(16) NOT NULL,
+  `service_model_uuid` varchar(64) NOT NULL,
+  `description` varchar(128) DEFAULT NULL,
+  `created_timestamp` timestamp NULL DEFAULT NULL,
+  `updated_timestamp` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`service_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `NBNC_SERVICE_VLAN`
+--
+
+DROP TABLE IF EXISTS `NBNC_SERVICE_VLAN`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `NBNC_SERVICE_VLAN` (
+  `be_id` varchar(32) NOT NULL,
+  `vlan` smallint(6) NOT NULL,
+  `service_type` varchar(16) DEFAULT NULL,
+  `be_type` varchar(16) DEFAULT NULL,
+  `be_name` varchar(32) DEFAULT NULL,
+  `be_host_vnf_id` varchar(32) DEFAULT NULL,
+  `be_location` varchar(16) DEFAULT NULL,
+  `be_usage_order` smallint(6) DEFAULT NULL,
+  `vlan_usage_order` smallint(6) DEFAULT NULL,
+  `status` varchar(16) DEFAULT 'AVAILABLE',
+  `request_id` varchar(64) DEFAULT NULL,
+  `service_instance_id` varchar(64) DEFAULT NULL,
+  `vni_id` varchar(16) DEFAULT NULL,
+  `customer_id` varchar(16) DEFAULT NULL,
+  `ipe1_router_name` varchar(32) DEFAULT NULL,
+  `ipe1_port_id` varchar(16) DEFAULT NULL,
+  `ipe1_ae_name` varchar(16) DEFAULT NULL,
+  `ipe2_router_name` varchar(32) DEFAULT NULL,
+  `ipe2_port_id` varchar(16) DEFAULT NULL,
+  `ipe2_ae_name` varchar(16) DEFAULT NULL,
+  `available_timestamp` timestamp NULL DEFAULT NULL,
+  `allocated_timestamp` timestamp NULL DEFAULT NULL,
+  `disabled_timestamp` timestamp NULL DEFAULT NULL,
+  `enabled_timestamp` timestamp NULL DEFAULT NULL,
+  `vpn_id` varchar(12) DEFAULT NULL,
+  `vpn_rt` varchar(16) DEFAULT NULL,
+  PRIMARY KEY (`be_id`,`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 `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 `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,
+  `trunk_network_indicator` char(1) 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`
@@ -599,6 +1647,35 @@ CREATE TABLE `NODE_TYPES` (
 /*!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`
 --
 
@@ -607,7 +1684,7 @@ 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`)
@@ -615,6 +1692,38 @@ CREATE TABLE `PARAMETERS` (
 /*!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`
 --
 
@@ -665,6 +1774,22 @@ CREATE TABLE `PINTERFACE` (
 /*!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`
 --
 
@@ -681,6 +1806,66 @@ CREATE TABLE `PORTAL_USERS` (
 
 
 --
+-- 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 */;
+
+--
+-- Table structure for table `PRE_LOAD_VNF_DATA`
+--
+
+DROP TABLE IF EXISTS `PRE_LOAD_VNF_DATA`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `PRE_LOAD_VNF_DATA` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `svc_request_id` varchar(100) DEFAULT '',
+  `svc_action` varchar(40) DEFAULT '',
+  `status` varchar(10) NOT NULL DEFAULT 'pending',
+  `filename` varchar(100) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `preload_data` longblob,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=295 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `PRE_LOAD_VNF_NETWORK_DATA`
+--
+
+DROP TABLE IF EXISTS `PRE_LOAD_VNF_NETWORK_DATA`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `PRE_LOAD_VNF_NETWORK_DATA` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `svc_request_id` varchar(100) DEFAULT '',
+  `svc_action` varchar(40) DEFAULT '',
+  `status` varchar(10) NOT NULL DEFAULT 'pending',
+  `filename` varchar(100) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `preload_data` longblob,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=278 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `PSERVER`
 --
 
@@ -723,10 +1908,74 @@ CREATE TABLE `RANGE_RULE` (
   `service_model` varchar(50) NOT NULL,
   `end_point_position` varchar(50) NOT NULL,
   `equipment_level` varchar(50) NOT NULL,
-  `equipment_expression` varchar(2000) NOT NULL,
-  `ranges` varchar(100) NOT NULL,
+  `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_DETAILS`
+--
+
+DROP TABLE IF EXISTS `REQUEST_DETAILS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `REQUEST_DETAILS` (
+  `request_id` varchar(255) NOT NULL,
+  `controller_id` varchar(255) DEFAULT NULL,
+  `status` varchar(255) DEFAULT NULL,
+  `service_rate` varchar(255) DEFAULT NULL,
+  `service_instance_id` varchar(255) DEFAULT NULL,
+  `service_type` varchar(255) DEFAULT NULL,
+  `global_customer_id` varchar(255) DEFAULT NULL,
+  `notification_url` varchar(255) DEFAULT NULL,
+  `domain_requests` varchar(255) DEFAULT NULL,
+  `pinterface_list` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`request_id`)
+) ENGINE=InnoDB 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 */;
 
 --
@@ -748,7 +1997,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 */;
 
 --
@@ -780,7 +2029,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,
@@ -788,7 +2037,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 */;
 
 --
@@ -811,7 +2060,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 */;
 
 --
@@ -830,6 +2079,129 @@ 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`
+--
+
+DROP TABLE IF EXISTS `SERVICE_HOMING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_HOMING` (
+  `service_type` varchar(100) NOT NULL,
+  `lata` int(3) NOT NULL,
+  `hubbing_city_type` varchar(40) NOT NULL,
+  `latitude` float DEFAULT NULL,
+  `longitude` float DEFAULT NULL,
+  `primary_aic_site_name` varchar(100) NOT NULL,
+  `secondary_aic_site_name` varchar(100) DEFAULT NULL,
+  `tertiary_aic_site_name` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`service_type`,`lata`,`hubbing_city_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `SERVICE_HOMING_BACKUP`
+--
+
+DROP TABLE IF EXISTS `SERVICE_HOMING_BACKUP`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_HOMING_BACKUP` (
+  `service_type` varchar(100) NOT NULL,
+  `lata` int(3) NOT NULL,
+  `hubbing_city_type` varchar(40) NOT NULL,
+  `latitude` float DEFAULT NULL,
+  `longitude` float DEFAULT NULL,
+  `primary_aic_site_name` varchar(100) NOT NULL,
+  `secondary_aic_site_name` varchar(100) DEFAULT NULL,
+  `tertiary_aic_site_name` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`service_type`,`lata`,`hubbing_city_type`)
+) 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`
+--
+
+DROP TABLE IF EXISTS `SERVICE_MANAGER_CREDENTIALS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SERVICE_MANAGER_CREDENTIALS` (
+  `service_manager_username` varchar(255) NOT NULL,
+  `service_manager_password` varbinary(255) NOT NULL,
+  PRIMARY KEY (`service_manager_username`)
+) 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`
@@ -848,7 +2220,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 */;
 
 --
@@ -872,6 +2288,44 @@ CREATE TABLE `SVC_LOGIC` (
 /*!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`
 --
 
@@ -887,6 +2341,19 @@ CREATE TABLE `TENANT` (
 /*!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`
 --
 
@@ -901,6 +2368,178 @@ 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 `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE`
+--
+
+DROP TABLE IF EXISTS `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE` (
+  `interface_name` varchar(255) NOT NULL,
+  `interface_id` varchar(255) NOT NULL,
+  `pnf_name` varchar(255) NOT NULL,
+  `pnf_id` varchar(255) NOT NULL,
+  `controller_id` varchar(255) DEFAULT NULL,
+  `rate` varchar(255) DEFAULT NULL,
+  `clli` varchar(255) DEFAULT NULL,
+  `connection_point` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`interface_name`)
+) 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`
@@ -911,8 +2550,186 @@ 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,
+  `subinterface_indicator` char(1) 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 */;
 
@@ -1033,6 +2850,20 @@ CREATE TABLE `VLAN_RANGES` (
 /*!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`
 --
 
@@ -1093,6 +2924,50 @@ CREATE TABLE `VNF` (
 /*!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`
 --
 
@@ -1121,7 +2996,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;
@@ -1143,6 +3018,20 @@ CREATE TABLE `VNF_MODEL_LICENSE_FEATURES` (
 /*!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`
 --
 
@@ -1213,6 +3102,20 @@ CREATE TABLE `VNF_PROFILE` (
 /*!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`
 --
 
@@ -1227,6 +3130,37 @@ CREATE TABLE `VPE_LOCK` (
 /*!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`
 --
 
@@ -1251,6 +3185,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 */;
@@ -1280,6 +3216,34 @@ CREATE TABLE `VPLSPE_POOL` (
 /*!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`
 --
 
@@ -1331,6 +3295,21 @@ CREATE TABLE `VSERVER_PSERVER` (
 /*!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`
 --
 
@@ -1339,72 +3318,41 @@ 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`;
+DROP TABLE IF EXISTS `DHCP_MAP`;
 /*!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
+CREATE TABLE `DHCP_MAP` (
+  `mac_addr` varchar(128) NOT NULL,
+  `ip_addr` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`mac_addr`)
 ) 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
+DROP TABLE IF EXISTS `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING`;
+CREATE TABLE `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING` (
+  `group_uuid` varchar(255) NOT NULL,
+  `parent_uuid` varchar(255) NOT NULL,
+  `target_node_uuid` varchar(255) NOT NULL,
+  `target_type` varchar(255) NULL,
+  `table_name` varchar(255) NULL,
+  PRIMARY KEY (`group_uuid`, `parent_uuid`, `target_node_uuid`)
 ) 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 */;
@@ -1415,4 +3363,121 @@ 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
+DROP TABLE IF EXISTS `ATTRIBUTE_VALUE_PAIR`;
+CREATE TABLE `ATTRIBUTE_VALUE_PAIR` (
+  `resource_uuid` varchar(255) NOT NULL,
+  `attribute_name` varchar(255) NOT NULL,
+  `resource_type` varchar(255) NOT NULL,
+  `attribute_value` varchar(255) DEFAULT NULL,
+  `resource_customization_uuid` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`resource_uuid`,`attribute_name`,`resource_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `COMPLEX_RESOURCE`;
+CREATE TABLE `COMPLEX_RESOURCE` (
+  `uuid` varchar(255) NOT NULL,
+  `model_yaml` longblob,
+  `invariant_uuid` varchar(255) NOT NULL,
+  `customization_uuid` varchar(255) NOT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `type` varchar(255) NOT NULL,
+  PRIMARY KEY (`uuid`,`customization_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `NODE_CAPABILITY`;
+CREATE TABLE `NODE_CAPABILITY` (
+  `capability_id` int(11) NOT NULL AUTO_INCREMENT,
+  `capability_provider_uuid` varchar(255) NOT NULL,
+  `capability_provider_customization_uuid` varchar(255) NOT NULL,
+  `capability_name` varchar(255) DEFAULT NULL,
+  `capability_type` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`capability_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `NODE_REQUIREMENT`;
+CREATE TABLE `NODE_REQUIREMENT` (
+  `requirement_id` int(11) NOT NULL AUTO_INCREMENT,
+  `capability_id` int(11) DEFAULT NULL,
+  `capability_provider_uuid` varchar(255) DEFAULT NULL,
+  `capability_provider_customization_uuid` varchar(255) DEFAULT NULL,
+  `capability_consumer_uuid` varchar(255) NOT NULL,
+  `capability_consumer_customization_uuid` varchar(255) NOT NULL,
+  `requirement_name` varchar(255) NOT NULL,
+  PRIMARY KEY (`requirement_id`),
+  KEY `NODE_REQUIREMENT_TO_NODE_CAPABILITY` (`capability_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `RELATED_NETWORK_ROLE`;
+CREATE TABLE `RELATED_NETWORK_ROLE` (
+  `network_model_customization_uuid` varchar(255) NOT NULL,
+  `related_network_role` varchar(255) NOT NULL,
+  PRIMARY KEY (`network_model_customization_uuid`,`related_network_role`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `RESOURCE_GROUP`;
+CREATE TABLE `RESOURCE_GROUP` (
+  `resource_uuid` varchar(255) NOT NULL,
+  `group_uuid` varchar(255) NOT NULL,
+  `group_customization_uuid` varchar(255) DEFAULT NULL,
+  `group_invariant_uuid` varchar(255) NOT NULL,
+  `group_name` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `group_type` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`resource_uuid`,`group_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `RESOURCE_POLICY`;
+CREATE TABLE `RESOURCE_POLICY` (
+  `resource_uuid` varchar(255) NOT NULL,
+  `policy_uuid` varchar(255) NOT NULL,
+  `policy_customization_uuid` varchar(255) DEFAULT NULL,
+  `policy_invariant_uuid` varchar(255) NOT NULL,
+  `policy_name` varchar(255) DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  `policy_type` varchar(255) DEFAULT NULL,
+  `property_type` varchar(255) DEFAULT NULL,
+  `property_source` varchar(255) DEFAULT NULL,
+  `property_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`resource_uuid`,`policy_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `RESOURCE_POLICY_TO_TARGET_NODE_MAPPING`;
+CREATE TABLE `RESOURCE_POLICY_TO_TARGET_NODE_MAPPING` (
+  `policy_uuid` varchar(255) NOT NULL,
+  `parent_uuid` varchar(255) NOT NULL,
+  `target_node_uuid` varchar(255) NOT NULL,
+  `target_type` varchar(255) DEFAULT NULL,
+  `target_node_customization_uuid` varchar(255) DEFAULT NULL,
+  `policy_customization_uuid` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`policy_uuid`,`parent_uuid`,`target_node_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `SERVICE_MODEL_TO_COMPLEX_RESOURCE_MAPPING`;
+CREATE TABLE `SERVICE_MODEL_TO_COMPLEX_RESOURCE_MAPPING` (
+  `service_uuid` varchar(255) NOT NULL,
+  `complex_resource_uuid` varchar(255) NOT NULL,
+  `complex_resource_customization_uuid` varchar(255) NOT NULL,
+  PRIMARY KEY (`service_uuid`,`complex_resource_uuid`,`complex_resource_customization_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `VFC_RELATED_NETWORK_ROLE`;
+CREATE TABLE `VFC_RELATED_NETWORK_ROLE` (
+  `vfc_customization_uuid` varchar(255) NOT NULL,
+  `vm_type` varchar(255) NOT NULL,
+  `network_role` varchar(255) NOT NULL,
+  `related_network_role` varchar(255) NOT NULL,
+  PRIMARY KEY (`vfc_customization_uuid`,`vm_type`,`network_role`,`related_network_role`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `VNF_RELATED_NETWORK_ROLE`;
+CREATE TABLE `VNF_RELATED_NETWORK_ROLE` (
+  `vnf_customization_uuid` varchar(255) NOT NULL,
+  `network_role` varchar(255) NOT NULL,
+  `related_network_role` varchar(255) NOT NULL,
+  PRIMARY KEY (`vnf_customization_uuid`,`network_role`,`related_network_role`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- Dump completed on 2017-10-04 18:23:01
diff --git a/odlsli/src/main/scripts/installSdncDb.sh b/odlsli/src/main/scripts/installSdncDb.sh
index fb97b073..46fc393b 100644
--- a/odlsli/src/main/scripts/installSdncDb.sh
+++ b/odlsli/src/main/scripts/installSdncDb.sh
@@ -2,7 +2,7 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : SDN-C
+# ONAP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
 # 							reserved.
@@ -22,24 +22,28 @@
 ###
 
 CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
+MYSQL_HOST=${MYSQL_HOST:-dbhost}
 MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0}
 
 SDNC_DB_USER=${SDNC_DB_USER:-sdnctl}
-SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma}
+SDNC_DB_PASSWORD=${SDNC_DB_PASSWORD:-gamma}
 SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl}
 
-
+echo -e "\nCreating database:($SDNC_DB_DATABASE) and user:($SDNC_DB_USER)"
 # Create tablespace and user account
-mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql <<-END
-CREATE DATABASE ${SDNC_DB_DATABASE};
-CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}';
-CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}';
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql <<-END
+CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE};
+CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}';
+CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}';
 GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION;
 GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION;
+flush privileges;
 commit;
 END
 
+# load schema
 if [ -f ${CCSDK_HOME}/data/odlsli.dump ]
 then
-mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump
+    mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} ${SDNC_DB_DATABASE} < ${CCSDK_HOME}/data/odlsli.dump
+    echo -e "\n ${SDNC_DB_DATABASE} schema loaded."
 fi
diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 310acfd7..d9387246 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -28,20 +28,22 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
 CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
 SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0}
-INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
+INSTALLED_DIR=${INSTALLED_FILE:-${ODL_HOME}/current/daexim}
 
+MYSQL_HOST=${MYSQL_HOST:-dbhost}
+MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0}
 
 #
 # Wait for database
 #
-echo "Waiting for mysql"
-until mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null
+echo -e "\nWaiting for mysql:(${MYSQL_HOST})"
+until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null
 do
   printf "."
-  sleep 1
+  sleep 10
 done
-echo -e "\nmysql ready"
+echo -e "\nmysql:(${MYSQL_HOST}) is ready."
+
 
 if [ ! -d ${INSTALLED_DIR} ]
 then