db_schema: Create new table definitions

utils/kamctl/db_berkeley/kamailio/nds_trusted_domains

@@ -0,0 +1,10 @@
+METADATA_COLUMNS
+id(int) trusted_domain(str)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|''

utils/kamctl/db_berkeley/kamailio/s_cscf

@@ -0,0 +1,10 @@
+METADATA_COLUMNS
+id(int) name(str) s_cscf_uri(str)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|''|''

utils/kamctl/db_berkeley/kamailio/s_cscf_capabilities

@@ -0,0 +1,10 @@
+METADATA_COLUMNS
+id(int) id_s_cscf(int) capability(int)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|0|0

utils/kamctl/db_berkeley/kamailio/version

@@ -86,6 +86,8 @@ mtree|
 mtree|1
 mtrees|
 mtrees|2
+nds_trusted_domains|
+nds_trusted_domains|1
 pdt|
 pdt|1
 pl_pipes|
@@ -106,6 +108,10 @@ rtpengine|
 rtpengine|1
 rtpproxy|
 rtpproxy|1
+s_cscf|
+s_cscf|1
+s_cscf_capabilities|
+s_cscf_capabilities|1
 sca_subscriptions|
 sca_subscriptions|2
 secfilter|

utils/kamctl/db_redis/kamailio/nds_trusted_domains

@@ -0,0 +1,2 @@
+id/int,trusted_domain/string,
+1

utils/kamctl/db_redis/kamailio/s_cscf

@@ -0,0 +1,2 @@
+id/int,name/string,s_cscf_uri/string,
+1

utils/kamctl/db_redis/kamailio/s_cscf_capabilities

@@ -0,0 +1,2 @@
+id/int,id_s_cscf/int,capability/int,
+1

utils/kamctl/db_sqlite/ims_icscf-create.sql

@@ -0,0 +1,26 @@
+CREATE TABLE nds_trusted_domains (
+    id INTEGER PRIMARY KEY NOT NULL,
+    trusted_domain VARCHAR(83) DEFAULT '' NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('nds_trusted_domains','1');
+
+CREATE TABLE s_cscf (
+    id INTEGER PRIMARY KEY NOT NULL,
+    name VARCHAR(83) DEFAULT '' NOT NULL,
+    s_cscf_uri VARCHAR(83) DEFAULT '' NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf','1');
+
+CREATE TABLE s_cscf_capabilities (
+    id INTEGER PRIMARY KEY NOT NULL,
+    id_s_cscf INTEGER DEFAULT 0 NOT NULL,
+    capability INTEGER DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX s_cscf_capabilities_idx_capability ON s_cscf_capabilities (capability);
+CREATE INDEX s_cscf_capabilities_idx_id_s_cscf ON s_cscf_capabilities (id_s_cscf);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf_capabilities','1');
+

utils/kamctl/dbtext/kamailio/nds_trusted_domains

@@ -0,0 +1 @@
+id(int,auto) trusted_domain(string) 

utils/kamctl/dbtext/kamailio/s_cscf

@@ -0,0 +1 @@
+id(int,auto) name(string) s_cscf_uri(string) 

utils/kamctl/dbtext/kamailio/s_cscf_capabilities

@@ -0,0 +1 @@
+id(int,auto) id_s_cscf(int) capability(int) 

utils/kamctl/dbtext/kamailio/version

@@ -38,6 +38,7 @@ id(int,auto) table_name(string) table_version(int)
 0:mohqueues:1
 0:mtree:1
 0:mtrees:2
+0:nds_trusted_domains:1
 0:pdt:1
 0:pl_pipes:1
 0:presentity:5
@@ -48,6 +49,8 @@ id(int,auto) table_name(string) table_version(int)
 0:rls_watchers:3
 0:rtpengine:1
 0:rtpproxy:1
+0:s_cscf:1
+0:s_cscf_capabilities:1
 0:sca_subscriptions:2
 0:secfilter:1
 0:silo:8

utils/kamctl/mongodb/kamailio/nds_trusted_domains.json

@@ -0,0 +1,16 @@
+{
+  "name": "nds_trusted_domains",
+  "version": 1,
+  "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "trusted_domain": {
+      "type": "string",
+      "default": "",
+      "null": false
+    }
+  ]
+}

utils/kamctl/mongodb/kamailio/s_cscf.json

@@ -0,0 +1,21 @@
+{
+  "name": "s_cscf",
+  "version": 1,
+  "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "name": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
+    "s_cscf_uri": {
+      "type": "string",
+      "default": "",
+      "null": false
+    }
+  ]
+}

utils/kamctl/mongodb/kamailio/s_cscf_capabilities.json

