Skip to content

adminator3: add work-handlers for node add/update #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
czhujer merged 3 commits into from
Jun 22, 2025
Merged

adminator3: add work-handlers for node add/update #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dfa112
adminator3: add work-handlers for node-update
czhujer Jun 22, 2025
d47a688
adminator3: add work-handlers for node-add
czhujer Jun 22, 2025
cb7147f
fix format
czhujer Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions adminator3/app/Core/Topology/nodeAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public function add(ServerRequestInterface $request): string
$vysledek_write . "') ");

//automaticke restarty
$this->work->workActionTopologyNodeAdd();
list($work_output) = $this->work->workActionTopologyNodeAdd($pole);
$output .= $work_output;

} else {
//zobrazime formular
Expand Down Expand Up @@ -687,7 +688,7 @@ public function update(ServerRequestInterface $request): string

} // konec foreach

$pole .= "".$pole3;
$pole .= $pole3;

if ($uprava) {
$vysledek_write = 1;
Expand All @@ -702,7 +703,8 @@ public function update(ServerRequestInterface $request): string
);

//automaticke restarty
$this->work->workActionTopologyNodeDiff();
list($work_output) = $this->work->workActionTopologyNodeDiff($pole, $pole_puvodni_data, $id_new);
$output .= $work_output;

} else {
//zobrazime formular
Expand Down
153 changes: 104 additions & 49 deletions adminator3/app/Core/work.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,34 +306,34 @@ public function workActionObjektyFiberDiff(string $changes, array $origData, $it
)
)
) {
$work_output[] = $this->work_handler("1"); //reinhard-3 (ros) - restrictions (net-n/sikana)
$work_output[] = $this->work_handler("2"); //reinhard-wifi (ros) - restrictions (net-n/sikana)
$work_output[] = $this->work_handler("1");
$work_output[] = $this->work_handler("2");

$work_output[] = $this->work_handler("3"); //reinhard-fiber - sikana/net-n
$work_output[] = $this->work_handler("3");

$work_output[] = $this->work_handler("4"); //reinhard-fiber - radius
$work_output[] = $this->work_handler("21"); //artemis - radius (tunel. verejky, optika)
$work_output[] = $this->work_handler("4");
$work_output[] = $this->work_handler("21");

$work_output[] = $this->work_handler("6"); //(reinhard-fiber) - mikrotik.dhcp.leases.erase
$work_output[] = $this->work_handler("6");

$work_output[] = $this->work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("7");

} elseif (preg_match("/.*změna.*IP.*adresy.*z.*/", $changes)) {

$work_output[] = $this->work_handler("4"); //reinhard-fiber - radius
$work_output[] = $this->work_handler("4");

$work_output[] = $this->work_handler("6"); //(reinhard-fiber) - mikrotik.dhcp.leases.erase
$work_output[] = $this->work_handler("6");

$work_output[] = $this->work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("7");
}

if (preg_match("/.*změna.*MAC.*adresy.*/", $changes)) {

$work_output[] = $this->work_handler("4"); //reinhard-fiber - radius
$work_output[] = $this->work_handler("21"); //artemis - radius (tunel. verejky, optika)
$work_output[] = $this->work_handler("4");
$work_output[] = $this->work_handler("21");

$work_output[] = $this->work_handler("6"); //(reinhard-fiber) - mikrotik.dhcp.leases.erase
$work_output[] = $this->work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("6");
$work_output[] = $this->work_handler("7");

}

