kamctl: refresh db creation files

utils/kamctl/db_berkeley/kamailio/dialog_out

@@ -1,7 +1,7 @@
 METADATA_COLUMNS
 id(int) hash_entry(int) hash_id(int) did(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) callee_contact(str) callee_route_set(str) callee_sock(str)
 METADATA_KEY
-1 2
+1 2 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS

utils/kamctl/db_berkeley/kamailio/pcscf_location

@@ -0,0 +1,12 @@
+METADATA_COLUMNS
+id(int) domain(str) aor(str) host(str) port(int) received(str) received_port(int) received_proto(int) path(str) rinstance(str) rx_session_id(str) reg_state(int) expires(datetime) service_routes(str) socket(str) public_ids(str) security_type(int) protocol(str) mode(str) ck(str) ik(str) ealg(str) ialg(str) port_pc(int) port_ps(int) port_uc(int) port_us(int) spi_pc(int) spi_ps(int) spi_uc(int) spi_us(int) t_security_type(int) t_protocol(str) t_mode(str) t_ck(str) t_ik(str) t_ealg(str) t_ialg(str) t_port_pc(int) t_port_ps(int) t_port_uc(int) t_port_us(int) t_spi_pc(int) t_spi_ps(int) t_spi_uc(int) t_spi_us(int)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|NIL|NIL|NIL|NIL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|'2030-05-28 21:32:15'|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL|NULL
+pcscf_location|
+pcscf_location|7

utils/kamctl/db_berkeley/kamailio/version

@@ -1,7 +1,7 @@
 METADATA_COLUMNS
 id(int) table_name(str) table_version(int)
 METADATA_KEY
-1
+1 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS

utils/kamctl/db_redis/kamailio/pcscf_location

@@ -0,0 +1,2 @@
+id/int,domain/string,aor/string,host/string,port/int,received/string,received_port/int,received_proto/int,path/string,rinstance/string,rx_session_id/string,reg_state/int,expires/time,service_routes/string,socket/string,public_ids/string,security_type/int,protocol/string,mode/string,ck/string,ik/string,ealg/string,ialg/string,port_pc/int,port_ps/int,port_uc/int,port_us/int,spi_pc/int,spi_ps/int,spi_uc/int,spi_us/int,t_security_type/int,t_protocol/string,t_mode/string,t_ck/string,t_ik/string,t_ealg/string,t_ialg/string,t_port_pc/int,t_port_ps/int,t_port_uc/int,t_port_us/int,t_spi_pc/int,t_spi_ps/int,t_spi_uc/int,t_spi_us/int,
+7

utils/kamctl/db_sqlite/htable-create.sql

@@ -8,3 +8,4 @@ CREATE TABLE htable (
 );
 
 INSERT INTO version (table_name, table_version) values ('htable','2');
+

utils/kamctl/db_sqlite/ims_dialog-create.sql

@@ -52,3 +52,4 @@ CREATE TABLE dialog_vars (
 CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id);
 
 INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
+

utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql

@@ -1,4 +1,4 @@
-CREATE TABLE location (
+CREATE TABLE pcscf_location (
     id INTEGER PRIMARY KEY NOT NULL,
     domain VARCHAR(64) NOT NULL,
     aor VARCHAR(255) NOT NULL,
@@ -47,6 +47,7 @@ CREATE TABLE location (
     t_spi_us INTEGER DEFAULT NULL
 );
 
-CREATE INDEX location_aor_idx ON location (aor);
+CREATE INDEX pcscf_location_aor_idx ON pcscf_location (aor);
+
+INSERT INTO version (table_name, table_version) values ('pcscf_location','7');
 
-INSERT INTO version (table_name, table_version) values ('location','7');

utils/kamctl/dbtext/kamailio/dialog_in

@@ -1 +1 @@
-id(int,auto) hash_entry(int) hash_id(int) did(string) callid(string) from_uri(string) from_tag(string) caller_original_cseq(string) req_uri(string) caller_route_set(string,null) caller_contact(string) caller_sock(string) timeout(int) state(int) start_time(int) sflags(int) toroute_name(string,null) toroute_index(int)
+id(int,auto) hash_entry(int) hash_id(int) did(string) callid(string) from_uri(string) from_tag(string) caller_original_cseq(string) req_uri(string) caller_route_set(string,null) caller_contact(string) caller_sock(string) timeout(int) state(int) start_time(int) sflags(int) toroute_name(string,null) toroute_index(int) 

utils/kamctl/dbtext/kamailio/dialog_out

@@ -1 +1 @@
-id(int,auto) hash_entry(int) hash_id(int) did(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) callee_contact(string) callee_route_set(string,null) callee_sock(string)
+id(int,auto) hash_entry(int) hash_id(int) did(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) callee_contact(string) callee_route_set(string,null) callee_sock(string) 

utils/kamctl/dbtext/kamailio/pcscf_location

@@ -0,0 +1,2 @@
+id(int,auto) domain(string) aor(string) host(string) port(int) received(string,null) received_port(int,null) received_proto(int,null) path(string,null) rinstance(string,null) rx_session_id(string,null) reg_state(int,null) expires(int,null) service_routes(string,null) socket(string,null) public_ids(string,null) security_type(int,null) protocol(string,null) mode(string,null) ck(string,null) ik(string,null) ealg(string,null) ialg(string,null) port_pc(int,null) port_ps(int,null) port_uc(int,null) port_us(int,null) spi_pc(int,null) spi_ps(int,null) spi_uc(int,null) spi_us(int,null) t_security_type(int,null) t_protocol(string,null) t_mode(string,null) t_ck(string,null) t_ik(string,null) t_ealg(string,null) t_ialg(string,null) t_port_pc(int,null) t_port_ps(int,null) t_port_uc(int,null) t_port_us(int,null) t_spi_pc(int,null) t_spi_ps(int,null) t_spi_uc(int,null) t_spi_us(int,null) 
+0:pcscf_location:7

utils/kamctl/dbtext/kamailio/version

@@ -1,4 +1,4 @@
-id(int,auto) table_name(string) table_version(int)
+id(int,auto) table_name(string) table_version(int) 
 0:version:1
 0:acc:5
 0:acc_cdrs:2

utils/kamctl/mongodb/kamailio/dialog_in.json

@@ -93,4 +93,4 @@
       "null": false
     }
   ]
