seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scan-network now records interfaces, bonds and bridges!

Browse Source 
* Much testing still needed, but this is a significant milestone.

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 12 months ago
parent 9c67b97fdd
commit a27773a69d
3 changed files with 52 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      Anvil/Tools/Database.pm
  2. 2
      scancore-agents/scan-network/scan-network
  3. 4
      share/anvil.sql

68
Anvil/Tools/Database.pm
Unescape View File

@ -3984,7 +3984,7 @@ AND
}}); }});
$anvil->data->{host_from_uuid}{$host_uuid}{full} = $host_name; $anvil->data->{host_from_uuid}{$host_uuid}{full} = $host_name;
$anvil->data->{host_from_uuid}{$host_uuid}{short} = $short_host_name; $anvil->data->{host_from_uuid}{$host_uuid}{short} = $short_host_name ? $short_host_name : $host_name;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
"host_from_uuid::${host_uuid}::full" => $anvil->data->{host_from_uuid}{$host_uuid}{full}, "host_from_uuid::${host_uuid}::full" => $anvil->data->{host_from_uuid}{$host_uuid}{full},
"host_from_uuid::${host_uuid}::short" => $anvil->data->{host_from_uuid}{$host_uuid}{short}, "host_from_uuid::${host_uuid}::short" => $anvil->data->{host_from_uuid}{$host_uuid}{short},
@ -7542,7 +7542,6 @@ WHERE
return($anvil_uuid); return($anvil_uuid);
} }
=head2 insert_or_update_bridges =head2 insert_or_update_bridges
This updates (or inserts) a record in the 'bridges' table. The C<< bridge_uuid >> referencing the database row will be returned. This updates (or inserts) a record in the 'bridges' table. The C<< bridge_uuid >> referencing the database row will be returned.
@ -7575,6 +7574,10 @@ This is the host that the IP address is on. If not passed, the local C<< sys::ho
This is the bridge's device name. This is the bridge's device name.
=head3 bridge_nm_uuid (optional)
This is the network manager UUID for the bridge.
=head3 bridge_id (optional) =head3 bridge_id (optional)
This is the unique identifier for the bridge. This is the unique identifier for the bridge.
@ -7611,6 +7614,7 @@ sub insert_or_update_bridges
my $bridge_uuid = defined $parameter->{bridge_uuid} ? $parameter->{bridge_uuid} : ""; my $bridge_uuid = defined $parameter->{bridge_uuid} ? $parameter->{bridge_uuid} : "";
my $bridge_host_uuid = defined $parameter->{bridge_host_uuid} ? $parameter->{bridge_host_uuid} : $anvil->data->{sys}{host_uuid}; my $bridge_host_uuid = defined $parameter->{bridge_host_uuid} ? $parameter->{bridge_host_uuid} : $anvil->data->{sys}{host_uuid};
my $bridge_name = defined $parameter->{bridge_name} ? $parameter->{bridge_name} : ""; my $bridge_name = defined $parameter->{bridge_name} ? $parameter->{bridge_name} : "";
my $bridge_nm_uuid = $parameter->{bridge_nm_uuid} ? $parameter->{bridge_nm_uuid} : 'NULL';
my $bridge_id = defined $parameter->{bridge_id} ? $parameter->{bridge_id} : ""; my $bridge_id = defined $parameter->{bridge_id} ? $parameter->{bridge_id} : "";
my $bridge_mac_address = defined $parameter->{bridge_mac_address} ? $parameter->{bridge_mac_address} : ""; my $bridge_mac_address = defined $parameter->{bridge_mac_address} ? $parameter->{bridge_mac_address} : "";
my $bridge_mtu = defined $parameter->{bridge_mtu} ? $parameter->{bridge_mtu} : ""; my $bridge_mtu = defined $parameter->{bridge_mtu} ? $parameter->{bridge_mtu} : "";
@ -7623,6 +7627,7 @@ sub insert_or_update_bridges
bridge_uuid => $bridge_uuid, bridge_uuid => $bridge_uuid,
bridge_host_uuid => $bridge_host_uuid, bridge_host_uuid => $bridge_host_uuid,
bridge_name => $bridge_name, bridge_name => $bridge_name,
bridge_nm_uuid => $bridge_nm_uuid,
bridge_id => $bridge_id, bridge_id => $bridge_id,
bridge_mac_address => $bridge_mac_address, bridge_mac_address => $bridge_mac_address,
bridge_mtu => $bridge_mtu, bridge_mtu => $bridge_mtu,
@ -7755,6 +7760,7 @@ INSERT INTO
( (
bridge_uuid, bridge_uuid,
bridge_host_uuid, bridge_host_uuid,
bridge_nm_uuid,
bridge_name, bridge_name,
bridge_id, bridge_id,
bridge_mac_address, bridge_mac_address,
@ -7764,6 +7770,7 @@ INSERT INTO
) VALUES ( ) VALUES (
".$anvil->Database->quote($bridge_uuid).", ".$anvil->Database->quote($bridge_uuid).",
".$anvil->Database->quote($bridge_host_uuid).", ".$anvil->Database->quote($bridge_host_uuid).",
".$anvil->Database->quote($bridge_nm_uuid).",
".$anvil->Database->quote($bridge_name).", ".$anvil->Database->quote($bridge_name).",
".$anvil->Database->quote($bridge_id).", ".$anvil->Database->quote($bridge_id).",
".$anvil->Database->quote($bridge_mac_address).", ".$anvil->Database->quote($bridge_mac_address).",
@ -7772,6 +7779,7 @@ INSERT INTO
".$anvil->Database->quote($anvil->Database->refresh_timestamp)." ".$anvil->Database->quote($anvil->Database->refresh_timestamp)."
); );
"; ";
$query =~ s/'NULL'/NULL/g;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }});
$anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); $anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__});
} }
@ -7781,6 +7789,7 @@ INSERT INTO
my $query = " my $query = "
SELECT SELECT
bridge_host_uuid, bridge_host_uuid,
bridge_nm_uuid,
bridge_name, bridge_name,
bridge_id, bridge_id,
bridge_mac_address, bridge_mac_address,
@ -7808,13 +7817,15 @@ WHERE
foreach my $row (@{$results}) foreach my $row (@{$results})
{ {
my $old_bridge_host_uuid = $row->[0]; my $old_bridge_host_uuid = $row->[0];
my $old_bridge_name = $row->[1]; my $old_bridge_nm_uuid = defined $row->[1] ? $row->[1] : 'NULL';
my $old_bridge_id = $row->[2]; my $old_bridge_name = $row->[2];
my $old_bridge_mac_address = $row->[3]; my $old_bridge_id = $row->[3];
my $old_bridge_mtu = $row->[4]; my $old_bridge_mac_address = $row->[4];
my $old_bridge_stp_enabled = $row->[5]; my $old_bridge_mtu = $row->[5];
my $old_bridge_stp_enabled = $row->[6];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
old_bridge_host_uuid => $old_bridge_host_uuid, old_bridge_host_uuid => $old_bridge_host_uuid,
old_bridge_nm_uuid => $old_bridge_nm_uuid,
old_bridge_name => $old_bridge_name, old_bridge_name => $old_bridge_name,
old_bridge_id => $old_bridge_id, old_bridge_id => $old_bridge_id,
old_bridge_mac_address => $old_bridge_mac_address, old_bridge_mac_address => $old_bridge_mac_address,
@ -7824,6 +7835,7 @@ WHERE
# Anything change? # Anything change?
if (($old_bridge_host_uuid ne $bridge_host_uuid) or if (($old_bridge_host_uuid ne $bridge_host_uuid) or
($old_bridge_nm_uuid ne $bridge_nm_uuid) or
($old_bridge_name ne $bridge_name) or ($old_bridge_name ne $bridge_name) or
($old_bridge_id ne $bridge_id) or ($old_bridge_id ne $bridge_id) or
($old_bridge_mac_address ne $bridge_mac_address) or ($old_bridge_mac_address ne $bridge_mac_address) or
@ -7836,6 +7848,7 @@ UPDATE
bridges bridges
SET SET
bridge_host_uuid = ".$anvil->Database->quote($bridge_host_uuid).", bridge_host_uuid = ".$anvil->Database->quote($bridge_host_uuid).",
bridge_nm_uuid = ".$anvil->Database->quote($bridge_nm_uuid).",
bridge_name = ".$anvil->Database->quote($bridge_name).", bridge_name = ".$anvil->Database->quote($bridge_name).",
bridge_id = ".$anvil->Database->quote($bridge_id).", bridge_id = ".$anvil->Database->quote($bridge_id).",
bridge_mac_address = ".$anvil->Database->quote($bridge_mac_address).", bridge_mac_address = ".$anvil->Database->quote($bridge_mac_address).",
@ -7845,6 +7858,7 @@ SET
WHERE WHERE
bridge_uuid = ".$anvil->Database->quote($bridge_uuid)." bridge_uuid = ".$anvil->Database->quote($bridge_uuid)."
"; ";
$query =~ s/'NULL'/NULL/g;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }});
$anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); $anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__});
} }
@ -7891,6 +7905,10 @@ This is the host that the IP address is on. If not passed, the local C<< sys::ho
This is the bond's device name. This is the bond's device name.
=head3 bond_nm_uuid (optional)
This is the network manager UUID for this bond.
=head3 bond_mode (required) =head3 bond_mode (required)
This is the bonding mode used for this bond. This is the bonding mode used for this bond.
@ -7951,6 +7969,7 @@ sub insert_or_update_bonds
my $bond_uuid = defined $parameter->{bond_uuid} ? $parameter->{bond_uuid} : ""; my $bond_uuid = defined $parameter->{bond_uuid} ? $parameter->{bond_uuid} : "";
my $bond_host_uuid = defined $parameter->{bond_host_uuid} ? $parameter->{bond_host_uuid} : $anvil->data->{sys}{host_uuid}; my $bond_host_uuid = defined $parameter->{bond_host_uuid} ? $parameter->{bond_host_uuid} : $anvil->data->{sys}{host_uuid};
my $bond_name = defined $parameter->{bond_name} ? $parameter->{bond_name} : ""; my $bond_name = defined $parameter->{bond_name} ? $parameter->{bond_name} : "";
my $bond_nm_uuid = $parameter->{bond_nm_uuid} ? $parameter->{bond_nm_uuid} : 'NULL';
my $bond_mode = defined $parameter->{bond_mode} ? $parameter->{bond_mode} : ""; my $bond_mode = defined $parameter->{bond_mode} ? $parameter->{bond_mode} : "";
my $bond_mtu = defined $parameter->{bond_mtu} ? $parameter->{bond_mtu} : ""; my $bond_mtu = defined $parameter->{bond_mtu} ? $parameter->{bond_mtu} : "";
my $bond_primary_interface = defined $parameter->{bond_primary_interface} ? $parameter->{bond_primary_interface} : ""; my $bond_primary_interface = defined $parameter->{bond_primary_interface} ? $parameter->{bond_primary_interface} : "";
@ -7961,7 +7980,7 @@ sub insert_or_update_bonds
my $bond_down_delay = defined $parameter->{bond_down_delay} ? $parameter->{bond_down_delay} : ""; my $bond_down_delay = defined $parameter->{bond_down_delay} ? $parameter->{bond_down_delay} : "";
my $bond_mac_address = defined $parameter->{bond_mac_address} ? $parameter->{bond_mac_address} : ""; my $bond_mac_address = defined $parameter->{bond_mac_address} ? $parameter->{bond_mac_address} : "";
my $bond_operational = defined $parameter->{bond_operational} ? $parameter->{bond_operational} : ""; my $bond_operational = defined $parameter->{bond_operational} ? $parameter->{bond_operational} : "";
my $bond_bridge_uuid = defined $parameter->{bond_bridge_uuid} ? $parameter->{bond_bridge_uuid} : 'NULL'; my $bond_bridge_uuid = $parameter->{bond_bridge_uuid} ? $parameter->{bond_bridge_uuid} : 'NULL';
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
uuid => $uuid, uuid => $uuid,
file => $file, file => $file,
@ -7970,6 +7989,7 @@ sub insert_or_update_bonds
bond_uuid => $bond_uuid, bond_uuid => $bond_uuid,
bond_host_uuid => $bond_host_uuid, bond_host_uuid => $bond_host_uuid,
bond_name => $bond_name, bond_name => $bond_name,
bond_nm_uuid => $bond_nm_uuid,
bond_mode => $bond_mode, bond_mode => $bond_mode,
bond_mtu => $bond_mtu, bond_mtu => $bond_mtu,
bond_primary_interface => $bond_primary_interface, bond_primary_interface => $bond_primary_interface,
@ -8121,6 +8141,7 @@ INSERT INTO
( (
bond_uuid, bond_uuid,
bond_host_uuid, bond_host_uuid,
bond_nm_uuid,
bond_name, bond_name,
bond_mode, bond_mode,
bond_mtu, bond_mtu,
@ -8137,6 +8158,7 @@ INSERT INTO
) VALUES ( ) VALUES (
".$anvil->Database->quote($bond_uuid).", ".$anvil->Database->quote($bond_uuid).",
".$anvil->Database->quote($bond_host_uuid).", ".$anvil->Database->quote($bond_host_uuid).",
".$anvil->Database->quote($bond_nm_uuid).",
".$anvil->Database->quote($bond_name).", ".$anvil->Database->quote($bond_name).",
".$anvil->Database->quote($bond_mode).", ".$anvil->Database->quote($bond_mode).",
".$anvil->Database->quote($bond_mtu).", ".$anvil->Database->quote($bond_mtu).",
@ -8162,6 +8184,7 @@ INSERT INTO
my $query = " my $query = "
SELECT SELECT
bond_host_uuid, bond_host_uuid,
bond_nm_uuid,
bond_name, bond_name,
bond_mode, bond_mode,
bond_mtu, bond_mtu,
@ -8196,20 +8219,22 @@ WHERE
foreach my $row (@{$results}) foreach my $row (@{$results})
{ {
my $old_bond_host_uuid = $row->[0]; my $old_bond_host_uuid = $row->[0];
my $old_bond_name = $row->[1]; my $old_bond_nm_uuid = defined $row->[1] ? $row->[1] : 'NULL';
my $old_bond_mode = $row->[2]; my $old_bond_name = $row->[2];
my $old_bond_mtu = $row->[3]; my $old_bond_mode = $row->[3];
my $old_bond_primary_interface = $row->[4]; my $old_bond_mtu = $row->[4];
my $old_bond_primary_reselect = $row->[5]; my $old_bond_primary_interface = $row->[5];
my $old_bond_active_interface = $row->[6]; my $old_bond_primary_reselect = $row->[6];
my $old_bond_mii_polling_interval = $row->[7]; my $old_bond_active_interface = $row->[7];
my $old_bond_up_delay = $row->[8]; my $old_bond_mii_polling_interval = $row->[8];
my $old_bond_down_delay = $row->[9]; my $old_bond_up_delay = $row->[9];
my $old_bond_mac_address = $row->[10]; my $old_bond_down_delay = $row->[10];
my $old_bond_operational = $row->[11]; my $old_bond_mac_address = $row->[11];
my $old_bond_bridge_uuid = defined $row->[12] ? $row->[12] : 'NULL'; my $old_bond_operational = $row->[12];
my $old_bond_bridge_uuid = defined $row->[13] ? $row->[12] : 'NULL';
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
old_bond_host_uuid => $old_bond_host_uuid, old_bond_host_uuid => $old_bond_host_uuid,
old_bond_nm_uuid => $old_bond_nm_uuid,
old_bond_name => $old_bond_name, old_bond_name => $old_bond_name,
old_bond_mode => $old_bond_mode, old_bond_mode => $old_bond_mode,
old_bond_mtu => $old_bond_mtu, old_bond_mtu => $old_bond_mtu,
@ -8226,6 +8251,7 @@ WHERE
# Anything change? # Anything change?
if (($old_bond_host_uuid ne $bond_host_uuid) or if (($old_bond_host_uuid ne $bond_host_uuid) or
($old_bond_nm_uuid ne $bond_nm_uuid) or
($old_bond_name ne $bond_name) or ($old_bond_name ne $bond_name) or
($old_bond_mode ne $bond_mode) or ($old_bond_mode ne $bond_mode) or
($old_bond_mtu ne $bond_mtu) or ($old_bond_mtu ne $bond_mtu) or
@ -8245,6 +8271,7 @@ UPDATE
bonds bonds
SET SET
bond_host_uuid = ".$anvil->Database->quote($bond_host_uuid).", bond_host_uuid = ".$anvil->Database->quote($bond_host_uuid).",
bond_nm_uuid = ".$anvil->Database->quote($bond_nm_uuid).",
bond_name = ".$anvil->Database->quote($bond_name).", bond_name = ".$anvil->Database->quote($bond_name).",
bond_mode = ".$anvil->Database->quote($bond_mode).", bond_mode = ".$anvil->Database->quote($bond_mode).",
bond_mtu = ".$anvil->Database->quote($bond_mtu).", bond_mtu = ".$anvil->Database->quote($bond_mtu).",
@ -18990,6 +19017,7 @@ sub write
's1:test' => $test, 's1:test' => $test,
's2:$@' => $@, 's2:$@' => $@,
}}); }});
if (not $test) if (not $test)
{ {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0090", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0090", variables => {

2
scancore-agents/scan-network/scan-network
Unescape View File

@ -124,7 +124,7 @@ sub clear_old_interfaces
foreach my $uuid (sort {$a cmp $b} keys %{$anvil->data->{cache}{database_handle}}) foreach my $uuid (sort {$a cmp $b} keys %{$anvil->data->{cache}{database_handle}})
{ {
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
uuid => $anvil->Database->get_host_from_uuid({short => 1, host_uuid => $uuid})." (".$uuid.")", uuid => $anvil->Database->get_host_from_uuid({debug => 2, short => 1, host_uuid => $uuid})." (".$uuid.")",
}}); }});
my $query = " my $query = "
SELECT SELECT