@@ -0,0 +1,21 @@
+{
+  "name": "s_cscf_capabilities",
+  "version": 1,
+  "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "id_s_cscf": {
+      "type": "int",
+      "default": 0,
+      "null": false
+    },
+    "capability": {
+      "type": "int",
+      "default": 0,
+      "null": false
+    }
+  ]
+}

utils/kamctl/mongodb/kamailio/version-create.mongo

@@ -38,6 +38,7 @@ db.getCollection("version").insert({ table_name: "mohqcalls", table_version: Num
 db.getCollection("version").insert({ table_name: "mohqueues", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "mtree", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "mtrees", table_version: NumberInt(2) });
+db.getCollection("version").insert({ table_name: "nds_trusted_domains", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "pdt", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "pl_pipes", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "presentity", table_version: NumberInt(5) });
@@ -48,6 +49,8 @@ db.getCollection("version").insert({ table_name: "rls_presentity", table_version
 db.getCollection("version").insert({ table_name: "rls_watchers", table_version: NumberInt(3) });
 db.getCollection("version").insert({ table_name: "rtpengine", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "rtpproxy", table_version: NumberInt(1) });
+db.getCollection("version").insert({ table_name: "s_cscf", table_version: NumberInt(1) });
+db.getCollection("version").insert({ table_name: "s_cscf_capabilities", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "sca_subscriptions", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "secfilter", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "silo", table_version: NumberInt(8) });

utils/kamctl/mysql/ims_icscf-create.sql

@@ -0,0 +1,26 @@
+CREATE TABLE `nds_trusted_domains` (
+    `id` INT(10) AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `trusted_domain` VARCHAR(83) DEFAULT '' NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('nds_trusted_domains','1');
+
+CREATE TABLE `s_cscf` (
+    `id` INT(10) AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `name` VARCHAR(83) DEFAULT '' NOT NULL,
+    `s_cscf_uri` VARCHAR(83) DEFAULT '' NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf','1');
+
+CREATE TABLE `s_cscf_capabilities` (
+    `id` INT(10) AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `id_s_cscf` INT(11) DEFAULT 0 NOT NULL,
+    `capability` INT(11) DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX idx_capability ON s_cscf_capabilities (`capability`);
+CREATE INDEX idx_id_s_cscf ON s_cscf_capabilities (`id_s_cscf`);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf_capabilities','1');
+

utils/kamctl/oracle/ims_icscf-create.sql

@@ -0,0 +1,50 @@
+CREATE TABLE nds_trusted_domains (
+    id NUMBER(10) PRIMARY KEY,
+    trusted_domain VARCHAR2(83) DEFAULT ''
+);
+
+CREATE OR REPLACE TRIGGER nds_trusted_domains_tr
+before insert on nds_trusted_domains FOR EACH ROW
+BEGIN
+  auto_id(:NEW.id);
+END nds_trusted_domains_tr;
+/
+BEGIN map2users('nds_trusted_domains'); END;
+/
+INSERT INTO version (table_name, table_version) values ('nds_trusted_domains','1');
+
+CREATE TABLE s_cscf (
+    id NUMBER(10) PRIMARY KEY,
+    name VARCHAR2(83) DEFAULT '',
+    s_cscf_uri VARCHAR2(83) DEFAULT ''
+);
+
+CREATE OR REPLACE TRIGGER s_cscf_tr
+before insert on s_cscf FOR EACH ROW
+BEGIN
+  auto_id(:NEW.id);
+END s_cscf_tr;
+/
+BEGIN map2users('s_cscf'); END;
+/
+INSERT INTO version (table_name, table_version) values ('s_cscf','1');
+
+CREATE TABLE s_cscf_capabilities (
+    id NUMBER(10) PRIMARY KEY,
+    id_s_cscf NUMBER(10) DEFAULT 0 NOT NULL,
+    capability NUMBER(10) DEFAULT 0 NOT NULL
+);
+
+CREATE OR REPLACE TRIGGER s_cscf_capabilities_tr
+before insert on s_cscf_capabilities FOR EACH ROW
+BEGIN
+  auto_id(:NEW.id);
+END s_cscf_capabilities_tr;
+/
+BEGIN map2users('s_cscf_capabilities'); END;
+/
+CREATE INDEX ORA_idx_capability  ON s_cscf_capabilities (capability);
+CREATE INDEX ORA_idx_id_s_cscf  ON s_cscf_capabilities (id_s_cscf);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf_capabilities','1');
+

utils/kamctl/postgres/ims_icscf-create.sql

@@ -0,0 +1,26 @@
+CREATE TABLE nds_trusted_domains (
+    id SERIAL PRIMARY KEY NOT NULL,
+    trusted_domain VARCHAR(83) DEFAULT '' NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('nds_trusted_domains','1');
+
+CREATE TABLE s_cscf (
+    id SERIAL PRIMARY KEY NOT NULL,
+    name VARCHAR(83) DEFAULT '' NOT NULL,
+    s_cscf_uri VARCHAR(83) DEFAULT '' NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf','1');
+
+CREATE TABLE s_cscf_capabilities (
+    id SERIAL PRIMARY KEY NOT NULL,
+    id_s_cscf INTEGER DEFAULT 0 NOT NULL,
+    capability INTEGER DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX s_cscf_capabilities_idx_capability ON s_cscf_capabilities (capability);
+CREATE INDEX s_cscf_capabilities_idx_id_s_cscf ON s_cscf_capabilities (id_s_cscf);
+
+INSERT INTO version (table_name, table_version) values ('s_cscf_capabilities','1');
+

utils/kamctl/xhttp_pi/ims_icscf-mod

@@ -0,0 +1,111 @@
+	<!-- nds_trusted_domains provisioning -->
+	<mod><mod_name>nds_trusted_domains</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>trusted_domain</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>trusted_domain</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>trusted_domain</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
+	<!-- s_cscf provisioning -->
+	<mod><mod_name>s_cscf</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>name</field></col>
+				<col><field>s_cscf_uri</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>name</field></col>
+				<col><field>s_cscf_uri</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>name</field></col>
+				<col><field>s_cscf_uri</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
+	<!-- s_cscf_capabilities provisioning -->
+	<mod><mod_name>s_cscf_capabilities</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>id_s_cscf</field></col>
+				<col><field>capability</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>id_s_cscf</field></col>
+				<col><field>capability</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>id_s_cscf</field></col>
+				<col><field>capability</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>

utils/kamctl/xhttp_pi/ims_icscf-table

@@ -0,0 +1,23 @@
+	<!-- Declaration of nds_trusted_domains table-->
+	<db_table id="nds_trusted_domains">
+		<table_name>nds_trusted_domains</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>trusted_domain</field><type>DB1_STR</type></column>
+	</db_table>
+	<!-- Declaration of s_cscf table-->
+	<db_table id="s_cscf">
+		<table_name>s_cscf</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>name</field><type>DB1_STR</type></column>
+		<column><field>s_cscf_uri</field><type>DB1_STR</type></column>
+	</db_table>
+	<!-- Declaration of s_cscf_capabilities table-->
+	<db_table id="s_cscf_capabilities">
+		<table_name>s_cscf_capabilities</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>id_s_cscf</field><type>DB1_INT</type></column>
+		<column><field>capability</field><type>DB1_INT</type></column>
+	</db_table>

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -341,6 +341,29 @@
 		<column><field>room</field><type>DB1_STR</type></column>
 		<column><field>flag</field><type>DB1_INT</type></column>
 	</db_table>
+	<!-- Declaration of nds_trusted_domains table-->
+	<db_table id="nds_trusted_domains">
+		<table_name>nds_trusted_domains</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>trusted_domain</field><type>DB1_STR</type></column>
+	</db_table>
+	<!-- Declaration of s_cscf table-->
+	<db_table id="s_cscf">
+		<table_name>s_cscf</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>name</field><type>DB1_STR</type></column>
+		<column><field>s_cscf_uri</field><type>DB1_STR</type></column>
+	</db_table>
+	<!-- Declaration of s_cscf_capabilities table-->
+	<db_table id="s_cscf_capabilities">
+		<table_name>s_cscf_capabilities</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>id_s_cscf</field><type>DB1_INT</type></column>
+		<column><field>capability</field><type>DB1_INT</type></column>
+	</db_table>
 	<!-- Declaration of lcr_gw table-->
 	<db_table id="lcr_gw">
 		<table_name>lcr_gw</table_name>
@@ -2347,6 +2370,117 @@
 			</clause_cols>
 		</cmd>
 	</mod>
+	<!-- nds_trusted_domains provisioning -->
+	<mod><mod_name>nds_trusted_domains</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>trusted_domain</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>trusted_domain</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>trusted_domain</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>nds_trusted_domains</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
+	<!-- s_cscf provisioning -->
+	<mod><mod_name>s_cscf</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>name</field></col>
+				<col><field>s_cscf_uri</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>name</field></col>
+				<col><field>s_cscf_uri</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>name</field></col>
+				<col><field>s_cscf_uri</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>s_cscf</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
+	<!-- s_cscf_capabilities provisioning -->
+	<mod><mod_name>s_cscf_capabilities</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>id_s_cscf</field></col>
+				<col><field>capability</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>id_s_cscf</field></col>
+				<col><field>capability</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>id_s_cscf</field></col>
+				<col><field>capability</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>s_cscf_capabilities</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
 	<!-- lcr_gw provisioning -->
 	<mod><mod_name>lcr_gw</mod_name>
 		<cmd><cmd_name>show</cmd_name>