Se actualiza segmentación de puerto para enviar parámetros al grafana.

Deberá añadirse algún tipo de función dependiendo marca para separar los
elementos del puerto y determinar el dash de grafana.

src/StatsBundle/Admin/PonPortAdmin.php

@@ -102,12 +102,14 @@ class PonPortAdmin extends BaseAdmin
         foreach($onus as $onu) {
             $p = $onu->getPonPort();
             $data = explode("/",$p);
-            if(isset($data[2])) {
+            $onuIdIndex = 2;
+            if(count($data) == 4) $onuIdIndex = 3;
+            if(isset($data[$onuIdIndex])) {
                 $rxPower = NULL;
-                if(isset($onuPonPorts[$data[2]])) {
-                    $rxPower = $onuPonPorts[$data[2]];
+                if(isset($onuPonPorts[$data[$onuIdIndex]])) {
+                    $rxPower = $onuPonPorts[$data[$onuIdIndex]];
                 }
-                $_onus[$data[2]] = array('onu' => $onu, 'rxPower' => $rxPower);
+                $_onus[$data[$onuIdIndex]] = array('onu' => $onu, 'rxPower' => $rxPower);
             }
         }
         

src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -57,7 +57,7 @@ class GenerateCrontabCommand extends ContainerAwareCommand
 
         foreach($serverDevices as $server) {
 
-            fwrite($handle, PHP_EOL."# SERVER {$server->getName()} / {$server->getUrl()}".PHP_EOL);
+            fwrite($handle, PHP_EOL.PHP_EOL."# SERVER {$server->getName()} / {$server->getUrl()}".PHP_EOL);
         
             // APARTADO OLT
             $oltDevices = $doctrine->getRepository('\StatsBundle\Entity\Device')->findBy(array('deviceType' => 'FTTHBundle\Entity\OLT','deviceServer' => $server));
@@ -103,7 +103,7 @@ class GenerateCrontabCommand extends ContainerAwareCommand
             }
             
             if($this->getContainer()->getParameter('geoserver_service')) {
-                fwrite($handle, PHP_EOL."# MAPAS".PHP_EOL);
+                fwrite($handle, PHP_EOL.PHP_EOL."# MAPAS".PHP_EOL);
                 
                 $commands = array();
                 $commands[] = "*/5 * * * * {$pathConsole} stats:onu:geo --olt-server-id={$serverId}";

src/StatsBundle/Controller/StatsController.php

@@ -279,15 +279,24 @@ class StatsController extends Controller
         $oltDeviceId = $ponPort->getOltDeviceId();
         $deviceServerId = $ponPort->getDeviceServer()->getId();
         
+        $panelIds = array(1, 2, 3, 4);
         $data = explode("/", $ponPort->getPonPort());
-        $card = $data[0];
-        $slot = $data[1];
-
+        if(count($data) == 3) {
+            $board = $data[0];
+            $card = $data[1];
+            $slot = $data[2];
+            foreach ($panelIds as $panelId) {
+                $urls[] = "olt-pon-ports-huawei?orgId=1&var-olt={$oltDeviceId}&var-server={$deviceServerId}&var-board={$board}&var-card={$card}&var-slot={$slot}&panelId={$panelId}&theme=light";
+            }
+        } else {
+            $card = $data[0];
+            $slot = $data[1];
+            foreach ($panelIds as $panelId) {
+                $urls[] = "olt-pon-ports?orgId=1&var-olt={$oltDeviceId}&var-server={$deviceServerId}&var-card={$card}&var-slot={$slot}&panelId={$panelId}&theme=light";
+            }
 
-        $panelIds = array(1, 2, 3, 4);
-        foreach ($panelIds as $panelId) {
-            $urls[] = "olt-pon-ports?orgId=1&var-olt={$oltDeviceId}&var-server={$deviceServerId}&var-card={$card}&var-slot={$slot}&panelId={$panelId}&theme=light";
         }
+
         if ($request->isMethod('GET')) {
             return $this->render('StatsBundle:Stats:ponport_graph.html.twig', array(
                         'grafana_url' => $grafana_url,