Merge "Fix table schema"

Former-commit-id: 9ef0f3b0b3ee49c38771dc846e5f68e869c5acdd

1 files changed, 5 insertions, 11 deletions

diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index 4f9dc413..1ac22d28 100644
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -92,7 +92,7 @@ CREATE TABLE `AIC_AVAIL_ZONE_POOL` (
   `aic_site_id` varchar(100) NOT NULL,
   `status` varchar(40) NOT NULL,
   `availability_zone` varchar(100) NOT NULL,
-  `token` int(4) 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,
@@ -111,7 +111,6 @@ DROP TABLE IF EXISTS `AIC_HOSTNAME`;
 CREATE TABLE `AIC_HOSTNAME` (
   `hostname` varchar(20) NOT NULL,
   `cust_id` int(11) NOT NULL,
-  `aic_site_id` varchar(100) DEFAULT NULL,
   `vendor_code` varchar(1) NOT NULL,
   `virtual_device_type` varchar(2) DEFAULT NULL,
   `device_sequence` varchar(3) NOT NULL,
@@ -1770,13 +1769,10 @@ DROP TABLE IF EXISTS `PORTAL_USERS`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `PORTAL_USERS` (
-  `attuid` varchar(6) NOT NULL,
-  `firstName` varchar(25) DEFAULT NULL,
-  `lastName` varchar(25) DEFAULT NULL,
-  `role` varchar(25) DEFAULT NULL,
+  `email` varchar(64) NOT NULL,
+  `password` varbinary(255) NOT NULL,
   `privilege` char(1) NOT NULL,
-  `last_login` timestamp NULL DEFAULT NULL,
-  PRIMARY KEY (`attuid`)
+  PRIMARY KEY (`email`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1816,7 +1812,6 @@ CREATE TABLE `PRE_LOAD_VNF_DATA` (
   `svc_action` varchar(40) DEFAULT '',
   `status` varchar(10) NOT NULL DEFAULT 'pending',
   `filename` varchar(100) NOT NULL,
-  `attuid` varchar(8) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `preload_data` longblob,
   PRIMARY KEY (`id`)
@@ -1836,7 +1831,6 @@ CREATE TABLE `PRE_LOAD_VNF_NETWORK_DATA` (
   `svc_action` varchar(40) DEFAULT '',
   `status` varchar(10) NOT NULL DEFAULT 'pending',
   `filename` varchar(100) NOT NULL,
-  `attuid` varchar(8) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `preload_data` longblob,
   PRIMARY KEY (`id`)
@@ -1861,7 +1855,7 @@ CREATE TABLE `PSERVER` (
   `equip_model` varchar(255) DEFAULT '',
   `fqdn` varchar(255) DEFAULT '',
   `pserver_selflink` varchar(255) DEFAULT '',
-  `ipv4_oam_address` varchar(15) DEFAULT '',
+  `ipv4_oam_address` varchar(40) DEFAULT NULL,
   `serial_number` varchar(255) DEFAULT '',
   `pserver_id` varchar(255) DEFAULT '',
   `internet_topology` varchar(40) DEFAULT '',