Changeset 829 for trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

Timestamp:

Apr 29, 2016, 11:54:31 PM (9 years ago)

Author:

chronos

Message:

• Added: Experimental metod for calculating maximum speed limit according network links.
• Modified: Lowered routeros netwatch period to 30 seconds.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (3 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -13 +13 @@
   function Run()
   {
+    //print_r($this->BuildTree($this->System->Config['MainRouter']['DeviceId'], 140 * 1000 * 1000));
+    //die();
+
     $PathQueue = array('queue', 'tree');
 
@@ -74 +77 @@
       echo('Zákazník '.$Member['Name']."\n");
       $DbResult4 = $this->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` '.
-          'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
-          'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
-          'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
+        'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
+        'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
+        'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
       while($Service = $DbResult4->fetch_assoc())
       {
@@ -147 +150 @@
     $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
   }
+
+  // Calculate maximum real speed available for each network device Start with main router and continue with adjecement nodes.
+  function BuildTree($RootDeviceId, $BaseSpeed)
+  {
+    // Load network devices
+    $Devices = array();
+    $DbResult = $this->Database->query('SELECT `Name`,`Id` FROM `NetworkDevice`');
+    while($Device = $DbResult->fetch_assoc())
+    {
+      $Device['Interfaces'] = array();
+      $Device['Calculated'] = false;
+      $Device['MaxSpeed'] = 0;
+      $Devices[$Device['Id']] = $Device;
+    }
+
+    // Load network interfaces and assign them to device
+    $Interfaces = array();
+    $DbResult = $this->Database->query('SELECT `Device`,`Name`,`Id` FROM `NetworkInterface`');
+    while($Interface = $DbResult->fetch_assoc())
+    {
+      $Interface['Links'] = array();
+      $Interfaces[$Interface['Id']] = $Interface;
+      $Devices[$Interface['Device']]['Interfaces'][] = $Interface['Id'];
+    }
+
+    // Load network links and assign them to interfaces
+    $Links = array();
+    $DbResult = $this->Database->query('SELECT `NetworkLink`.`Id`,`NetworkLink`.`Interface1`,'.
+      '`NetworkLink`.`Interface2`,`NetworkLinkType`.`MaxRealSpeed` FROM `NetworkLink` '.
+      'LEFT JOIN `NetworkLinkType` ON `NetworkLinkType`.`Id`=`NetworkLink`.`Type`');
+    while($Link = $DbResult->fetch_assoc())
+    {
+      $Links[$Link['Id']] = $Link;
+      $Interfaces[$Link['Interface1']]['Links'][] = $Link['Id'];
+      $Interfaces[$Link['Interface2']]['Links'][] = $Link['Id'];
+    }
+
+    $DevicesToCheck = array($RootDeviceId);
+    $Devices[$RootDeviceId]['MaxSpeed'] = $BaseSpeed;
+    $Devices[$RootDeviceId]['Calculated'] = true;
+
+    while(count($DevicesToCheck) > 0)
+    {
+      echo('Pass'."\n");
+      $NewDevicesToCheck = array();
+      foreach($DevicesToCheck as $DeviceId)
+      {
+        echo($Devices[$DeviceId]['Name'].': ');
+        foreach($Devices[$DeviceId]['Interfaces'] as $InterfaceId)
+        {
+          foreach($Interfaces[$InterfaceId]['Links'] as $LinkId)
+          {
+            $Link = $Links[$LinkId];
+            $Interface2Id = $Link['Interface1'];
+            if($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
+
+            $Device2Id = $Interfaces[$Interface2Id]['Device'];
+            if($Devices[$Device2Id]['Calculated'] == false)
+            {
+              $Devices[$Device2Id]['Calculated'] = true;
+              $NewMaxSpeed = $Devices[$DeviceId]['MaxSpeed'];
+              if($NewMaxSpeed > $Link['MaxRealSpeed'])
+                $NewMaxSpeed = $Link['MaxRealSpeed'];
+              echo($Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
+              $Devices[$Device2Id]['MaxSpeed'] = $NewMaxSpeed;
+              echo($NewMaxSpeed.", ".count($NewDevicesToCheck).' ');
+              $NewDevicesToCheck[] = $Device2Id;
+            }
+          }
+        }
+        echo("\n");
+      }
+      $DevicesToCheck = $NewDevicesToCheck;
+    }
+    //print_r($Devices);
+
+    echo('Not linked network devices: ');
+    foreach($Devices as $Device)
+    {
+      if($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
+    }
+    echo("\n");
+
+    $Tree = array();
+    return($Tree);
+  }
 }