From c8d25c34d8efa5c6e40fb26d523a9d4e5d66595c Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Fri, 18 Mar 2016 14:08:53 +0100 Subject: [PATCH] kamctl: updated scripts for topos db --- utils/kamctl/db_berkeley/kamailio/topos_d | 6 +++--- utils/kamctl/db_berkeley/kamailio/topos_t | 6 +++--- utils/kamctl/db_sqlite/topos-create.sql | 4 ++++ utils/kamctl/dbtext/kamailio/topos_d | 2 +- utils/kamctl/dbtext/kamailio/topos_t | 2 +- utils/kamctl/mysql/topos-create.sql | 4 ++++ utils/kamctl/oracle/topos-create.sql | 4 ++++ utils/kamctl/postgres/topos-create.sql | 4 ++++ utils/kamctl/xhttp_pi/pi_framework.xml | 16 ++++++++++++++++ utils/kamctl/xhttp_pi/topos-mod | 12 ++++++++++++ utils/kamctl/xhttp_pi/topos-table | 4 ++++ 11 files changed, 56 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/topos_d b/utils/kamctl/db_berkeley/kamailio/topos_d index 969e5a4367d..025e40e8e77 100644 --- a/utils/kamctl/db_berkeley/kamailio/topos_d +++ b/utils/kamctl/db_berkeley/kamailio/topos_d @@ -1,10 +1,10 @@ METADATA_COLUMNS -id(int) rectime(datetime) 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) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcip(str) b_srcip(str) +id(int) rectime(datetime) s_method(str) s_cseq(int) 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) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcip(str) b_srcip(str) METADATA_KEY -2 3 4 +4 5 6 METADATA_READONLY 0 METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|0|''|''|''|''|'' +NIL|NIL|''|0|''|''|''|''|''|''|''|''|''|''|''|0|''|''|''|''|'' diff --git a/utils/kamctl/db_berkeley/kamailio/topos_t b/utils/kamctl/db_berkeley/kamailio/topos_t index 42772ee54e4..cc995bc4a6b 100644 --- a/utils/kamctl/db_berkeley/kamailio/topos_t +++ b/utils/kamctl/db_berkeley/kamailio/topos_t @@ -1,10 +1,10 @@ METADATA_COLUMNS -id(int) rectime(datetime) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) x_uri(str) x_tag(str) +id(int) rectime(datetime) s_method(str) s_cseq(int) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) x_uri(str) x_tag(str) METADATA_KEY -2 3 4 5 7 +4 5 6 7 9 METADATA_READONLY 0 METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|''|''|''|0|''|''|''|''|'' +NIL|NIL|''|0|''|''|''|0|''|''|''|''|'' diff --git a/utils/kamctl/db_sqlite/topos-create.sql b/utils/kamctl/db_sqlite/topos-create.sql index ea2d624e550..403399ae5a3 100644 --- a/utils/kamctl/db_sqlite/topos-create.sql +++ b/utils/kamctl/db_sqlite/topos-create.sql @@ -1,6 +1,8 @@ CREATE TABLE topos_d ( id INTEGER PRIMARY KEY NOT NULL, rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL, + s_method VARCHAR(64) DEFAULT '' NOT NULL, + s_cseq INTEGER DEFAULT 0 NOT NULL, a_callid VARCHAR(255) DEFAULT '' NOT NULL, a_uuid VARCHAR(255) DEFAULT '' NOT NULL, b_uuid VARCHAR(255) DEFAULT '' NOT NULL, @@ -28,6 +30,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1'); CREATE TABLE topos_t ( id INTEGER PRIMARY KEY NOT NULL, rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL, + s_method VARCHAR(64) DEFAULT '' NOT NULL, + s_cseq INTEGER DEFAULT 0 NOT NULL, a_callid VARCHAR(255) DEFAULT '' NOT NULL, a_uuid VARCHAR(255) DEFAULT '' NOT NULL, b_uuid VARCHAR(255) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/topos_d b/utils/kamctl/dbtext/kamailio/topos_d index f2cb97b729f..c1f6ef86832 100644 --- a/utils/kamctl/dbtext/kamailio/topos_d +++ b/utils/kamctl/dbtext/kamailio/topos_d @@ -1 +1 @@ -id(int,auto) rectime(int) 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) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcip(string) b_srcip(string) +id(int,auto) rectime(int) s_method(string) s_cseq(int) 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) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcip(string) b_srcip(string) diff --git a/utils/kamctl/dbtext/kamailio/topos_t b/utils/kamctl/dbtext/kamailio/topos_t index cab00af6457..fd86682f5a8 100644 --- a/utils/kamctl/dbtext/kamailio/topos_t +++ b/utils/kamctl/dbtext/kamailio/topos_t @@ -1 +1 @@ -id(int,auto) rectime(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) x_uri(string) x_tag(string) +id(int,auto) rectime(int) s_method(string) s_cseq(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) x_uri(string) x_tag(string) diff --git a/utils/kamctl/mysql/topos-create.sql b/utils/kamctl/mysql/topos-create.sql index 5e21bc25007..1fb03305cc1 100644 --- a/utils/kamctl/mysql/topos-create.sql +++ b/utils/kamctl/mysql/topos-create.sql @@ -1,6 +1,8 @@ CREATE TABLE `topos_d` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, `rectime` DATETIME NOT NULL, + `s_method` VARCHAR(64) DEFAULT '' NOT NULL, + `s_cseq` INT UNSIGNED DEFAULT 0 NOT NULL, `a_callid` VARCHAR(255) DEFAULT '' NOT NULL, `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL, `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL, @@ -28,6 +30,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1'); CREATE TABLE `topos_t` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, `rectime` DATETIME NOT NULL, + `s_method` VARCHAR(64) DEFAULT '' NOT NULL, + `s_cseq` INT UNSIGNED DEFAULT 0 NOT NULL, `a_callid` VARCHAR(255) DEFAULT '' NOT NULL, `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL, `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/oracle/topos-create.sql b/utils/kamctl/oracle/topos-create.sql index 1552d5e168d..7e37a791b05 100644 --- a/utils/kamctl/oracle/topos-create.sql +++ b/utils/kamctl/oracle/topos-create.sql @@ -1,6 +1,8 @@ CREATE TABLE topos_d ( id NUMBER(10) PRIMARY KEY, rectime DATE, + s_method VARCHAR2(64) DEFAULT '', + s_cseq NUMBER(10) DEFAULT 0 NOT NULL, a_callid VARCHAR2(255) DEFAULT '', a_uuid VARCHAR2(255) DEFAULT '', b_uuid VARCHAR2(255) DEFAULT '', @@ -36,6 +38,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1'); CREATE TABLE topos_t ( id NUMBER(10) PRIMARY KEY, rectime DATE, + s_method VARCHAR2(64) DEFAULT '', + s_cseq NUMBER(10) DEFAULT 0 NOT NULL, a_callid VARCHAR2(255) DEFAULT '', a_uuid VARCHAR2(255) DEFAULT '', b_uuid VARCHAR2(255) DEFAULT '', diff --git a/utils/kamctl/postgres/topos-create.sql b/utils/kamctl/postgres/topos-create.sql index 602bcc71463..995d870438d 100644 --- a/utils/kamctl/postgres/topos-create.sql +++ b/utils/kamctl/postgres/topos-create.sql @@ -1,6 +1,8 @@ CREATE TABLE topos_d ( id SERIAL PRIMARY KEY NOT NULL, rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL, + s_method VARCHAR(64) DEFAULT '' NOT NULL, + s_cseq INTEGER DEFAULT 0 NOT NULL, a_callid VARCHAR(255) DEFAULT '' NOT NULL, a_uuid VARCHAR(255) DEFAULT '' NOT NULL, b_uuid VARCHAR(255) DEFAULT '' NOT NULL, @@ -28,6 +30,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1'); CREATE TABLE topos_t ( id SERIAL PRIMARY KEY NOT NULL, rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL, + s_method VARCHAR(64) DEFAULT '' NOT NULL, + s_cseq INTEGER DEFAULT 0 NOT NULL, a_callid VARCHAR(255) DEFAULT '' NOT NULL, a_uuid VARCHAR(255) DEFAULT '' NOT NULL, b_uuid VARCHAR(255) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index 65596206e68..58e7515265f 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -754,6 +754,8 @@ mysql idDB1_INT rectimeDB1_DATETIME + s_methodDB1_STR + s_cseqDB1_INT a_callidDB1_STR a_uuidDB1_STR b_uuidDB1_STR @@ -778,6 +780,8 @@ mysql idDB1_INT rectimeDB1_DATETIME + s_methodDB1_STR + s_cseqDB1_INT a_callidDB1_STR a_uuidDB1_STR b_uuidDB1_STR @@ -3879,6 +3883,8 @@ idupdate rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -3903,6 +3909,8 @@ DB1_INSERT rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -3930,6 +3938,8 @@ rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -3965,6 +3975,8 @@ idupdate rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -3981,6 +3993,8 @@ DB1_INSERT rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -4000,6 +4014,8 @@ rectime + s_method + s_cseq a_callid a_uuid b_uuid diff --git a/utils/kamctl/xhttp_pi/topos-mod b/utils/kamctl/xhttp_pi/topos-mod index fd6c3051f66..f97cd9b2b0d 100644 --- a/utils/kamctl/xhttp_pi/topos-mod +++ b/utils/kamctl/xhttp_pi/topos-mod @@ -6,6 +6,8 @@ idupdate rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -30,6 +32,8 @@ DB1_INSERT rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -57,6 +61,8 @@ rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -92,6 +98,8 @@ idupdate rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -108,6 +116,8 @@ DB1_INSERT rectime + s_method + s_cseq a_callid a_uuid b_uuid @@ -127,6 +137,8 @@ rectime + s_method + s_cseq a_callid a_uuid b_uuid diff --git a/utils/kamctl/xhttp_pi/topos-table b/utils/kamctl/xhttp_pi/topos-table index 2273680c4b7..76fc2e771bf 100644 --- a/utils/kamctl/xhttp_pi/topos-table +++ b/utils/kamctl/xhttp_pi/topos-table @@ -4,6 +4,8 @@ mysql idDB1_INT rectimeDB1_DATETIME + s_methodDB1_STR + s_cseqDB1_INT a_callidDB1_STR a_uuidDB1_STR b_uuidDB1_STR @@ -28,6 +30,8 @@ mysql idDB1_INT rectimeDB1_DATETIME + s_methodDB1_STR + s_cseqDB1_INT a_callidDB1_STR a_uuidDB1_STR b_uuidDB1_STR