Fixed

meklis · Jun 11, 2024 · 05fb11a · 05fb11a
1 parent c34e5e4
commit 05fb11a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/Modules/CData/FD16xxV3/OntRebootTelnetGpon.php b/src/Modules/CData/FD16xxV3/OntRebootTelnetGpon.php
@@ -30,14 +30,8 @@ public function run($filter = [])
         if(!$interface['id']) {
             throw new \Exception("Incorrect ONU number");
         }
-        if (!preg_match('/^(pon|xge|ge)([0-9])\/([0-9])\/([0-9]){1,}\:?([0-9]{1,3})?\/?([0-9]{1,3})?$/', $interface['name'], $m)) {
-            throw new \Exception("Interface {$filter['interface']} not supported!");
-        }
-        if(count($m) < 5) {
-            throw new \Exception("Allow to reboot only ONTs");
-        }
         $this->_exe("interface gpon 0/0");
-        $this->_exe("ont reboot {$m[4]} {$m[5]}");
+        $this->_exe("ont reboot {$interface['_port']} {$interface['_onu']}");
         $this->response = true;
         return $this;
     }

diff --git a/src/Modules/CData/FD16xxV3/OntResetTelnetGpon.php b/src/Modules/CData/FD16xxV3/OntResetTelnetGpon.php
@@ -30,14 +30,8 @@ public function run($filter = [])
         if(!$interface['id']) {
             throw new \Exception("Incorrect ONU number");
         }
-        if (!preg_match('/^(pon|xge|ge)([0-9])\/([0-9])\/([0-9]){1,}\:?([0-9]{1,3})?\/?([0-9]{1,3})?$/', $interface['name'], $m)) {
-            throw new \Exception("Interface {$filter['interface']} not supported!");
-        }
-        if(count($m) < 5) {
-            throw new \Exception("Allow to reboot only ONTs");
-        }
         $this->_exe("interface gpon 0/0");
-        $this->_exe("ont restore factory {$m[4]} {$m[5]}");
+        $this->_exe("ont restore factory {$interface['_port']} {$interface['_onu']}");
         $this->response = true;
         return $this;
     }