kamctl: db schema regenerated - updates to userblocklist and topos mo…

…dules

utils/kamctl/db_berkeley/kamailio/globalblocklist

@@ -8,5 +8,3 @@ METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
 NIL|''|0|NULL
-globalblocklist|
-globalblocklist|1

utils/kamctl/db_berkeley/kamailio/topos_d

@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) s_method(str) s_cseq(str) a_callid(str) a_uuid(str) b_uuid(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) a_tag(str) b_tag(str) a_rr(str) b_rr(str) s_rr(str) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str)
+id(int) rectime(datetime) x_context(str) s_method(str) s_cseq(str) a_callid(str) a_uuid(str) b_uuid(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) a_tag(str) b_tag(str) a_rr(str) b_rr(str) s_rr(str) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str)
 METADATA_KEY
-4 5 6 
+5 6 7 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|NIL|NIL|NIL|0|''|''|''|''|''|''|''
+NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''|NIL|NIL|NIL|0|''|''|''|''|''|''|''

utils/kamctl/db_berkeley/kamailio/topos_t

@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) s_method(str) s_cseq(str) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) y_rr(str) s_rr(str) x_uri(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) x_tag(str) a_tag(str) b_tag(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str)
+id(int) rectime(datetime) x_context(str) s_method(str) s_cseq(str) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) y_rr(str) s_rr(str) x_uri(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) x_tag(str) a_tag(str) b_tag(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str)
 METADATA_KEY
-4 5 6 7 9 
+5 6 7 8 10 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|''|''|0|NIL|''|NIL|NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''
+NIL|NIL|''|''|''|''|''|''|0|NIL|''|NIL|NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''

utils/kamctl/db_berkeley/kamailio/userblocklist

@@ -8,5 +8,3 @@ 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
-METADATA_DEFAULTS
-NIL|''|0|NULL
+globalblocklist|
+globalblocklist|1
 grp|
 grp|2
 htable|
@@ -119,9 +119,9 @@ speed_dial|2
 subscriber|
 subscriber|7
 topos_d|
-topos_d|1
+topos_d|2
 topos_t|
-topos_t|1
+topos_t|2
 trusted|
 trusted|6
 uacreg|
@@ -142,8 +142,8 @@ uid_user_attrs|
 uid_user_attrs|3
 uri|
 uri|1
-METADATA_DEFAULTS
-NIL|''|''|''|0
+userblocklist|
+userblocklist|1
 usr_preferences|
 usr_preferences|2
 watchers|

utils/kamctl/db_redis/kamailio/topos_d

@@ -1,2 +1,2 @@
-id/int,rectime/int,s_method/string,s_cseq/string,a_callid/string,a_uuid/string,b_uuid/string,a_contact/string,b_contact/string,as_contact/string,bs_contact/string,a_tag/string,b_tag/string,a_rr/string,b_rr/string,s_rr/string,iflags/int,a_uri/string,b_uri/string,r_uri/string,a_srcaddr/string,b_srcaddr/string,a_socket/string,b_socket/string,
-1
+id/int,rectime/int,x_context/string,s_method/string,s_cseq/string,a_callid/string,a_uuid/string,b_uuid/string,a_contact/string,b_contact/string,as_contact/string,bs_contact/string,a_tag/string,b_tag/string,a_rr/string,b_rr/string,s_rr/string,iflags/int,a_uri/string,b_uri/string,r_uri/string,a_srcaddr/string,b_srcaddr/string,a_socket/string,b_socket/string,
+2

utils/kamctl/db_redis/kamailio/topos_t

@@ -1,2 +1,2 @@
-id/int,rectime/int,s_method/string,s_cseq/string,a_callid/string,a_uuid/string,b_uuid/string,direction/int,x_via/string,x_vbranch/string,x_rr/string,y_rr/string,s_rr/string,x_uri/string,a_contact/string,b_contact/string,as_contact/string,bs_contact/string,x_tag/string,a_tag/string,b_tag/string,a_srcaddr/string,b_srcaddr/string,a_socket/string,b_socket/string,
-1
+id/int,rectime/int,x_context/string,s_method/string,s_cseq/string,a_callid/string,a_uuid/string,b_uuid/string,direction/int,x_via/string,x_vbranch/string,x_rr/string,y_rr/string,s_rr/string,x_uri/string,a_contact/string,b_contact/string,as_contact/string,bs_contact/string,x_tag/string,a_tag/string,b_tag/string,a_srcaddr/string,b_srcaddr/string,a_socket/string,b_socket/string,
+2

