Merged in FD3-316 (pull request #28)

FD3-316 Medición de tráfico de ONUs por NAS.

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>

app/AppKernel.php

@@ -56,6 +56,7 @@ class AppKernel extends Kernel
 
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
             new WorkflowBundle\WorkflowBundle(),
+            new NasBundle\NasBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

composer.json

@@ -162,7 +162,13 @@
             },
             "name": "ik-sonata"
         },
-        "packagist": false
+        "21": {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/NasBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        }
     },
     "require": {
         "php": ">=5.5.9",
@@ -190,6 +196,7 @@
         "ik/statsd-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "ik/workflow-bundle": "dev-master",
+        "ik/stats/nas-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "^2.0",
         "jms/serializer": "^1.9.0",
         "jms/serializer-bundle": "^1.5.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "71b709205e37b44ec104acc1224b802b",
+    "content-hash": "d23cf4a3e7eb8a966d34d078f33a07ca",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1226,7 +1226,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
                 "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
-                "shasum": "b6918d1815cc36aff59cf0d12764bb0324ff1549"
+                "shasum": ""
             },
             "require": {
                 "kriswallsmith/buzz": "~0.13",
@@ -1370,7 +1370,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
-                "reference": "b202b7ac2ba770a72d323bb1fea8291249c09096"
+                "reference": "79a55db7f6fcb93a2b7f2fa84c62923681302318"
             },
             "require": {
                 "simplethings/entity-audit-bundle": "^1.0"
@@ -1386,7 +1386,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-11-24 15:24:36"
+            "time": "2018-01-11T17:21:01+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1394,7 +1394,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "3dfe0b95b0a2d3003065b2507a9bf581d3b7c214"
+                "reference": "25f4ad8ff242aa6ac97e269626cd7d46b4892e9a"
             },
             "type": "library",
             "autoload": {
@@ -1409,7 +1409,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-12-05 15:22:24"
+            "time": "2018-01-11T17:57:19+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1417,7 +1417,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "63444b34bcb0d5f97eb72265c3e04c3e744e84b3"
+                "reference": "da9afc43dbbc4a3caac38d5395a28eb3ddf3a197"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-12-26 15:41:06"
+            "time": "2018-01-11T17:41:06+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1440,7 +1440,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "44b9f6833db9d9611e9065615888ddbe96993537"
+                "reference": "5ff7b53da7f48f39276c507e9b162f3e87b1bae3"
             },
             "type": "library",
             "autoload": {
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-12-26 12:26:50"
+            "time": "2018-01-11T11:36:46+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1463,7 +1463,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "fdfa90821ff77946aa8a6781da6ac561f52e2b76"
+                "reference": "c2ee4d1ba8f93aa1e909c57c25dbb6c69f96a78e"
             },
             "type": "library",
             "autoload": {
@@ -1478,7 +1478,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-12-27 13:01:33"
+            "time": "2018-01-11T18:01:06+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1486,7 +1486,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-                "reference": "84174321550f3b566f525fb97b66f9e28396363a"
+                "reference": "be8f41c1588ee07251ae4ce657bdf4c33a120b34"
             },
             "require": {
                 "ext-curl": "*",
@@ -1499,7 +1499,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-12-12 17:52:51"
+            "time": "2018-01-11T18:04:54+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1507,7 +1507,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
-                "reference": "db2d82800bca471cff76677b53aef5ec0ce6f374"
+                "reference": "ecd04ff6143fc7934cc39ca2c4161b5f08336958"
             },
             "type": "library",
             "autoload": {
@@ -1522,7 +1522,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-12-21 12:10:32"
+            "time": "2018-01-11T17:45:12+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1530,7 +1530,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "7f9343ed5988f10b7be0c7bb2d2cd1cc75275553"
+                "reference": "99dd29c918a4fae20c62717d339e0e62df83576f"
             },
             "require": {
                 "ext-curl": "*",
@@ -1549,7 +1549,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2018-01-11T17:07:40+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1557,7 +1557,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
-                "reference": "9ae7b65c59f9cb2216b422744a5e1ffbe429ef29"
+                "reference": "f1716d556197ca5c3f6719ade9d31cbce1fef438"
             },
             "type": "library",
             "autoload": {
@@ -1572,7 +1572,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2018-01-11T17:26:19+00:00"
         },
         {
             "name": "ik/redis-bundle",
@@ -1580,7 +1580,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/RedisBundle.git",
-                "reference": "89b303559284f1f3d1efe80eaf8f1be0012aa70d"
+                "reference": "635872e4656c2f42ef89607c42672cbe4d721bbd"
             },
             "require": {
                 "predis/predis": "^1.1"
@@ -1596,7 +1596,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2017-12-21 12:11:19"
+            "time": "2018-01-11T15:21:55+00:00"
         },
         {
             "name": "ik/stats/base-stats-bundle",
@@ -1617,7 +1617,7 @@
                 "BaseStatsBundle",
                 "Flowdat 3"
             ],
