From 54e01f53faf196ca15a54becb4ab71e6079a4595 Mon Sep 17 00:00:00 2001 From: Andre Kantek Date: Thu, 7 Mar 2024 07:50:14 -0300 Subject: [PATCH] Split IP services in IPv4 and IPv6 for dual-stack support This change splits the IP service for each platform network into ipv4 and ipv6 t support dual-stack. It still supporting single-stack (when there is only ipv4 or ipv6) Test Plan: [WIP] Story: 2011027 Task: xxxxx Change-Id: Ic6451cae04769409babd2d6507c3677d1cce5617 Signed-off-by: Andre Kantek --- service-mgmt/sm-db/database/create_sm_db.sql | 39 ++++++++++++-------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/service-mgmt/sm-db/database/create_sm_db.sql b/service-mgmt/sm-db/database/create_sm_db.sql index c7f7abd1..94fec948 100644 --- a/service-mgmt/sm-db/database/create_sm_db.sql +++ b/service-mgmt/sm-db/database/create_sm_db.sql @@ -34,10 +34,11 @@ INSERT INTO "SERVICE_GROUPS" VALUES(8,'no','storage-monitoring-services','no','n INSERT INTO "SERVICE_GROUPS" VALUES(9,'yes','vim-services','no','no','initial','initial','','',300000,'yes'); INSERT INTO "SERVICE_GROUPS" VALUES(10,'no','distributed-cloud-services','no','no','initial','initial','','',300000,'yes'); CREATE TABLE SERVICE_GROUP_MEMBERS ( ID INTEGER PRIMARY KEY AUTOINCREMENT, PROVISIONED CHAR(32), NAME CHAR(32), SERVICE_NAME CHAR(32), SERVICE_FAILURE_IMPACT CHAR(32)); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(1,'yes','oam-services','oam-ip','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(2,'yes','controller-services','management-ip','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(3,'yes','controller-services','drbd-pg','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(4,'yes','controller-services','drbd-rabbit','critical'); +INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(1,'yes','oam-services','oam-ipv4','critical'); +INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(2,'yes','oam-services','oam-ipv6','critical'); +INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(3,'yes','controller-services','management-ip','critical'); +INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(4,'yes','controller-services','drbd-pg','critical'); +INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(5,'yes','controller-services','drbd-rabbit','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(6,'yes','controller-services','drbd-platform','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(7,'yes','controller-services','pg-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(8,'yes','controller-services','rabbit-fs','critical'); @@ -100,10 +101,11 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','distributed-cloud-s INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','distributed-cloud-services','dcmanager-state','major' FROM "SERVICE_GROUP_MEMBERS"; INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','admin-ip','critical' FROM "SERVICE_GROUP_MEMBERS"; CREATE TABLE SERVICES ( ID INTEGER PRIMARY KEY AUTOINCREMENT, PROVISIONED CHAR(32), NAME CHAR(32), DESIRED_STATE CHAR(32), STATE CHAR(32), STATUS CHAR(32), CONDITION CHAR(32), MAX_FAILURES INT, FAIL_COUNTDOWN INT, FAIL_COUNTDOWN_INTERVAL INT, MAX_ACTION_FAILURES INT, MAX_TRANSITION_FAILURES INT, PID_FILE CHAR(256) ); -INSERT INTO "SERVICES" VALUES(1,'yes','oam-ip','initial','initial','none','none',2,1,90000,4,16,''); -INSERT INTO "SERVICES" VALUES(2,'yes','management-ip','initial','initial','none','none',2,1,90000,4,16,''); -INSERT INTO "SERVICES" VALUES(3,'yes','drbd-pg','initial','initial','none','none',2,1,90000,4,16,''); -INSERT INTO "SERVICES" VALUES(4,'yes','drbd-rabbit','initial','initial','none','none',2,1,90000,4,16,''); +INSERT INTO "SERVICES" VALUES(1,'yes','oam-ipv4','initial','initial','none','none',2,1,90000,4,16,''); +INSERT INTO "SERVICES" VALUES(2,'yes','oam-ipv6','initial','initial','none','none',2,1,90000,4,16,''); +INSERT INTO "SERVICES" VALUES(3,'yes','management-ip','initial','initial','none','none',2,1,90000,4,16,''); +INSERT INTO "SERVICES" VALUES(4,'yes','drbd-pg','initial','initial','none','none',2,1,90000,4,16,''); +INSERT INTO "SERVICES" VALUES(5,'yes','drbd-rabbit','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(6,'yes','drbd-platform','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(7,'yes','pg-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(8,'yes','rabbit-fs','initial','initial','none','none',2,1,90000,4,16,''); @@ -166,8 +168,10 @@ INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','dcmanager-state','initial','init INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','admin-ip','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES"; CREATE TABLE SERVICE_HEARTBEAT ( ID INTEGER PRIMARY KEY AUTOINCREMENT, PROVISIONED CHAR(32), NAME CHAR(32), TYPE CHAR(32), SRC_ADDRESS CHAR(108), SRC_PORT INT, DST_ADDRESS CHAR(108), DST_PORT INT, MESSAGE CHAR(256), INTERVAL_IN_MS INT, MISSED_WARN INT, MISSED_DEGRADE INT, MISSED_FAIL INT, STATE CHAR(32), MISSED INT, HEARTBEAT_TIMER_ID INT, HEARTBEAT_SOCKET INT ); CREATE TABLE SERVICE_DEPENDENCY ( DEPENDENCY_TYPE CHAR(32), SERVICE_NAME CHAR(32), STATE CHAR(32), ACTION CHAR(32), DEPENDENT CHAR(32), DEPENDENT_STATE CHAR(32), PRIMARY KEY (DEPENDENCY_TYPE, SERVICE_NAME, STATE, ACTION, DEPENDENT)); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ip','not-applicable','enable','management-ip','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','enable','oam-ip','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ipv4','not-applicable','enable','management-ip','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ipv6','not-applicable','enable','management-ip','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','enable','oam-ipv4','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','enable','oam-ipv6','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','enable','dnsmasq','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','enable','open-ldap','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-pg','not-applicable','go-active','management-ip','enabled-active'); @@ -208,7 +212,8 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cinder','not-applicable', INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-lvm','not-applicable','enable','drbd-cinder','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','iscsi','not-applicable','enable','cinder-lvm','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','iscsi','not-applicable','enable','platform-fs','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ip','not-applicable','disable','haproxy','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ipv4','not-applicable','disable','haproxy','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ipv6','not-applicable','disable','haproxy','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','pg-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','rabbit-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','platform-fs','disabled'); @@ -327,10 +332,14 @@ INSERT INTO "SERVICE_INSTANCES" VALUES(12,'mgr-restful-plugin','mgr-restful-plug INSERT INTO "SERVICE_INSTANCES" VALUES(13,'ceph-manager','ceph-manager',''); INSERT INTO "SERVICE_INSTANCES" VALUES(14,'ceph-radosgw','ceph-radosgw',''); CREATE TABLE SERVICE_ACTIONS ( SERVICE_NAME CHAR(32), ACTION CHAR(32), PLUGIN_TYPE CHAR(32), PLUGIN_CLASS CHAR(32), PLUGIN_NAME CHAR(80), PLUGIN_COMMAND CHAR(80), PLUGIN_PARAMETERS CHAR(1024), MAX_FAILURE_RETRIES INT, MAX_TIMEOUT_RETRIES INT, MAX_TOTAL_RETRIES INT, TIMEOUT_IN_SECS INT, INTERVAL_IN_SECS INT, PRIMARY KEY (SERVICE_NAME, ACTION)); -INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ip','enable','ocf-script','heartbeat','IPaddr2','start','',2,2,2,20,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ip','disable','ocf-script','heartbeat','IPaddr2','stop','',1,1,1,20,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ip','audit-enabled','ocf-script','heartbeat','IPaddr2','monitor','',2,2,2,20,5); -INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ip','audit-disabled','ocf-script','heartbeat','IPaddr2','monitor','',0,0,0,20,5); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv4','enable','ocf-script','heartbeat','IPaddr2','start','',2,2,2,20,''); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv4','disable','ocf-script','heartbeat','IPaddr2','stop','',1,1,1,20,''); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv4','audit-enabled','ocf-script','heartbeat','IPaddr2','monitor','',2,2,2,20,5); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv4','audit-disabled','ocf-script','heartbeat','IPaddr2','monitor','',0,0,0,20,5); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv6','enable','ocf-script','heartbeat','IPaddr2','start','',2,2,2,20,''); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv6','disable','ocf-script','heartbeat','IPaddr2','stop','',1,1,1,20,''); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv6','audit-enabled','ocf-script','heartbeat','IPaddr2','monitor','',2,2,2,20,5); +INSERT INTO "SERVICE_ACTIONS" VALUES('oam-ipv6','audit-disabled','ocf-script','heartbeat','IPaddr2','monitor','',0,0,0,20,5); INSERT INTO "SERVICE_ACTIONS" VALUES('management-ip','enable','ocf-script','heartbeat','IPaddr2','start','',2,2,2,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('management-ip','disable','ocf-script','heartbeat','IPaddr2','stop','',1,1,1,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('management-ip','audit-enabled','ocf-script','heartbeat','IPaddr2','monitor','',2,2,2,20,5);