utils/kamctl/db_sqlite/topos-create.sql

@@ -1,6 +1,7 @@
 CREATE TABLE topos_d (
     id INTEGER PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
@@ -30,11 +31,12 @@ CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid);
 CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid);
 CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid);
 
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
 
 CREATE TABLE topos_t (
     id INTEGER PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
@@ -65,5 +67,5 @@ CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid);
 CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch);
 CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid);
 
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
 

utils/kamctl/dbtext/kamailio/globalblocklist

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

utils/kamctl/dbtext/kamailio/topos_d

@@ -1 +1 @@
-id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) a_tag(string) b_tag(string) a_rr(string,null) b_rr(string,null) s_rr(string,null) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) 
+id(int,auto) rectime(int) x_context(string) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) a_tag(string) b_tag(string) a_rr(string,null) b_rr(string,null) s_rr(string,null) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) 

utils/kamctl/dbtext/kamailio/topos_t

@@ -1 +1 @@
-id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string,null) x_vbranch(string) x_rr(string,null) y_rr(string,null) s_rr(string,null) x_uri(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) x_tag(string) a_tag(string) b_tag(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) 
+id(int,auto) rectime(int) x_context(string) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string,null) x_vbranch(string) x_rr(string,null) y_rr(string,null) s_rr(string,null) x_uri(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) x_tag(string) a_tag(string) b_tag(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) 

utils/kamctl/dbtext/kamailio/userblocklist

@@ -1,2 +1 @@
 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
-id(int,auto) prefix(string) whitelist(int) description(string,null) 
+0:globalblocklist:1
 0:grp:2
 0:htable:2
 0:imc_members:1
@@ -54,8 +54,8 @@ id(int,auto) prefix(string) whitelist(int) description(string,null)
 0:sip_trace:4
 0:speed_dial:2
 0:subscriber:7
-0:topos_d:1
-0:topos_t:1
+0:topos_d:2
+0:topos_t:2
 0:trusted:6
 0:uacreg:4
 0:uid_credentials:7
@@ -66,7 +66,7 @@ id(int,auto) prefix(string) whitelist(int) description(string,null)
 0:uid_uri_attrs:2
 0:uid_user_attrs:3
 0:uri:1
-id(int,auto) username(string) domain(string) prefix(string) whitelist(int) 
+0:userblocklist:1
 0:usr_preferences:2
 0:watchers:3
 0:xcap:4

utils/kamctl/mongodb/kamailio/topos_d.json