-            "time": "2017-12-27 17:10:07"
+            "time": "2017-12-27T17:10:07+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1625,7 +1625,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/FiberhomeBundle.git",
-                "reference": "dec1593dd704304ec579a7945cf8f1caa4459a56"
+                "reference": "5e1f488189b0eccf146bcdc0c966c8938335d5c3"
             },
             "type": "library",
             "autoload": {
@@ -1638,7 +1638,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2017-12-21 12:11:15"
+            "time": "2018-01-11T16:56:47+00:00"
         },
         {
             "name": "ik/stats/fiberlink-bundle",
@@ -1646,7 +1646,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/FiberlinkBundle.git",
-                "reference": "cc2984a964d4ee9a975fc37d768e9b11cc13a585"
+                "reference": "64fe2e43fdaba5da1ef6b5c308dfdc9a91fd1ec2"
             },
             "type": "library",
             "autoload": {
@@ -1659,7 +1659,7 @@
                 "Fiberlink",
                 "Flowdat 3"
             ],
-            "time": "2017-12-21 12:10:39"
+            "time": "2018-01-11T16:58:27+00:00"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1667,7 +1667,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/GeoserverBundle.git",
-                "reference": "fbd23f11d7f1ff7ff913133d05d8b6e8bbe33357"
+                "reference": "cb66e64ed919dad0bcad01b253484ccf9244c499"
             },
             "type": "library",
             "autoload": {
@@ -1680,7 +1680,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2017-12-21 12:11:23"
+            "time": "2018-01-11T17:51:42+00:00"
         },
         {
             "name": "ik/stats/huawei-bundle",
@@ -1701,7 +1701,28 @@
                 "Flowdat 3",
                 "Huawei"
             ],
-            "time": "2017-12-27 11:19:17"
+            "time": "2017-12-27T11:19:17+00:00"
+        },
+        {
+            "name": "ik/stats/nas-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/NasBundle.git",
+                "reference": "c1ab1a1044abad5c6240800d69c8e8039e50800e"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "NasBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 NAS Bundle",
+            "keywords": [
+                "Flowdat 3",
+                "NAS"
+            ],
+            "time": "2018-01-05T18:49:11+00:00"
         },
         {
             "name": "ik/stats/zte-bundle",
@@ -1709,7 +1730,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ZteBundle.git",
-                "reference": "f9963f058d8951b6144b26cfd88fd5c95ecd3841"
+                "reference": "ef0c2de56f06d667007d3b4c052b3fc5405cf919"
             },
             "type": "library",
             "autoload": {
@@ -1722,7 +1743,7 @@
                 "Flowdat 3",
                 "Zte"
             ],
-            "time": "2017-12-21 12:11:04"
+            "time": "2018-01-11T17:00:17+00:00"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1730,7 +1751,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/StatsDBundle.git",
-                "reference": "f56e2fcbd04dc89e4f8a8569a861925e047d4e68"
+                "reference": "05c8936d20c0c4c667d7440fca520698670707de"
             },
             "type": "library",
             "autoload": {
@@ -1743,7 +1764,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2017-12-21 12:10:50"
+            "time": "2018-01-11T17:57:52+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1751,7 +1772,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "75b52a5100bdb19cf6006dea5a8a92ae3047d87c"
+                "reference": "6a383d854b3a51d8423e0afc2838f77dc61936cc"
             },
             "require": {
                 "ext-curl": "*",
@@ -1764,7 +1785,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-12-18 13:14:57"
+            "time": "2018-01-11T17:48:52+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1772,7 +1793,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "360f6a217c6ebdbc7d39b608d5cc63f28dbde47e"
+                "reference": "d0964f492663eca837de58e9e3d09d39723179f0"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1802,7 +1823,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-12-21 16:04:13"
+            "time": "2018-01-11T17:17:44+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1816,7 +1837,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
                 "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
-                "shasum": "78accafc69077c94e2b5c40dcac6a23149e62a2d"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
@@ -1961,7 +1982,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
                 "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": "2ea232ddbcd3fb65004c7454244af057fb422817"
+                "shasum": ""
             },
             "require": {
                 "phpoption/phpoption": ">=0.9,<2.0-dev"
@@ -2560,7 +2581,7 @@
                 "oss_snmp",
                 "snmp"
             ],
-            "time": "2017-11-28 13:23:43"
+            "time": "2017-11-28T13:23:43+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3452,7 +3473,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -3881,7 +3902,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/4e7499d25dc5d0862da09fa8e336164948a29a25",
                 "reference": "4e7499d25dc5d0862da09fa8e336164948a29a25",