-}
+}

utils/kamctl/mongodb/kamailio/dialog_out.json

@@ -58,4 +58,4 @@
       "null": false
     }
   ]
-}
+}

utils/kamctl/mongodb/kamailio/pcscf_location.json

@@ -0,0 +1,236 @@
+{
+  "name": "pcscf_location",
+  "version": 7,
+  "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "domain": {
+      "type": "string",
+      "default": null,
+      "null": false
+    },
+    "aor": {
+      "type": "string",
+      "default": null,
+      "null": false
+    },
+    "host": {
+      "type": "string",
+      "default": null,
+      "null": false
+    },
+    "port": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
+    "received": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "received_port": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "received_proto": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "path": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "rinstance": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "rx_session_id": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "reg_state": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "expires": {
+      "type": "datetime",
+      "default": "2030-05-28 21:32:15",
+      "null": true
+    },
+    "service_routes": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "socket": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "public_ids": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "security_type": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "protocol": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "mode": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "ck": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "ik": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "ealg": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "ialg": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "port_pc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "port_ps": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "port_uc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "port_us": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "spi_pc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "spi_ps": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "spi_uc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "spi_us": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_security_type": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_protocol": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "t_mode": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "t_ck": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "t_ik": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "t_ealg": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "t_ialg": {
+      "type": "string",
+      "default": null,
+      "null": true
+    },
+    "t_port_pc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_port_ps": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_port_uc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_port_us": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_spi_pc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_spi_ps": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_spi_uc": {
+      "type": "int",
+      "default": null,
+      "null": true
+    },
+    "t_spi_us": {
+      "type": "int",
+      "default": null,
+      "null": true
+    }
+  ]
+}

utils/kamctl/mysql/htable-create.sql

@@ -8,3 +8,4 @@ CREATE TABLE `htable` (
 );
 
 INSERT INTO version (table_name, table_version) values ('htable','2');
+

utils/kamctl/mysql/ims_dialog-create.sql