Expand All @@ -343,10 +343,10 @@ public function workActionObjektyFiberDiff(string $changes, array $origData, $it

//zmena cisla portu
if (preg_match("/.*Číslo sw. portu.*/", $changes)) {
$work_output[] = $this->work_handler("4"); //reinhard-fiber - radius
$work_output[] = $this->work_handler("21"); //artemis - radius (tunel. verejky, optika)
$work_output[] = $this->work_handler("4");
$work_output[] = $this->work_handler("21");

$work_output[] = $this->work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("7");
}

// $output .= var_export($work_output, true);
Expand All @@ -365,13 +365,13 @@ public function workActionObjektyFiber(string $changes, int $itemId): array
$output = "";
$work_output = [];

$work_output[] = $this->work_handler("3"); //rh-fiber - iptables
$work_output[] = $this->work_handler("4"); //rh-fiber - radius
$work_output[] = $this->work_handler("5"); //rh-fiber - shaper
$work_output[] = $this->work_handler("6"); //reinhard-fiber - mikrotik.dhcp.leases.erase
$work_output[] = $this->work_handler("7"); //trinity - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("3");
$work_output[] = $this->work_handler("4");
$work_output[] = $this->work_handler("5");
$work_output[] = $this->work_handler("6");
$work_output[] = $this->work_handler("7");

$work_output[] = $this->work_handler("21"); //artemis - radius (tunel. verejky, optika)
$work_output[] = $this->work_handler("21");

// $output .= var_export($work_output, true);

Expand Down Expand Up @@ -553,6 +553,11 @@ public function workActionObjektyWifi(string $changes, int $itemId, array $args)

public function workActionTopologyRouterAdd(): void
{
$this->logger->info(__CLASS__ . "\\" . __FUNCTION__ . " called");

$output = "";
$work_output = [];

// TODO: enable actions for topology/router-add

// Aglobal::work_handler("13"); //reinhard-wifi (ros) - shaper (client's tariffs)
Expand All @@ -576,6 +581,11 @@ public function workActionTopologyRouterAdd(): void

public function workActionTopologyRouterDiff(): void
{
$this->logger->info(__CLASS__ . "\\" . __FUNCTION__ . " called");

$output = "";
$work_output = [];

// TODO: enable actions for topology/router-update
// if( ereg(".*změna.*Alarmu.*z.*", $pole3) )
// {
Expand Down Expand Up @@ -616,45 +626,90 @@ public function workActionTopologyRouterDiff(): void
// }
}

public function workActionTopologyNodeDiff(): void
public function workActionTopologyNodeDiff(string $changes, array $origData, $itemId): array
{
// TODO: fix automatic restarts
// if(ereg(".*Routeru, kde se provádí filtrace.*", $pole3)) {
// Aglobal::work_handler("14"); //(trinity) filtrace-IP-on-Mtik's-restart
// }
$this->logger->info(__CLASS__ . "\\" . __FUNCTION__ . " called");

// if(ereg(".*<b>Routeru</b>.*", $pole3)) {
// Aglobal::work_handler("1"); //reinhard-3 (ros) - restrictions (net-n/sikana)
// Aglobal::work_handler("20"); //reinhard-3 (ros) - shaper (client's tariffs)
$output = "";
$work_output = [];

// Aglobal::work_handler("24"); //reinhard-5 (ros) - restrictions (net-n/sikana)
// Aglobal::work_handler("23"); //reinhard-5 (ros) - shaper (client's tariffs)
if (preg_match("/.*Routeru, kde se provádí filtrace.*/", $changes)) {
$work_output[] = $this->work_handler("14"); //(trinity) filtrace-IP-on-Mtik's-restart
}

// Aglobal::work_handler("13"); //reinhard-wifi (ros) - shaper (client's tariffs)
// Aglobal::work_handler("2"); //reinhard-wifi (ros) - restrictions (net-n/sikana)
if (preg_match("/.*<b>Routeru<\/b>.*/", $changes)) {
$work_output[] = $this->work_handler("1"); //reinhard-3 (ros) - restrictions (net-n/sikana)
$work_output[] = $this->work_handler("20"); //reinhard-3 (ros) - shaper (client's tariffs)

// Aglobal::work_handler("14"); //(trinity) filtrace-IP-on-Mtik's-restart
$work_output[] = $this->work_handler("24"); //reinhard-5 (ros) - restrictions (net-n/sikana)
$work_output[] = $this->work_handler("23"); //reinhard-5 (ros) - shaper (client's tariffs)

// }
$work_output[] = $this->work_handler("13"); //reinhard-wifi (ros) - shaper (client's tariffs)
$work_output[] = $this->work_handler("2"); //reinhard-wifi (ros) - restrictions (net-n/sikana)

// if(ereg(".*vlan_id.*", $pole3)) {
// Aglobal::work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("14"); //(trinity) filtrace-IP-on-Mtik's-restart
}

// Aglobal::work_handler("4"); //reinhard-fiber - radius
// Aglobal::work_handler("21"); //artemis - radius (tunel. verejky, optika)
// }
if (preg_match("/.*vlan_id.*/", $changes)) {
$work_output[] = $this->work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update

// if(ereg(".*změna.*koncového.*zařízení.*", $pole3)) {
// Aglobal::work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update
$work_output[] = $this->work_handler("4"); //reinhard-fiber - radius
$work_output[] = $this->work_handler("21"); //artemis - radius (tunel. verejky, optika)
}

// Aglobal::work_handler("4"); //reinhard-fiber - radius
// Aglobal::work_handler("21"); //artemis - radius (tunel. verejky, optika)
// }
if (preg_match("/.*změna.*koncového.*zařízení.*/", $changes)) {
$work_output[] = $this->work_handler("7"); //(trinity) - sw.h3c.vlan.set.pl update

$work_output[] = $this->work_handler("4"); //reinhard-fiber - radius
$work_output[] = $this->work_handler("21"); //artemis - radius (tunel. verejky, optika)
}

// $output .= var_export($work_output, true);

foreach ($work_output as $id => $item) {
$output .= $item[0];
}

return array($output);
}

public function workActionTopologyNodeAdd(): void
public function workActionTopologyNodeAdd(string $changes): array
{
// TODO: add work items
$this->logger->info(__CLASS__ . "\\" . __FUNCTION__ . " called");

$output = "";
$work_output = [];

// wifi
if (preg_match("/.*\[typ_nodu\]=> 1.*/", $changes)) {
$work_output[] = $this->work_handler("1");
$work_output[] = $this->work_handler("20");

$work_output[] = $this->work_handler("24");
$work_output[] = $this->work_handler("23");

$work_output[] = $this->work_handler("13");
$work_output[] = $this->work_handler("2");

$work_output[] = $this->work_handler("14");

$work_output[] = $this->work_handler("21");
}

//optika
if (preg_match("/.*\[typ_nodu\]=> 2.*/", $changes)) {
$work_output[] = $this->work_handler("7");

$work_output[] = $this->work_handler("4");
$work_output[] = $this->work_handler("21");
}
// $output .= var_export($work_output, true);

foreach ($work_output as $id => $item) {
$output .= $item[0];
}

return array($output);
}

}