kamctl: regenerated db schema for userblocklist

utils/kamctl/db_berkeley/kamailio/globalblocklist

@@ -0,0 +1,12 @@
+METADATA_COLUMNS
+id(int) prefix(str) allowlist(int) description(str)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|''|0|NULL
+globalblocklist|
+globalblocklist|1

utils/kamctl/db_berkeley/kamailio/userblocklist

@@ -0,0 +1,12 @@
+METADATA_COLUMNS
+id(int) username(str) domain(str) prefix(str) allowlist(int)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|''|''|''|0
+userblocklist|
+userblocklist|1

utils/kamctl/db_berkeley/kamailio/version

@@ -54,8 +54,8 @@ dr_gw_lists|
 dr_gw_lists|1
 dr_rules|
 dr_rules|3
-globalblacklist|
-globalblacklist|1
+METADATA_DEFAULTS
+NIL|''|0|NULL
 grp|
 grp|2
 htable|
@@ -142,8 +142,8 @@ uid_user_attrs|
 uid_user_attrs|3
 uri|
 uri|1
-userblacklist|
-userblacklist|1
+METADATA_DEFAULTS
+NIL|''|''|''|0
 usr_preferences|
 usr_preferences|2
 watchers|

utils/kamctl/db_redis/kamailio/globalblocklist

@@ -0,0 +1,2 @@
+id/int,prefix/string,allowlist/int,description/string,
+1

utils/kamctl/db_redis/kamailio/userblocklist

@@ -0,0 +1,2 @@
+id/int,username/string,domain/string,prefix/string,allowlist/int,
+1

utils/kamctl/db_sqlite/userblocklist-create.sql

@@ -0,0 +1,23 @@
+CREATE TABLE userblocklist (
+    id INTEGER PRIMARY KEY NOT NULL,
+    username VARCHAR(64) DEFAULT '' NOT NULL,
+    domain VARCHAR(64) DEFAULT '' NOT NULL,
+    prefix VARCHAR(64) DEFAULT '' NOT NULL,
+    allowlist SMALLINT DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX userblocklist_userblocklist_idx ON userblocklist (username, domain, prefix);
+
+INSERT INTO version (table_name, table_version) values ('userblocklist','1');
+
+CREATE TABLE globalblocklist (
+    id INTEGER PRIMARY KEY NOT NULL,
+    prefix VARCHAR(64) DEFAULT '' NOT NULL,
+    allowlist SMALLINT DEFAULT 0 NOT NULL,
+    description VARCHAR(255) DEFAULT NULL
+);
+
+CREATE INDEX globalblocklist_globalblocklist_idx ON globalblocklist (prefix);
+
+INSERT INTO version (table_name, table_version) values ('globalblocklist','1');
+

utils/kamctl/dbtext/kamailio/globalblocklist

@@ -0,0 +1,2 @@
+id(int,auto) prefix(string) allowlist(int) description(string,null) 
+0:globalblocklist:1

utils/kamctl/dbtext/kamailio/userblocklist

@@ -0,0 +1,2 @@
+id(int,auto) username(string) domain(string) prefix(string) allowlist(int) 
+0:userblocklist:1

utils/kamctl/dbtext/kamailio/version

@@ -22,7 +22,7 @@ id(int,auto) table_name(string) table_version(int)
 0:dr_groups:2
 0:dr_gw_lists:1
 0:dr_rules:3
-0:globalblacklist:1
+id(int,auto) prefix(string) whitelist(int) description(string,null) 
 0:grp:2
 0:htable:2
 0:imc_members:1
@@ -66,7 +66,7 @@ id(int,auto) table_name(string) table_version(int)
 0:uid_uri_attrs:2
 0:uid_user_attrs:3
 0:uri:1
-0:userblacklist:1
+id(int,auto) username(string) domain(string) prefix(string) whitelist(int) 
 0:usr_preferences:2
 0:watchers:3
 0:xcap:4

utils/kamctl/mongodb/kamailio/globalblocklist.json

@@ -0,0 +1,26 @@
+{
+  "name": "globalblocklist",
+  "version": 1,
+  "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "prefix": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
+    "allowlist": {
+      "type": "int",
+      "default": 0,
+      "null": false
+    },
+    "description": {
+      "type": "string",
+      "default": null,
+      "null": true
+    }
+  ]
+}

utils/kamctl/mongodb/kamailio/userblocklist.json

@@ -0,0 +1,31 @@
+{
+  "name": "userblocklist",
+  "version": 1,
+  "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "username": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
+    "domain": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
+    "prefix": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
+    "allowlist": {
+      "type": "int",
+      "default": 0,
+      "null": false
+    }
+  ]
+}

utils/kamctl/mysql/userblocklist-create.sql

@@ -0,0 +1,23 @@
+CREATE TABLE `userblocklist` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `allowlist` TINYINT(1) DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX userblocklist_idx ON userblocklist (`username`, `domain`, `prefix`);
+
+INSERT INTO version (table_name, table_version) values ('userblocklist','1');
+
+CREATE TABLE `globalblocklist` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `allowlist` TINYINT(1) DEFAULT 0 NOT NULL,
+    `description` VARCHAR(255) DEFAULT NULL
+);
+
+CREATE INDEX globalblocklist_idx ON globalblocklist (`prefix`);
+
+INSERT INTO version (table_name, table_version) values ('globalblocklist','1');
+

utils/kamctl/oracle/userblocklist-create.sql

