diff options
| -rw-r--r-- | docker-compose/docker-compose.yml | 2 | ||||
| -rw-r--r-- | installation/appc/src/main/resources/sdnctl.dump | 47 | ||||
| -rw-r--r-- | installation/appc/src/main/resources/sqlData.dump | 4 |
3 files changed, 22 insertions, 31 deletions
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 809bc57..706465b 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -27,7 +27,7 @@ networks: services: db: - image: mariadb:10.1.11 + image: mariadb:10.4.3 container_name: sdnc_db_container ports: - "3306" diff --git a/installation/appc/src/main/resources/sdnctl.dump b/installation/appc/src/main/resources/sdnctl.dump index 1a36a07..5a4a044 100644 --- a/installation/appc/src/main/resources/sdnctl.dump +++ b/installation/appc/src/main/resources/sdnctl.dump @@ -487,43 +487,43 @@ CREATE TABLE `NODE_TYPES` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `OPS_AIC_HOSTS` +-- Table structure for table `OPS_AIC_REGIONS` -- -DROP TABLE IF EXISTS `OPS_AIC_HOSTS`; +DROP TABLE IF EXISTS `OPS_AIC_REGIONS`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `OPS_AIC_HOSTS` ( +CREATE TABLE `OPS_AIC_REGIONS` ( `REGION_ID` varchar(16) NOT NULL, - `HOST` varchar(64) NOT NULL, - `HOST_IP` varchar(64) DEFAULT NULL, - `EQUIPMENT_VENDOR` varchar(32) DEFAULT NULL, - `EQUIPMENT_PRODUCT` varchar(32) DEFAULT NULL, - `EQUIPMENT_MODEL` varchar(32) DEFAULT NULL, - `EQUIPMENT_VERSION` varchar(32) DEFAULT NULL, + `IDENTITY_URL` varchar(256) NOT NULL, + `HOST_DISCOVERY` varchar(3) NOT NULL DEFAULT 'NO', + `ADMIN_TENANT_ID` varchar(64) DEFAULT NULL, + `ADMIN_TENANT_NAME` varchar(64) DEFAULT 'admin', `CREATED` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `UPDATED` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`REGION_ID`,`HOST`), - CONSTRAINT `fk_aic_hosts` FOREIGN KEY (`REGION_ID`) REFERENCES `OPS_AIC_REGIONS` (`REGION_ID`) + PRIMARY KEY (`REGION_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `OPS_AIC_REGIONS` +-- Table structure for table `OPS_AIC_HOSTS` -- -DROP TABLE IF EXISTS `OPS_AIC_REGIONS`; +DROP TABLE IF EXISTS `OPS_AIC_HOSTS`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `OPS_AIC_REGIONS` ( +CREATE TABLE `OPS_AIC_HOSTS` ( `REGION_ID` varchar(16) NOT NULL, - `IDENTITY_URL` varchar(256) NOT NULL, - `HOST_DISCOVERY` varchar(3) NOT NULL DEFAULT 'NO', - `ADMIN_TENANT_ID` varchar(64) DEFAULT NULL, - `ADMIN_TENANT_NAME` varchar(64) DEFAULT 'admin', + `HOST` varchar(64) NOT NULL, + `HOST_IP` varchar(64) DEFAULT NULL, + `EQUIPMENT_VENDOR` varchar(32) DEFAULT NULL, + `EQUIPMENT_PRODUCT` varchar(32) DEFAULT NULL, + `EQUIPMENT_MODEL` varchar(32) DEFAULT NULL, + `EQUIPMENT_VERSION` varchar(32) DEFAULT NULL, `CREATED` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `UPDATED` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`REGION_ID`) + PRIMARY KEY (`REGION_ID`,`HOST`), + CONSTRAINT `fk_aic_hosts` FOREIGN KEY (`REGION_ID`) REFERENCES `OPS_AIC_REGIONS` (`REGION_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1420,14 +1420,5 @@ USE `sdnctl`; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; diff --git a/installation/appc/src/main/resources/sqlData.dump b/installation/appc/src/main/resources/sqlData.dump index 633101b..7b067f0 100644 --- a/installation/appc/src/main/resources/sqlData.dump +++ b/installation/appc/src/main/resources/sqlData.dump @@ -25,7 +25,7 @@ USE sdnctl; LOCK TABLES `VNF_DG_MAPPING` WRITE; -INSERT INTO `VNF_DG_MAPPING` VALUES ('','Restart','2.00','','','Generic_Restart','3.0.0','APPC'),('','Configure',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','ConfigModify',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Rebuild',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Restart',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','HealthCheck',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','StartApplication',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','StopApplication',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Migrate',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Snapshot',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','ConfigRestore',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','ConfigBackup',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Evacuate',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Stop',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','Start',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','ConfigScaleOut',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','DistributeTraffic',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),('','DistributeTrafficCheck',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'); +INSERT INTO `VNF_DG_MAPPING` VALUES (1,'Restart','2.00','','','Generic_Restart','3.0.0','APPC'),(2,'Configure',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(3,'ConfigModify',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(4,'Rebuild',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(5,'Restart',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(6,'HealthCheck',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(7,'StartApplication',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(8,'StopApplication',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(9,'Migrate',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(10,'Snapshot',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(11,'ConfigRestore',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(12,'ConfigBackup',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(13,'Evacuate',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(14,'Stop',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(15,'Start',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(16,'ConfigScaleOut',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(17,'DistributeTraffic',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'),(18,'DistributeTrafficCheck',NULL,NULL,NULL,'DGOrchestrator','4.0.0','APPC'); UNLOCK TABLES; @@ -51,5 +51,5 @@ INSERT INTO DOWNLOAD_DG_REFERENCE (DOWNLOAD_DG_REFERENCE_ID, PROTOCOL, DOWNLOAD_ UNLOCK TABLES; LOCK TABLES `DEVICE_AUTHENTICATION` WRITE; -INSERT INTO DEVICE_AUTHENTICATION (DEVICE_AUTHENTICATION_ID, PROTOCOL, USER_NAME, PASSWORD, URL) VALUES (1, 'ANSIBLE', 'admin','admin', 'http://appc-ansible-server:8000/Dispatch'); +INSERT INTO DEVICE_AUTHENTICATION (DEVICE_AUTHENTICATION_ID, VNF_TYPE, PROTOCOL, ACTION, USER_NAME, PASSWORD, URL) VALUES (1, 'ANSIBLE', '', '', 'admin','admin', 'http://appc-ansible-server:8000/Dispatch'); UNLOCK TABLES; |