@@ -1,6 +1,6 @@
 {
   "name": "topos_d",
-  "version": 1,
+  "version": 2,
   "columns": [
     "id": {
       "type": "int",
@@ -12,6 +12,11 @@
       "default": null,
       "null": false
     },
+    "x_context": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
     "s_method": {
       "type": "string",
       "default": "",

utils/kamctl/mongodb/kamailio/topos_t.json

@@ -1,6 +1,6 @@
 {
   "name": "topos_t",
-  "version": 1,
+  "version": 2,
   "columns": [
     "id": {
       "type": "int",
@@ -12,6 +12,11 @@
       "default": null,
       "null": false
     },
+    "x_context": {
+      "type": "string",
+      "default": "",
+      "null": false
+    },
     "s_method": {
       "type": "string",
       "default": "",

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

@@ -22,7 +22,7 @@ db.getCollection("version").insert({ table_name: "dr_gateways", table_version: N
 db.getCollection("version").insert({ table_name: "dr_groups", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "dr_gw_lists", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "dr_rules", table_version: NumberInt(3) });
-db.getCollection("version").insert({ table_name: "globalblacklist", table_version: NumberInt(1) });
+db.getCollection("version").insert({ table_name: "globalblocklist", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "grp", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "htable", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "imc_members", table_version: NumberInt(1) });
@@ -54,8 +54,8 @@ db.getCollection("version").insert({ table_name: "silo", table_version: NumberIn
 db.getCollection("version").insert({ table_name: "sip_trace", table_version: NumberInt(4) });
 db.getCollection("version").insert({ table_name: "speed_dial", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "subscriber", table_version: NumberInt(7) });
-db.getCollection("version").insert({ table_name: "topos_d", table_version: NumberInt(1) });
-db.getCollection("version").insert({ table_name: "topos_t", table_version: NumberInt(1) });
+db.getCollection("version").insert({ table_name: "topos_d", table_version: NumberInt(2) });
+db.getCollection("version").insert({ table_name: "topos_t", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "trusted", table_version: NumberInt(6) });
 db.getCollection("version").insert({ table_name: "uacreg", table_version: NumberInt(4) });
 db.getCollection("version").insert({ table_name: "uid_credentials", table_version: NumberInt(7) });
@@ -66,7 +66,7 @@ db.getCollection("version").insert({ table_name: "uid_uri", table_version: Numbe
 db.getCollection("version").insert({ table_name: "uid_uri_attrs", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "uid_user_attrs", table_version: NumberInt(3) });
 db.getCollection("version").insert({ table_name: "uri", table_version: NumberInt(1) });
-db.getCollection("version").insert({ table_name: "userblacklist", table_version: NumberInt(1) });
+db.getCollection("version").insert({ table_name: "userblocklist", table_version: NumberInt(1) });
 db.getCollection("version").insert({ table_name: "usr_preferences", table_version: NumberInt(2) });
 db.getCollection("version").insert({ table_name: "watchers", table_version: NumberInt(3) });
 db.getCollection("version").insert({ table_name: "xcap", table_version: NumberInt(4) });

utils/kamctl/mysql/topos-create.sql

@@ -1,6 +1,7 @@
 CREATE TABLE `topos_d` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `rectime` DATETIME NOT NULL,
+    `x_context` VARCHAR(64) DEFAULT '' NOT NULL,
     `s_method` VARCHAR(64) DEFAULT '' NOT NULL,
     `s_cseq` VARCHAR(64) DEFAULT '' NOT NULL,
     `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
@@ -30,11 +31,12 @@ CREATE INDEX a_callid_idx ON topos_d (`a_callid`);
 CREATE INDEX a_uuid_idx ON topos_d (`a_uuid`);
 CREATE INDEX b_uuid_idx ON topos_d (`b_uuid`);
 
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
 
 CREATE TABLE `topos_t` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `rectime` DATETIME NOT NULL,
+    `x_context` VARCHAR(64) DEFAULT '' NOT NULL,
     `s_method` VARCHAR(64) DEFAULT '' NOT NULL,
     `s_cseq` VARCHAR(64) DEFAULT '' NOT NULL,
     `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
@@ -65,5 +67,5 @@ CREATE INDEX a_callid_idx ON topos_t (`a_callid`);
 CREATE INDEX x_vbranch_idx ON topos_t (`x_vbranch`);
 CREATE INDEX a_uuid_idx ON topos_t (`a_uuid`);
 
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
 

utils/kamctl/oracle/topos-create.sql

@@ -1,6 +1,7 @@
 CREATE TABLE topos_d (
     id NUMBER(10) PRIMARY KEY,
     rectime DATE,
+    x_context VARCHAR2(64) DEFAULT '',
     s_method VARCHAR2(64) DEFAULT '',
     s_cseq VARCHAR2(64) DEFAULT '',
     a_callid VARCHAR2(255) DEFAULT '',
@@ -38,11 +39,12 @@ CREATE INDEX topos_d_a_callid_idx  ON topos_d (a_callid);
 CREATE INDEX topos_d_a_uuid_idx  ON topos_d (a_uuid);
 CREATE INDEX topos_d_b_uuid_idx  ON topos_d (b_uuid);
 
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
 
 CREATE TABLE topos_t (
     id NUMBER(10) PRIMARY KEY,
     rectime DATE,
+    x_context VARCHAR2(64) DEFAULT '',
     s_method VARCHAR2(64) DEFAULT '',
     s_cseq VARCHAR2(64) DEFAULT '',
     a_callid VARCHAR2(255) DEFAULT '',
@@ -81,5 +83,5 @@ CREATE INDEX topos_t_a_callid_idx  ON topos_t (a_callid);
 CREATE INDEX topos_t_x_vbranch_idx  ON topos_t (x_vbranch);
 CREATE INDEX topos_t_a_uuid_idx  ON topos_t (a_uuid);
 
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
 

utils/kamctl/postgres/topos-create.sql

@@ -1,6 +1,7 @@
 CREATE TABLE topos_d (
     id SERIAL PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
@@ -30,11 +31,12 @@ CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid);
 CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid);
 CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid);
 
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
 
 CREATE TABLE topos_t (
     id SERIAL PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
@@ -65,5 +67,5 @@ CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid);
 CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch);
 CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid);
 
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
+INSERT INTO version (table_name, table_version) values ('topos_t','2');