refactor: Added detection of vlan name changes (#7348)

This commit is contained in:
Neil Lathwood
2017-09-17 03:19:54 +01:00
committed by Tony Murray
parent 31607418e1
commit 4ad8faecdc
4 changed files with 36 additions and 4 deletions

View File

@@ -12,7 +12,15 @@ if ($device['os'] == 'avaya-ers') {
foreach ($vlans as $vlan_id => $vlan) {
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
$vlan_data = $vlans_db[$vtpdomain_id][$vlan_id];
if ($vlan_data['vlan_name'] != $vlan['rcVlanName']) {
$vlan_upd['vlan_name'] = $vlan['rcVlanName'];
dbUpdate($vlan_upd, 'vlans', '`vlan_id` = ?', array($vlan_data['vlan_id']));
log_event("VLAN $vlan_id changed name {$vlan_data['vlan_name']} -> {$vlan['rcVlanName']} ", $device, 'vlan', 3, $vlan_data['vlan_id']);
echo 'U';
} else {
echo '.';
}
} else {
dbInsert(array(
'device_id' => $device['device_id'],

View File

@@ -18,7 +18,15 @@ if ($device['os_group'] == 'cisco') {
foreach ($vlans[$vtpdomain_id] as $vlan_id => $vlan) {
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
$vlan_data = $vlans_db[$vtpdomain_id][$vlan_id];
if ($vlan_data['vlan_name'] != $vlan['vtpVlanName']) {
$vlan_upd['vlan_name'] = $vlan['vtpVlanName'];
dbUpdate($vlan_upd, 'vlans', '`vlan_id` = ?', array($vlan_data['vlan_id']));
log_event("VLAN $vlan_id changed name {$vlan_data['vlan_name']} -> {$vlan['vtpVlanName']} ", $device, 'vlan', 3, $vlan_data['vlan_id']);
echo 'U';
} else {
echo '.';
}
} else {
dbInsert(array('device_id' => $device['device_id'], 'vlan_domain' => $vtpdomain_id, 'vlan_vlan' => $vlan_id, 'vlan_name' => $vlan['vtpVlanName'], 'vlan_type' => $vlan['vtpVlanType']), 'vlans');
echo '+';

View File

@@ -25,7 +25,15 @@ if ($vlanversion == 'version1' || $vlanversion == '2') {
$vlan_id = $tagoruntag[$vlan_id][$tmp_tag];
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
$vlan_data = $vlans_db[$vtpdomain_id][$vlan_id];
if ($vlan_data['vlan_name'] != $vlan[$tmp_name]) {
$vlan_upd['vlan_name'] = $vlan[$tmp_name];
dbUpdate($vlan_upd, 'vlans', '`vlan_id` = ?', array($vlan_data['vlan_id']));
log_event("VLAN $vlan_id changed name {$vlan_data['vlan_name']} -> {$vlan[$tmp_name]} ", $device, 'vlan', 3, $vlan_data['vlan_id']);
echo 'U';
} else {
echo '.';
}
} else {
dbInsert(array(
'device_id' => $device['device_id'],

View File

@@ -14,7 +14,15 @@ if ($vlanversion == 'version1' || $vlanversion == '2') {
foreach ($vlans as $vlan_id => $vlan) {
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
$vlan_data = $vlans_db[$vtpdomain_id][$vlan_id];
if ($vlan_data['vlan_name'] != $vlan['dot1qVlanStaticName']) {
$vlan_upd['vlan_name'] = $vlan['dot1qVlanStaticName'];
dbUpdate($vlan_upd, 'vlans', '`vlan_id` = ?', array($vlan_data['vlan_id']));
log_event("VLAN $vlan_id changed name {$vlan_data['vlan_name']} -> {$vlan['dot1qVlanStaticName']} ", $device, 'vlan', 3, $vlan_data['vlan_id']);
echo 'U';
} else {
echo '.';
}
} else {
dbInsert(array(
'device_id' => $device['device_id'],