diff options
| -rw-r--r-- | SdncReports/SdncReportsDao/pom.xml | 5 | ||||
| -rw-r--r-- | installation/sdnc/src/main/resources/sdnctl.dump | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | installation/sdnc/src/main/scripts/installSdncDb.sh | 2 | ||||
| -rwxr-xr-x | installation/ueb-listener/src/main/properties/ueb-listener.properties | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index c3ec2bc7..bc1e6f7b 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -40,11 +40,6 @@ </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>runtime</scope> - </dependency> <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> <scope>provided</scope> </dependency> --> diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump index b5ea0229..ee6d8460 100644 --- 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/sdnc/src/main/scripts/installSdncDb.sh b/installation/sdnc/src/main/scripts/installSdncDb.sh index e726f5f8..a867b4ae 100644..100755 --- a/installation/sdnc/src/main/scripts/installSdncDb.sh +++ b/installation/sdnc/src/main/scripts/installSdncDb.sh @@ -42,11 +42,13 @@ END # load schema if [ -f ${SDNC_HOME}/data/sdnctl.dump ] then + echo "Installing ${SDNC_HOME}/data/sdnctl.dump" mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/sdnctl.dump fi for datafile in ${SDNC_HOME}/data/*.data.dump do + echo "Installing ${datafile}" mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < $datafile done diff --git a/installation/ueb-listener/src/main/properties/ueb-listener.properties b/installation/ueb-listener/src/main/properties/ueb-listener.properties index ae613f46..c8418d02 100755 --- 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= |