Explorar el Código

FD3-359 Se anexa al generador de crontab el comando para obtener octetos de las ONUs si la OLT es Huawei. Se añade la gráfica(IN / OUT) a la vista de ONU.

Maxi Schvindt hace 7 años
padre
commit
fc7cdb597d

+ 4 - 0
src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -95,6 +95,10 @@ class GenerateCrontabCommand extends ContainerAwareCommand
                 $params .= " --save-historic={$saveHistoric}";
                 $commands[] = "*/{$timeOnuStats} * * * * {$pathConsole} {$mark}:onu:stats {$params}";
                 $commands[] = "*/{$timePonStats} * * * * {$pathConsole} {$mark}:pon:stats {$params}";
+
+                if($mark == "huawei") {
+                    $commands[] = "*/{$timeOltOctets} * * * * {$pathConsole} {$mark}:onu:octets {$params}";
+                }
                 $commands[] = "*/{$timeOltOctets} * * * * {$pathConsole} {$mark}:pon:octets {$params}";
                 
                 $commands[] = "*/{$timeOnuStats} * * * * {$pathConsole} stats:onu --olt-device-id={$deviceId} --olt-server-id={$serverId}";

+ 4 - 0
src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

@@ -137,6 +137,10 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
                 }
                 $commands[] = "*/{$timeOnuStats} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:onu:stats {$params}";
                 $commands[] = "*/{$timePonStats} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:pon:stats {$params}";
+                
+                if($mark == "huawei") {
+                    $commands[] = "*/{$timeOltOctets} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:onu:octets {$params}";
+                }
                 $commands[] = "*/{$timeOltOctets} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:pon:octets {$params}";
 
                 $params = "--olt-device-id={$deviceId} --olt-server-id={$serverId}";

+ 1 - 1
src/StatsBundle/Controller/StatsController.php

@@ -260,7 +260,7 @@ class StatsController extends Controller
 
         $ponSerialNumber = strtolower($request->get('ponSerialNumber'));
         
-        $panelIds = array(1, 2, 3, 4, 5);
+        $panelIds = array(6, 1, 2, 3, 4, 5);
         foreach ($panelIds as $panelId) {
             $urls[] = "onu?orgId=1&var-serialnumber={$ponSerialNumber}&panelId={$panelId}&theme=light";
         }