rename tables and functions to make them consistant

diff --git a/cron.sh b/cron.sh
index 42a2b05..d72161e 100755 (executable)
--- a/cron.sh
+++ b/cron.sh
@@ -7,8 +7,8 @@ if [ "$what" == "install" ] ; then
 cat > /etc/cron.d/apkpm <<__CRON__
 # m h dom mon dow user command
 */15 *  * * *  dpavlin /srv/APKPM/cron.sh CPE_poll
-*/15 *  * * *  dpavlin /srv/APKPM/cron.sh poll_ZTEDSLAM
-*/15 *  * * *  dpavlin /srv/APKPM/cron.sh poll_ZTEMSAN
+*/15 *  * * *  dpavlin /srv/APKPM/cron.sh ZTEDSLAM_poll
+*/15 *  * * *  dpavlin /srv/APKPM/cron.sh ZTEMSAN_poll
 __CRON__
 
 exit

diff --git a/lib/APKPM/CPE.pm b/lib/APKPM/CPE.pm
index a790279..99b479f 100644 (file)
--- a/lib/APKPM/CPE.pm
+++ b/lib/APKPM/CPE.pm
@@ -126,7 +126,7 @@ sub info : Job : Decode(d_array) : Encode(e_json) {
 
                if ( $ret ) {
                        $self->do_background_json( 'Store_insert', {
-                               _table => $vendor,
+                               _table => 'cpe_' . $vendor,
                                ip => $ip,
                                username => $username,
                                timestamp => $self->datetime_now,

diff --git a/persistant_worker.pl b/persistant_worker.pl
index 29a0ece..647b2bd 100755 (executable)
--- a/persistant_worker.pl
+++ b/persistant_worker.pl
@@ -109,10 +109,11 @@ foreach my $ip ( keys %$poll ) {
                }
 
                $self->do_background_json( 'Store_insert', {
-                       _table => 'dslam_h',
+                       _table => 'dslam',
                        ip => $crm->{IP_MANAGEMENT}, # FIXME IP_UREDAJA ?
                        username => $username,
                        timestamp => $self->datetime_now,
+                       variant => $variant,
                        h => $self->to_hstore($hash),
                });
 
@@ -132,9 +133,9 @@ $driver->add_job({
        max_processes => 1,
        min_processes => 0,
        worker          => $worker,
-       name            => "poll_$variant",
+       name            => $variant . '_poll',
        methods    => [ {
-               name            => "poll_$variant",
+               name   => $variant . '_poll',
                encode => 'e_json',
                body   => sub {
 
@@ -198,14 +199,14 @@ $driver->add_job({
                my $row = $status->{poll}->{$variant};
                $row->{$_} = $status->{"$variant.poll.$_"} foreach ( 'start', 'finish' );
                $row->{variant} = $variant;
-               $self->do_background_json('Store_insert', { _table => 'zte_poll', %$row });
-               warn "# zte_poll ",dump($row);
+               $self->do_background_json('Store_insert', { _table => 'dslam_poll', %$row });
+               warn "# dslam_poll ",dump($row);
 
                my $ips = scalar keys %$seen;
                my $ports = 0;
                $ports += scalar keys %{ $seen->{$_} } foreach keys %$seen;
                warn "# finish $ips ips with $ports ports\n";
-               return { ips => $ips, ports => $ports, zte_poll => $row }  ; # body end
+               return { ips => $ips, ports => $ports, dslam_poll => $row }  ; # body end
                }
        } ],
 });

diff --git a/sql/cpe_davolink.sql b/sql/cpe_davolink.sql
new file mode 100644 (file)
index 0000000..8572e28
--- /dev/null
+++ b/sql/cpe_davolink.sql
@@ -0,0 +1,11 @@
+create table cpe_davolink (
+ip inet not null,
+username text not null,
+timestamp timestamp default now(),
+h hstore
+);
+
+-- columns used in where for gnuplot
+create index davolink_username on cpe_davolink(username);
+create index davolink_timestamp on cpe_davolink(timestamp) ;
+

diff --git a/sql/cpe_easygateway.sql b/sql/cpe_easygateway.sql
new file mode 100644 (file)
index 0000000..2d88138
--- /dev/null
+++ b/sql/cpe_easygateway.sql
@@ -0,0 +1,11 @@
+create table cpe_easygateway (
+ip inet not null,
+username text not null,
+timestamp timestamp default now(),
+h hstore
+);
+
+-- columns used in where for gnuplot
+create index easygateway_username on cpe_easygateway(username);
+create index easygateway_timestamp on cpe_easygateway(timestamp) ;
+

diff --git a/sql/davolink.sql b/sql/davolink.sql
deleted file mode 100644 (file)
index e498ac2..0000000
--- a/sql/davolink.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-create table davolink (
-ip inet not null,
-username text not null,
-timestamp timestamp default now(),
-h hstore
-);
-
--- columns used in where for gnuplot
-create index davolink_username on davolink(username);
-create index davolink_timestamp on davolink(timestamp) ;
-

diff --git a/sql/dslam.sql b/sql/dslam.sql
new file mode 100644 (file)
index 0000000..6561548
--- /dev/null
+++ b/sql/dslam.sql
@@ -0,0 +1,13 @@
+create table dslam (
+ip inet not null,
+username text not null,
+timestamp timestamp default now(),
+variant text not null,
+h hstore
+);
+
+-- columns used in where for gnuplot
+create index dslam_username on dslam(username);
+create index dslam_timestamp on dslam(timestamp) ;
+create index dslam_variant on dslam(variant) ;
+

diff --git a/sql/dslam_poll.sql b/sql/dslam_poll.sql
new file mode 100644 (file)
index 0000000..fd4fa63
--- /dev/null
+++ b/sql/dslam_poll.sql
@@ -0,0 +1,17 @@
+create table dslam_poll (
+       variant text not null,
+       start timestamp not null,
+       finish timestamp not null,
+       -- grep '$variant.$ip.' persistant_worker.pl | cut -d\" -f2
+       logout int,
+       error   int,
+       empty   int,
+       ok      int,
+       invalid int,
+       queued  int,
+       complete int,
+       failed  int
+);
+
+create index dslam_poll_variant on dslam_poll(variant);
+create index dslam_poll_start on dslam_poll(start);

diff --git a/sql/easygateway.sql b/sql/easygateway.sql
deleted file mode 100644 (file)
index 92625ec..0000000
--- a/sql/easygateway.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-create table easygateway (
-ip inet not null,
-username text not null,
-timestamp timestamp default now(),
-h hstore
-);
-
--- columns used in where for gnuplot
-create index easygateway_username on easygateway(username);
-create index easygateway_timestamp on easygateway(timestamp) ;
-

diff --git a/sql/ping.sql b/sql/ping.sql
index c4c03a6..f8cacf7 100644 (file)
--- a/sql/ping.sql
+++ b/sql/ping.sql
@@ -4,3 +4,6 @@ username text not null,
 timestamp timestamp default now(),
 rtt float
 );
+
+create index ping_ip on ping(ip);
+create index ping_username on ping(username);

diff --git a/sql/zte_poll.sql b/sql/zte_poll.sql
deleted file mode 100644 (file)
index da0712a..0000000
--- a/sql/zte_poll.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-create table zte_poll (
-       variant text not null,
-       start timestamp not null,
-       finish timestamp not null,
-       -- grep '$variant.$ip.' persistant_worker.pl | cut -d\" -f2
-       logout int,
-       error   int,
-       empty   int,
-       ok      int,
-       invalid int,
-       queued  int,
-       complete int,
-       failed  int
-);
-