4
share/anvil.sql
Unescape View File

@ -855,7 +855,7 @@ CREATE TRIGGER trigger_jobs
CREATE TABLE bridges ( CREATE TABLE bridges (
bridge_uuid uuid not null primary key, bridge_uuid uuid not null primary key,
bridge_host_uuid uuid not null, bridge_host_uuid uuid not null,
bridge_nm_uuid uuid not null, -- This is the network manager UUID for this bridge interface bridge_nm_uuid uuid, -- This is the network manager UUID for this bridge interface
bridge_name text not null, bridge_name text not null,
bridge_id text not null, bridge_id text not null,
bridge_mac_address text not null, bridge_mac_address text not null,
@ -922,7 +922,7 @@ CREATE TRIGGER trigger_bridges
CREATE TABLE bonds ( CREATE TABLE bonds (
bond_uuid uuid not null primary key, bond_uuid uuid not null primary key,
bond_host_uuid uuid not null, bond_host_uuid uuid not null,
bond_nm_uuid uuid not null, -- The is the network manager UUID for this bond. bond_nm_uuid uuid, -- The is the network manager UUID for this bond.
bond_name text not null, bond_name text not null,
bond_mode text not null, -- This is the numerical bond type (will translate to the user's language in the Anvil!) bond_mode text not null, -- This is the numerical bond type (will translate to the user's language in the Anvil!)
bond_mtu bigint not null, bond_mtu bigint not null,

Write Preview
Loading…
Cancel
Save