Removed support ctrl_port_descr on FD16xx FW3

meklis · Aug 1, 2024 · df4539a · df4539a
1 parent 087b072
commit df4539a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/configs/models/C-Data.yml b/configs/models/C-Data.yml
@@ -370,7 +370,7 @@ models:
               ctrl_ont_descr: \SwitcherCore\Modules\CData\FD16xxV3\CtrlOntDescription
               console_command: \SwitcherCore\Modules\CData\FD16xxV3\RawConsoleCommand
               multi_console_command: \SwitcherCore\Modules\CData\FD16xxV3\MultiRawConsoleCommand
-              ctrl_port_descr: \SwitcherCore\Modules\CData\FD16xxV3\PortDescriptionControl
+              #ctrl_port_descr: \SwitcherCore\Modules\CData\FD16xxV3\PortDescriptionControl
               ctrl_ont_delete: \SwitcherCore\Modules\CData\FD16xxV3\OntDeleteGpon
               uni_interfaces_status: \SwitcherCore\Modules\CData\FD16xxV3\OntUniPortsStatus
               unregistered_onts: \SwitcherCore\Modules\CData\FD16xxV3\UnregisteredOnts
@@ -473,7 +473,7 @@ models:
               ctrl_ont_descr: \SwitcherCore\Modules\CData\FD16xxV3\CtrlOntDescription
               console_command: \SwitcherCore\Modules\CData\FD16xxV3\RawConsoleCommand
               multi_console_command: \SwitcherCore\Modules\CData\FD16xxV3\MultiRawConsoleCommand
-              ctrl_port_descr: \SwitcherCore\Modules\CData\FD16xxV3\PortDescriptionControl
+              #ctrl_port_descr: \SwitcherCore\Modules\CData\FD16xxV3\PortDescriptionControl
               ctrl_ont_delete: \SwitcherCore\Modules\CData\FD16xxV3\OntDeleteGpon
               uni_interfaces_status: \SwitcherCore\Modules\CData\FD16xxV3\OntUniPortsStatus
               unregistered_onts: \SwitcherCore\Modules\CData\FD16xxV3\UnregisteredOnts
@@ -581,7 +581,7 @@ models:
               ctrl_ont_descr: \SwitcherCore\Modules\CData\FD16xxV3\CtrlOntDescription
               console_command: \SwitcherCore\Modules\CData\FD16xxV3\RawConsoleCommand
               multi_console_command: \SwitcherCore\Modules\CData\FD16xxV3\MultiRawConsoleCommand
-              ctrl_port_descr: \SwitcherCore\Modules\CData\FD16xxV3\PortDescriptionControl
+              #ctrl_port_descr: \SwitcherCore\Modules\CData\FD16xxV3\PortDescriptionControl
               ctrl_ont_delete: \SwitcherCore\Modules\CData\FD16xxV3\OntDeleteGpon
               uni_interfaces_status: \SwitcherCore\Modules\CData\FD16xxV3\OntUniPortsStatus
               unregistered_onts: \SwitcherCore\Modules\CData\FD16xxV3\UnregisteredOnts

diff --git a/src/Modules/CData/FD16xxV3/PortDescriptionControl.php b/src/Modules/CData/FD16xxV3/PortDescriptionControl.php
@@ -14,20 +14,9 @@ class PortDescriptionControl extends CDataAbstractModuleFD16xxV3
 
     function setPortNameViaConsole($interface, $description)
     {
-        if (strlen($description) > 16) {
-            throw new \InvalidArgumentException("Port name. <S><Length 1~16>.");
-        }
-        preg_match_all('!\d+!', $interface['name'], $matches);
-        $f_s = $matches[0][0] . '/' . $matches[0][1];
-        $port_numb = $matches[0][2];
-
-        if(!isset($interface['pontype'])){
-            preg_match_all('![a-z]!', $interface['name'], $letters);
-            $interface['pontype'] = implode('', $letters[0]);
-        }
 
-        $this->console->exec("interface {$interface['pontype']} {$f_s}");
-        $response = $this->console->exec("port-name {$port_numb} {$description}");
+        $this->console->exec("interface gpon 0/0");
+        $response = $this->console->exec("port-desc {$interface['_port']} description {$description}");
 
         if (preg_match('/Command incomplete/', $response)) return false;
         if (preg_match('/Unknown command/', $response)) return false;