@@ -0,0 +1,39 @@
+CREATE TABLE userblocklist (
+    id NUMBER(10) PRIMARY KEY,
+    username VARCHAR2(64) DEFAULT '',
+    domain VARCHAR2(64) DEFAULT '',
+    prefix VARCHAR2(64) DEFAULT '',
+    allowlist NUMBER(5) DEFAULT 0 NOT NULL
+);
+
+CREATE OR REPLACE TRIGGER userblocklist_tr
+before insert on userblocklist FOR EACH ROW
+BEGIN
+  auto_id(:NEW.id);
+END userblocklist_tr;
+/
+BEGIN map2users('userblocklist'); END;
+/
+CREATE INDEX ORA_userblocklist_idx  ON userblocklist (username, domain, prefix);
+
+INSERT INTO version (table_name, table_version) values ('userblocklist','1');
+
+CREATE TABLE globalblocklist (
+    id NUMBER(10) PRIMARY KEY,
+    prefix VARCHAR2(64) DEFAULT '',
+    allowlist NUMBER(5) DEFAULT 0 NOT NULL,
+    description VARCHAR2(255) DEFAULT NULL
+);
+
+CREATE OR REPLACE TRIGGER globalblocklist_tr
+before insert on globalblocklist FOR EACH ROW
+BEGIN
+  auto_id(:NEW.id);
+END globalblocklist_tr;
+/
+BEGIN map2users('globalblocklist'); END;
+/
+CREATE INDEX ORA_globalblocklist_idx  ON globalblocklist (prefix);
+
+INSERT INTO version (table_name, table_version) values ('globalblocklist','1');
+

utils/kamctl/postgres/userblocklist-create.sql

@@ -0,0 +1,23 @@
+CREATE TABLE userblocklist (
+    id SERIAL PRIMARY KEY NOT NULL,
+    username VARCHAR(64) DEFAULT '' NOT NULL,
+    domain VARCHAR(64) DEFAULT '' NOT NULL,
+    prefix VARCHAR(64) DEFAULT '' NOT NULL,
+    allowlist SMALLINT DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX userblocklist_userblocklist_idx ON userblocklist (username, domain, prefix);
+
+INSERT INTO version (table_name, table_version) values ('userblocklist','1');
+
+CREATE TABLE globalblocklist (
+    id SERIAL PRIMARY KEY NOT NULL,
+    prefix VARCHAR(64) DEFAULT '' NOT NULL,
+    allowlist SMALLINT DEFAULT 0 NOT NULL,
+    description VARCHAR(255) DEFAULT NULL
+);
+
+CREATE INDEX globalblocklist_globalblocklist_idx ON globalblocklist (prefix);
+
+INSERT INTO version (table_name, table_version) values ('globalblocklist','1');
+

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -950,6 +950,25 @@
 		<column><field>whitelist</field><type>DB1_INT</type></column>
 		<column><field>description</field><type>DB1_STR</type></column>
 	</db_table>
+	<!-- Declaration of userblocklist table-->
+	<db_table id="userblocklist">
+		<table_name>userblocklist</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>username</field><type>DB1_STR</type></column>
+		<column><field>domain</field><type>DB1_STR</type></column>
+		<column><field>prefix</field><type>DB1_STR</type></column>
+		<column><field>allowlist</field><type>DB1_INT</type></column>
+	</db_table>
+	<!-- Declaration of globalblocklist table-->
+	<db_table id="globalblocklist">
+		<table_name>globalblocklist</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>prefix</field><type>DB1_STR</type></column>
+		<column><field>allowlist</field><type>DB1_INT</type></column>
+		<column><field>description</field><type>DB1_STR</type></column>
+	</db_table>
 	<!-- Declaration of location table-->
 	<db_table id="location">
 		<table_name>location</table_name>
@@ -4760,6 +4779,91 @@
 			</clause_cols>
 		</cmd>
 	</mod>
+	<!-- userblocklist provisionning -->
+	<mod><mod_name>userblocklist</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
+	<!-- globalblocklist provisionning -->
+	<mod><mod_name>globalblocklist</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+				<col><field>description</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+				<col><field>description</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+				<col><field>description</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
 	<!-- location provisionning -->
 	<mod><mod_name>location</mod_name>
 		<cmd><cmd_name>show</cmd_name>

utils/kamctl/xhttp_pi/userblocklist-mod

@@ -0,0 +1,85 @@
+	<!-- userblocklist provisionning -->
+	<mod><mod_name>userblocklist</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>userblocklist</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
+	<!-- globalblocklist provisionning -->
+	<mod><mod_name>globalblocklist</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+				<col><field>description</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_INSERT</cmd_type>
+			<query_cols>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+				<col><field>description</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>globalblocklist</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>prefix</field></col>
+				<col><field>allowlist</field></col>
+				<col><field>description</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>globalblocklist</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/userblocklist-table

@@ -0,0 +1,19 @@
+	<!-- Declaration of userblocklist table-->
+	<db_table id="userblocklist">
+		<table_name>userblocklist</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>username</field><type>DB1_STR</type></column>
+		<column><field>domain</field><type>DB1_STR</type></column>
+		<column><field>prefix</field><type>DB1_STR</type></column>
+		<column><field>allowlist</field><type>DB1_INT</type></column>
+	</db_table>
+	<!-- Declaration of globalblocklist table-->
+	<db_table id="globalblocklist">
+		<table_name>globalblocklist</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>prefix</field><type>DB1_STR</type></column>
+		<column><field>allowlist</field><type>DB1_INT</type></column>
+		<column><field>description</field><type>DB1_STR</type></column>
+	</db_table>