Update ueb timeout and fix tables

Update timeout on UEB startup from 15 mins to 5 mins, and fixed
table definition errors found during SDC testing.

Change-Id: Ib4a8f48a02a3ef536c6d433deb3ad96f6ac3e4da
Issue-ID: SDNC-472
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: ccf26e7ccf39215dd9c3847e415513783377946c

diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index b5ea022..ee6d846 100644 (file)
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -495,9 +495,9 @@ DROP TABLE IF EXISTS `CONFIG_TRANSACTION_LOG`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `CONFIG_TRANSACTION_LOG` (
-  `config_transaction_log_id` int(11) NOT NULL AUTO_INCREMENT,
+  `config_transaction_log_id` varchar(50) NOT NULL,
   `request_id` varchar(50) DEFAULT NULL,
-  `message_type` 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`),
@@ -991,7 +991,7 @@ CREATE TABLE `GENERIC_RESOURCE_NAME` (
   `name` varchar(255) NOT NULL,
   `prefix` varchar(255) NULL,
   `name_index` int(11) NULL,
-  `content_id` varchar(255) NULL,
+  `context_id` varchar(255) NULL,
   PRIMARY KEY (`type`,`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;

diff --git a/installation/ueb-listener/src/main/properties/ueb-listener.properties b/installation/ueb-listener/src/main/properties/ueb-listener.properties
index ae613f4..c8418d0 100755 (executable)
--- a/installation/ueb-listener/src/main/properties/ueb-listener.properties
+++ b/installation/ueb-listener/src/main/properties/ueb-listener.properties
@@ -17,7 +17,7 @@ org.onap.ccsdk.sli.northbound.uebclient.spool.incoming=/opt/onap/sdnc/ueb-listen
 org.onap.ccsdk.sli.northbound.uebclient.spool.archive=/opt/onap/sdnc/ueb-listener/spool/archive
 org.onap.ccsdk.sli.northbound.uebclient.polling-interval=30
 org.onap.ccsdk.sli.northbound.uebclient.polling-timeout=15
-org.onap.ccsdk.sli.northbound.uebclient.client-startup-timeout=900
+org.onap.ccsdk.sli.northbound.uebclient.client-startup-timeout=300
 org.onap.ccsdk.sli.northbound.uebclient.relevant-artifact-types=TOSCA_CSAR
 org.onap.ccsdk.sli.northbound.uebclient.activate-server-tls-auth=false
 org.onap.ccsdk.sli.northbound.uebclient.keystore-path=