@@ -52,3 +52,4 @@ CREATE TABLE `dialog_vars` (
 CREATE INDEX hash_idx ON dialog_vars (`hash_entry`, `hash_id`);
 
 INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
+

utils/kamctl/mysql/ims_usrloc_pcscf-create.sql

@@ -1,4 +1,4 @@
-CREATE TABLE `location` (
+CREATE TABLE `pcscf_location` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `domain` VARCHAR(64) NOT NULL,
     `aor` VARCHAR(255) NOT NULL,
@@ -47,6 +47,7 @@ CREATE TABLE `location` (
     `t_spi_us` INT(11) UNSIGNED DEFAULT NULL
 );
 
-CREATE INDEX aor_idx ON location (`aor`);
+CREATE INDEX aor_idx ON pcscf_location (`aor`);
+
+INSERT INTO version (table_name, table_version) values ('pcscf_location','7');
 
-INSERT INTO version (table_name, table_version) values ('location','7');

utils/kamctl/oracle/htable-create.sql

@@ -16,3 +16,4 @@ END htable_tr;
 BEGIN map2users('htable'); END;
 /
 INSERT INTO version (table_name, table_version) values ('htable','2');
+

utils/kamctl/oracle/ims_dialog-create.sql

@@ -76,3 +76,4 @@ BEGIN map2users('dialog_vars'); END;
 CREATE INDEX dialog_vars_hash_idx  ON dialog_vars (hash_entry, hash_id);
 
 INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
+

utils/kamctl/oracle/ims_usrloc_pcscf-create.sql

@@ -1,4 +1,4 @@
-CREATE TABLE location (
+CREATE TABLE pcscf_location (
     id NUMBER(10) PRIMARY KEY,
     domain VARCHAR2(64),
     aor VARCHAR2(255),
@@ -47,14 +47,15 @@ CREATE TABLE location (
     t_spi_us NUMBER(10) DEFAULT NULL
 );
 
-CREATE OR REPLACE TRIGGER location_tr
-before insert on location FOR EACH ROW
+CREATE OR REPLACE TRIGGER pcscf_location_tr
+before insert on pcscf_location FOR EACH ROW
 BEGIN
   auto_id(:NEW.id);
-END location_tr;
+END pcscf_location_tr;
 /
-BEGIN map2users('location'); END;
+BEGIN map2users('pcscf_location'); END;
 /
-CREATE INDEX location_aor_idx  ON location (aor);
+CREATE INDEX pcscf_location_aor_idx  ON pcscf_location (aor);
+
+INSERT INTO version (table_name, table_version) values ('pcscf_location','7');
 
-INSERT INTO version (table_name, table_version) values ('location','7');

utils/kamctl/postgres/htable-create.sql

@@ -8,3 +8,4 @@ CREATE TABLE htable (
 );
 
 INSERT INTO version (table_name, table_version) values ('htable','2');
+

utils/kamctl/postgres/ims_dialog-create.sql

@@ -52,3 +52,4 @@ CREATE TABLE dialog_vars (
 CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id);
 
 INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
+

utils/kamctl/postgres/ims_usrloc_pcscf-create.sql

@@ -1,4 +1,4 @@
-CREATE TABLE location (
+CREATE TABLE pcscf_location (
     id SERIAL PRIMARY KEY NOT NULL,
     domain VARCHAR(64) NOT NULL,
     aor VARCHAR(255) NOT NULL,
@@ -47,6 +47,7 @@ CREATE TABLE location (
     t_spi_us INTEGER DEFAULT NULL
 );
 
-CREATE INDEX location_aor_idx ON location (aor);
+CREATE INDEX pcscf_location_aor_idx ON pcscf_location (aor);
+
+INSERT INTO version (table_name, table_version) values ('pcscf_location','7');
 
-INSERT INTO version (table_name, table_version) values ('location','7');

utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod

@@ -1,7 +1,7 @@
-	<!-- location provisioning -->
-	<mod><mod_name>location</mod_name>
+	<!-- pcscf_location provisioning -->
+	<mod><mod_name>pcscf_location</mod_name>
 		<cmd><cmd_name>show</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_QUERY</cmd_type>
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
@@ -53,7 +53,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>domain</field></col>
@@ -104,7 +104,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_UPDATE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>
@@ -158,7 +158,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_DELETE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>

utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table

@@ -1,6 +1,6 @@
-	<!-- Declaration of location table-->
-	<db_table id="location">
-		<table_name>location</table_name>
+	<!-- Declaration of pcscf_location table-->
+	<db_table id="pcscf_location">
+		<table_name>pcscf_location</table_name>
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>domain</field><type>DB1_STR</type></column>

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -413,9 +413,9 @@
 		<column><field>id_s_cscf</field><type>DB1_INT</type></column>
 		<column><field>capability</field><type>DB1_INT</type></column>
 	</db_table>
-	<!-- Declaration of location table-->
-	<db_table id="location">
-		<table_name>location</table_name>
+	<!-- Declaration of pcscf_location table-->
+	<db_table id="pcscf_location">
+		<table_name>pcscf_location</table_name>
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>domain</field><type>DB1_STR</type></column>
@@ -2770,10 +2770,10 @@
 			</clause_cols>
 		</cmd>
 	</mod>
-	<!-- location provisioning -->
-	<mod><mod_name>location</mod_name>
+	<!-- pcscf_location provisioning -->
+	<mod><mod_name>pcscf_location</mod_name>
 		<cmd><cmd_name>show</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_QUERY</cmd_type>
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
@@ -2825,7 +2825,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>domain</field></col>
@@ -2876,7 +2876,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_UPDATE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>
@@ -2930,7 +2930,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>
-			<db_table_id>location</db_table_id>
+			<db_table_id>pcscf_location</db_table_id>
 			<cmd_type>DB1_DELETE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>