Se arreglan unos parámetros.

src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -50,8 +50,8 @@ class GenerateCrontabCommand extends ContainerAwareCommand
         
         $serverDevices = $doctrine->getRepository('\StatsBundle\Entity\DeviceServer')->findAll();
         
-        $oltMarks = array('FiberHome','FiberLink','Huawei');
-        $oltLibraries = array('OIDSFiberHomeV1','OIDSHuaweiV1');
+        $oltMarks = array('FiberHome','FiberLink','Huawei','ZTE','Calix');
+        $oltLibraries = array('OIDSFiberHomeV1','OIDSHuaweiV1','OIDSFiberLinkV1','OIDSZTEV1','OIDSCalixV1');
 
         fwrite($handle, "*/5 * * * * {$pathConsole} generate:crontab".PHP_EOL);
 
@@ -64,11 +64,11 @@ class GenerateCrontabCommand extends ContainerAwareCommand
 
             $serverId = $server->getId();
             $saveHistoric = $server->getSaveHistoric();
+            ($saveHistoric)? $saveHistoric = 1 : $saveHistoric = 0;
 
             foreach($oltDevices as $device) {
                 $commands = array();
                 $data = $device->jsonExtraData();
-                
                 if($data['executeSnmp'] == 0) continue;
 
                 if(!in_array($data['mark'],$oltMarks)) continue;
@@ -87,10 +87,11 @@ class GenerateCrontabCommand extends ContainerAwareCommand
                 $timePonStats = $data['timePonStats'];
                 $timeOltOctets = $data['timeOltOctets'];
 
-                $params = "--olt-ip={$deviceIp} --olt-community={$snmpCommunity} --olt-snmp-library={$library} --olt-device-id={$deviceId} --olt-server-id={$serverId} --save-historic={$saveHistoric}";
+                $params = "--olt-ip={$deviceIp} --olt-community={$snmpCommunity} --olt-snmp-library={$library} --olt-device-id={$deviceId} --olt-server-id={$serverId}";
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$mark}:pon:scan {$params}";
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$mark}:onu:scan {$params}";
                 
+                $params .= " --save-historic={$saveHistoric}";
                 $commands[] = "*/{$timeOnuStats} * * * * {$pathConsole} {$mark}:onu:stats {$params}";
                 $commands[] = "*/{$timePonStats} * * * * {$pathConsole} {$mark}:pon:stats {$params}";
                 $commands[] = "*/{$timeOltOctets} * * * * {$pathConsole} {$mark}:pon:octets {$params}";
@@ -101,7 +102,7 @@ class GenerateCrontabCommand extends ContainerAwareCommand
                 
                 fwrite($handle, PHP_EOL."# OLT {$oltName} ({$deviceIp})".PHP_EOL);
                 
-                fwrite($handle, implode(PHP_EOL,$commands));
+                fwrite($handle, implode(PHP_EOL."#",$commands));
             }
             
             if($this->getContainer()->getParameter('geoserver_service')) {

src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

@@ -89,6 +89,7 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
 
             $serverId = $server->getId();
             $saveHistoric = $server->getSaveHistoric();
+            ($saveHistoric)? $saveHistoric = 1 : $saveHistoric = 0;
 
             foreach ($oltDevices as $device) {
                 $commands = array();
@@ -115,14 +116,19 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
                 $timePonStats = $data['timePonStats'];
                 $timeOltOctets = $data['timeOltOctets'];
 
-                $params = "--olt-ip={$deviceIp} --olt-community={$snmpCommunity} --olt-snmp-library={$library} --olt-device-id={$deviceId} --olt-server-id={$serverId} --save-historic={$saveHistoric}";
+                $params = "--olt-ip={$deviceIp} --olt-community={$snmpCommunity} --olt-snmp-library={$library} --olt-device-id={$deviceId} --olt-server-id={$serverId}";
                 if ($amqp) {
-                    $params = "--args=--olt-ip:{$deviceIp} --args=--olt-community:{$snmpCommunity} --args=--olt-snmp-library:{$library} --args=--olt-device-id:{$deviceId} --args=--olt-server-id:{$serverId} --args=--save-historic:{$saveHistoric}";
+                    $params = "--args=--olt-ip:{$deviceIp} --args=--olt-community:{$snmpCommunity} --args=--olt-snmp-library:{$library} --args=--olt-device-id:{$deviceId} --args=--olt-server-id:{$serverId}";
                 }
 
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:pon:scan {$params}";
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:onu:scan {$params}";
-
+                
+                if ($amqp) {
+                    $params .= " --args=--save-historic:{$saveHistoric}";
+                } else {
+                    $params .= " --save-historic={$saveHistoric}";
+                }
                 $commands[] = "*/{$timeOnuStats} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:onu:stats {$params}";
                 $commands[] = "*/{$timePonStats} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:pon:stats {$params}";
                 $commands[] = "*/{$timeOltOctets} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:pon:octets {$params}";