Merge branch 'master' of ssh://gitlab.com/interlink-sa/flowdat3/modules/stats into 5

src/StatsBundle/Command/StatsOnuCommand.php

@@ -64,7 +64,9 @@ class StatsOnuCommand extends BaseCommand
 
         foreach($onus as $index => $onu) {
             $sn = $onu['serialNumber'];
-            $lowSn = strtolower($sn);
+	        $lowSn = strtolower($sn);
+	        $serialNumber = $this->snCalulate($sn);
+	        $ponSerialNumber = $this->psnCalulate($sn);
             $row = array();
             $row['deviceServer'] = $deviceServerId;
             $ponPort = $onu['ponport'];
@@ -80,9 +82,9 @@ class StatsOnuCommand extends BaseCommand
             $row['oltDeviceId'] = $oltDeviceId;
             $row['tenancyId'] = $tenancyId;
             $row['ip'] = "NULL";
-            $row['mac'] = "NULL";
-            $row['serialNumber'] = "'".$this->snCalulate($sn)."'";
-            $row['ponSerialNumber'] = "'".$this->psnCalulate($sn)."'";
+	        $row['mac'] = "NULL";
+	        $row['serialNumber'] = "'{$serialNumber}'";
+	        $row['ponSerialNumber'] = "'{$ponSerialNumber}'";
             $row['ponPort'] = "'".$ponPort."'";
 
             foreach($metrics as $m => $metric) {
@@ -116,15 +118,23 @@ class StatsOnuCommand extends BaseCommand
             $row['clientName'] = "NULL";
             $row['clientAddress'] = "NULL";
 
-            if(isset($devices[$lowSn]) && isset($devices[$lowSn]['clientId'])) {
-                $clientId = $devices[$lowSn]['clientId'];
-                if(isset($clients[$clientId])) {
-                    $row['clientId'] = $clientId;
-                    $row['clientExternalId'] = "'".$clients[$clientId]['externalId']."'";
-                    $row['clientName'] = "'".$clients[$clientId]['name']."'";
-                    $row['clientAddress'] = "'".$clients[$clientId]['address']."'";
-                }
-            } 
+	        if(isset($devices[$serialNumber]) && isset($devices[$serialNumber]['clientId'])) {
+		        $clientId = $devices[$serialNumber]['clientId'];
+		        if(isset($clients[$clientId])) {
+		            $row['clientId'] = $clientId;
+		        	$row['clientExternalId'] = "'".$clients[$clientId]['externalId']."'";
+		        	$row['clientName'] = "'".$clients[$clientId]['name']."'";
+		        	$row['clientAddress'] = "'".$clients[$clientId]['address']."'";
+		        }
+		    } elseif(isset($devices[$ponSerialNumber]) && isset($devices[$ponSerialNumber]['clientId'])) {
+		        $clientId = $devices[$ponSerialNumber]['clientId'];
+		        if(isset($clients[$clientId])) {
+		            $row['clientId'] = $clientId;
+		        	$row['clientExternalId'] = "'".$clients[$clientId]['externalId']."'";
+		        	$row['clientName'] = "'".$clients[$clientId]['name']."'";
+		            $row['clientAddress'] = "'".$clients[$clientId]['address']."'";
+		        }
+		    }
 
             $data[] = "(".implode(",",$row).")".PHP_EOL;
         }