-                "shasum": "5f6b05de8625fea312c1ae92066580864eea07d5"
+                "shasum": ""
             },
             "require": {
                 "gedmo/doctrine-extensions": "^2.3.1",
@@ -4457,7 +4478,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/security-acl/zipball/053b49bf4aa333a392c83296855989bcf88ddad1",
                 "reference": "053b49bf4aa333a392c83296855989bcf88ddad1",
-                "shasum": "9562593da89cd1ab1a2d69962cc0d933cea99714"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.5.9",
@@ -4847,7 +4868,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/voryx/restgeneratorbundle/zipball/72b61d2188662da453d2e2a9cd625a60b6f3233b",
                 "reference": "72b61d2188662da453d2e2a9cd625a60b6f3233b",
-                "shasum": "5ca3bc614a05b341c7857876407dc54e73dcde0c"
+                "shasum": ""
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.7",
@@ -4880,7 +4901,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -6206,7 +6227,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.6.0"
@@ -6457,6 +6478,7 @@
         "ik/statsd-bundle": 20,
         "ik/webservice-bundle": 20,
         "ik/workflow-bundle": 20,
+        "ik/stats/nas-bundle": 20,
         "opensolutions/oss-snmp": 20,
         "sonata-project/admin-bundle": 20,
         "voryx/restgeneratorbundle": 20

src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -121,6 +121,39 @@ class GenerateCrontabCommand extends ContainerAwareCommand
                 
                 fwrite($handle, PHP_EOL);
             }
+
+            $nasDevices = $doctrine->getRepository('\StatsBundle\Entity\Device')->findBy(array('deviceType' => 'RadiusBundle\Entity\NAS', 'deviceServer' => $server));
+
+            foreach ($nasDevices as $device) {
+                $commands = array();
+                $data = $device->jsonExtraData();
+                $deviceId = $device->getDeviceId();
+
+                if (is_null($data['radiusPassword']) || empty($data['radiusPassword'])){
+		            continue;
+		        }   
+                if (!in_array($data['library'], array('OIDSBase'))){
+		            continue;
+                }   
+                
+                if (!$saveHistoric){
+		            continue;
+                }
+                
+                $library = $data['library'];
+                $snmpCommunity = $data['radiusPassword'];
+                $description = $data['description'];
+                $deviceIp = $device->getIp();
+
+                $params = "--nas-ip={$deviceIp} --nas-community={$snmpCommunity} --nas-snmp-library={$library} --nas-device-id={$deviceId} --nas-server-id={$serverId} --save-historic=1";
+
+                $commands[] = "*/10 * * * * {$pathConsole} nas:onu:octets {$params}";
+                
+                fwrite($handle, PHP_EOL.PHP_EOL."# NAS {$description} ({$deviceIp})".PHP_EOL);
+                fwrite($handle, PHP_EOL);
+                fwrite($handle, implode(PHP_EOL,$commands));
+                
+            }
         }
 
         fclose($handle);

src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

@@ -170,6 +170,44 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
                 $content .= implode(PHP_EOL, $commands);
                 $content .= PHP_EOL;
             }
+
+            $nasDevices = $doctrine->getRepository('\StatsBundle\Entity\Device')->findBy(array('deviceType' => 'RadiusBundle\Entity\NAS', 'deviceServer' => $server));
+
+            foreach ($nasDevices as $device) {
+                $commands = array();
+                $data = $device->jsonExtraData();
+                $deviceId = $device->getDeviceId();
+
+                if (is_null($data['radiusPassword']) || empty($data['radiusPassword'])){
+		            $content .= PHP_EOL . PHP_EOL . "# Device(NAS) {$deviceId} skiped, radiusPassword is null or empty" . PHP_EOL;
+                    continue;
+		        }   
+                if (!in_array($data['library'], array('OIDSBase'))){
+		            $content .= PHP_EOL . PHP_EOL . "# Device(NAS) {$deviceId} skiped, library not exist" . PHP_EOL;
+                    continue;
+                }   
+                
+                if (!$saveHistoric){
+		            $content .= PHP_EOL . PHP_EOL . "# Device {$deviceId} skiped, because saveHistoric is 0, set Server options in Stats". PHP_EOL;
+                    continue;
+                }
+                
+                $library = $data['library'];
+                $snmpCommunity = $data['radiusPassword'];
+                $description = $data['description'];
+                $deviceIp = $device->getIp();
+
+                $params = "--nas-ip={$deviceIp} --nas-community={$snmpCommunity} --nas-snmp-library={$library} --nas-device-id={$deviceId} --nas-server-id={$serverId} --save-historic=1";
+                if ($amqp) {
+                    $params = "--args=--nas-ip:{$deviceIp} --args=--nas-community:{$snmpCommunity} --args=--nas-snmp-library:{$library} --args=--nas-device-id:{$deviceId} --args=--nas-server-id:{$serverId} --args=--save-historic:1";
+                }
+
+                $commands[] = "*/10 * * * * {$pathConsole} {$amqpRemote} {$routing_key} nas:onu:octets {$params}";
+                $content .= PHP_EOL . "# NAS {$description} ({$deviceIp})" . PHP_EOL;
+
+                $content .= implode(PHP_EOL, $commands);
+            }
+
         }
         file_put_contents($fileCrontab, $content);
 

src/StatsBundle/Entity/Device.php

@@ -166,7 +166,9 @@ class Device implements TenancyIdTraitInterface
 
     public function getShortType() 
     {
-        return str_replace("FTTHBundle\\Entity\\","",$this->deviceType);
+        $pieces = explode("\\", $this->deviceType);
+
+        return end($pieces);
     }
 
     /**