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

Timestamp:

May 1, 2016, 2:04:11 PM (9 years ago)

Author:

chronos

Message:

• Modified: Improved method for new network topology queue tree preparation. Not yet functional. Also RouterOS limits number of usable levels for queue tree to 7.

File:

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

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -4 +4 @@
 {
   var $UsedNames;
+  var $Devices;
+  var $QueueItems;
 
   function CheckName($Name)
@@ -13 +15 @@
   function Run()
   {
-    //print_r($this->BuildTree($this->System->Config['MainRouter']['DeviceId'], 140 * 1000 * 1000));
-    //die();
-
     $PathQueue = array('queue', 'tree');
 
@@ -53 +52 @@
     {
       $Service = $DbResult->fetch_array();
-      $FreeInetSpeed = $Service['InternetSpeedMax'] * 1000;
+      $FreeInetSpeed = $Service['InternetSpeedMax'];
     } else $FreeInetSpeed = 0;
 
@@ -62 +61 @@
     $ItemsQueue[] = array('name' => 'main-in', 'limit-at' => $UsersMaxSpeedOut, 'max-limit' => $UsersMaxSpeedOut, 'parent' => 'global');
 
-    // Divide rules by subnet number
-    $DbResult = $this->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet`');
     // Slow free internet
     $PacketMark = GetMarkByComment('free-out');
@@ -71 +68 @@
 
     // Process users
-    $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
+    $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
+      'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
     while($Member = $DbResult->fetch_assoc())
     {
@@ -84 +82 @@
         echo('Služba '.$Service['Name'].': ');
         $MemberName = RouterOSIdent($Member['Name'].'-'.$Member['Id'].'-'.$ServiceIndex);
-        $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider) * 1000;
-        $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider) * 1000;
-        $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider) * 1000;
-        $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider) * 1000;
+        $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider);
+        $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider);
+        $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider);
+        $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider);
         $ItemsQueue[] = array('name' => $MemberName.'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
         $ItemsQueue[] = array('name' => $MemberName.'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
@@ -117 +115 @@
             $Name = RouterOSIdent($Name);
             echo($Name.', ');
-            $IPParts = explode('.', $Interface['LocalIP']);
-            $Subnet = $IPParts[2];
             $PacketMark = GetMarkByComment($Name.'-out');
             $ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
@@ -133 +129 @@
           $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
           echo($Subnet['Name'].', ');
-          $IPParts = explode('.', $Subnet['AddressRange']);
-          $SubnetNumber = $IPParts[2];
           $PacketMark = GetMarkByComment($Subnet['Name'].'-out');
           $ItemsQueue[] = array('name' => $Subnet['Name'].'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
@@ -151 +145 @@
   }
 
+  function UpdateMinSpeed($DeviceId)
+  {
+    $MinSpeed = 0;
+    foreach($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
+    {
+      $this->UpdateMinSpeed($DeviceChild);
+      $MinSpeed += $this->Devices[$DeviceChild]['MinSpeed'];
+    }
+    $this->Devices[$DeviceId]['MinSpeed'] = $MinSpeed;
+    if($this->Devices[$DeviceId]['DeviceCount'] > 0)
+      $this->Devices[$DeviceId]['MinSpeed'] += round($this->Devices[$DeviceId]['InternetSpeedMin'] / $this->Devices[$DeviceId]['DeviceCount']);
+  }
+
   // 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`');
+    $this->Devices = array();
+    $DbResult = $this->Database->query('SELECT `NetworkDevice`.`Name`,`NetworkDevice`.`Id`, '.
+      '`Service`.`InternetSpeedMin`, `Service`.`InternetSpeedMax`, '.
+      '(SELECT COUNT(*) FROM `NetworkDevice` AS `T` WHERE `T`.`Service` = `NetworkDevice`.`Service`) AS `DeviceCount` FROM `NetworkDevice` '.
+      'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Id`=`NetworkDevice`.`Service` '.
+      'LEFT JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service`');
     while($Device = $DbResult->fetch_assoc())
     {
@@ -162 +173 @@
       $Device['Calculated'] = false;
       $Device['MaxSpeed'] = 0;
-      $Devices[$Device['Id']] = $Device;
+      $Device['MinSpeed'] = 0;
+      $Device['Childs'] = array();
+      $Device['Parent'] = 0;
+      $Device['QueueName'] = '';
+      $this->Devices[$Device['Id']] = $Device;
     }
 
@@ -172 +187 @@
       $Interface['Links'] = array();
       $Interfaces[$Interface['Id']] = $Interface;
-      $Devices[$Interface['Device']]['Interfaces'][] = $Interface['Id'];
+      $this->Devices[$Interface['Device']]['Interfaces'][] = $Interface['Id'];
     }
 
@@ -187 +202 @@
     }
 
+    // Calculate maximum speed for network devices
     $DevicesToCheck = array($RootDeviceId);
-    $Devices[$RootDeviceId]['MaxSpeed'] = $BaseSpeed;
-    $Devices[$RootDeviceId]['Calculated'] = true;
+    $this->Devices[$RootDeviceId]['MaxSpeed'] = $BaseSpeed;
+    $this->Devices[$RootDeviceId]['Calculated'] = true;
 
     while(count($DevicesToCheck) > 0)
     {
-      echo('Pass'."\n");
+      //echo('Pass'."\n");
       $NewDevicesToCheck = array();
       foreach($DevicesToCheck as $DeviceId)
       {
-        echo($Devices[$DeviceId]['Name'].': ');
-        foreach($Devices[$DeviceId]['Interfaces'] as $InterfaceId)
+        //echo($this->Devices[$DeviceId]['Name'].': ');
+        foreach($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
         {
           foreach($Interfaces[$InterfaceId]['Links'] as $LinkId)
@@ -207 +223 @@
 
             $Device2Id = $Interfaces[$Interface2Id]['Device'];
-            if($Devices[$Device2Id]['Calculated'] == false)
+            if($this->Devices[$Device2Id]['Calculated'] == false)
             {
-              $Devices[$Device2Id]['Calculated'] = true;
-              $NewMaxSpeed = $Devices[$DeviceId]['MaxSpeed'];
+              $this->Devices[$Device2Id]['Calculated'] = true;
+              $NewMaxSpeed = $this->Devices[$DeviceId]['MaxSpeed'];
               if($NewMaxSpeed > $Link['MaxRealSpeed'])
                 $NewMaxSpeed = $Link['MaxRealSpeed'];
-              echo($Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
-              $Devices[$Device2Id]['MaxSpeed'] = $NewMaxSpeed;
-              echo($NewMaxSpeed.", ".count($NewDevicesToCheck).' ');
+              //echo($this->Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
+              $this->Devices[$Device2Id]['MaxSpeed'] = $NewMaxSpeed;
+              // Set nodes tree relation
+              $this->Devices[$Device2Id]['Parent'] = $DeviceId;
+              $this->Devices[$DeviceId]['Childs'][] = $Device2Id;
+              //echo($NewMaxSpeed.", ".count($NewDevicesToCheck).' ');
               $NewDevicesToCheck[] = $Device2Id;
             }
           }
         }
-        echo("\n");
+        //echo("\n");
       }
       $DevicesToCheck = $NewDevicesToCheck;
     }
-    //print_r($Devices);
+
+    // Calculate maximum speed for network devices
+    $this->UpdateMinSpeed($RootDeviceId);
+
+    //print_r($this->Devices);
 
     echo('Not linked network devices: ');
-    foreach($Devices as $Device)
+    foreach($this->Devices as $Device)
     {
       if($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
     }
     echo("\n");
-
-    $Tree = array();
-    return($Tree);
+  }
+
+  function BuildQueueItems($DeviceId)
+  {
+    $Device = $this->Devices[$DeviceId];
+
+    // Device
+    if($Device['Parent'] != 0)
+      $ParentQueueName = $this->Devices[$Device['Parent']]['QueueName'];
+      else $ParentQueueName = 'main';
+    $Name = $Device['Name'];
+    $Name = RouterOSIdent($Name);
+    $DeviceName = $Name;
+    $this->Devices[$DeviceId]['QueueName'] = $Name;
+    echo($Name.', ');
+    $PacketMark = GetMarkByComment($Name.'-out');
+    $this->ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $Device['MinSpeed'],
+      'max-limit' => $Device['MaxSpeed'], 'parent' => $ParentQueueName.'-out',
+      'packet-mark' => $PacketMark);
+    $PacketMark = GetMarkByComment($Name.'-in');
+    $this->ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $Device['MinSpeed'],
+      'max-limit' => $Device['MaxSpeed'], 'parent' => $ParentQueueName.'-in',
+      'packet-mark' => $PacketMark);
+    $this->CheckName($Name.'-out');
+    $this->CheckName($Name.'-in');
+
+    // Interfaces
+    $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$DeviceId.' AND `LocalIP` != ""');
+    $IntCount = $DbResult3->num_rows;
+    while($Interface = $DbResult3->fetch_assoc())
+    {
+      $Name = $Device['Name'];
+      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        else $Name .= '-';
+      $Name = RouterOSIdent($Name);
+      echo($Name.', ');
+      $PacketMark = GetMarkByComment($Name.'-out');
+      $this->ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => round($Device['MinSpeed'] / $IntCount),
+        'max-limit' => $Device['MaxSpeed'], 'parent' => $DeviceName.'-out',
+        'packet-mark' => $PacketMark);
+      $PacketMark = GetMarkByComment($Name.'-in');
+      $this->ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => round($Device['MinSpeed'] / $IntCount),
+        'max-limit' => $Device['MaxSpeed'], 'parent' => $DeviceName.'-in',
+        'packet-mark' => $PacketMark);
+      $this->CheckName($Name.'-out');
+      $this->CheckName($Name.'-in');
+    }
+
+    // Process childs
+    foreach($Device['Childs'] as $DeviceChild)
+    {
+      $this->BuildQueueItems($DeviceChild);
+    }
+  }
+
+  function RunTopology()
+  {
+    $PathQueue = array('queue', 'tree');
+
+    $Routerboard = new Routerboard();
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->HostName = $this->System->Config['MainRouter']['HostName'];
+    $Routerboard->Debug = true;
+
+    $this->UsedNames = array();
+
+    $Finance = &$this->System->Modules['Finance'];
+    $Finance->LoadMonthParameters(0);
+
+    $InDivider = 1;
+    $OutDivider = 1;
+    $TotalMaxSpeedIn = round($Finance->RealMaxSpeed / $InDivider) * 1000;
+    $TotalMaxSpeedOut = round($Finance->RealMaxSpeed / $OutDivider) * 1000;
+    $UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
+    $UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
+    $VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
+    $VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
+    $VoipSpeedIn = 100; //$SpeedReserve;
+    $VoipSpeedOut = 100; //$SpeedReserve;
+    $OutInterface = 'eth1';
+    $InInterface = 'ifb0';
+    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
+
+    $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
+    if($DbResult->num_rows == 1)
+    {
+      $Service = $DbResult->fetch_array();
+      $FreeInetSpeed = $Service['InternetSpeedMax'];
+    } else $FreeInetSpeed = 0;
+
+    $this->ItemsQueue = array();
+
+    // Root of tree and main limit
+    $this->ItemsQueue[] = array('name' => 'main-out', 'limit-at' => $UsersMaxSpeedIn, 'max-limit' => $UsersMaxSpeedIn, 'parent' => 'global');
+    $this->ItemsQueue[] = array('name' => 'main-in', 'limit-at' => $UsersMaxSpeedOut, 'max-limit' => $UsersMaxSpeedOut, 'parent' => 'global');
+
+    // Slow free internet
+    $PacketMark = GetMarkByComment('free-out');
+    $this->ItemsQueue[] = array('name' => 'free-out', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-out', 'packet-mark' => $PacketMark);
+    $PacketMark = GetMarkByComment('free-in');
+    $this->ItemsQueue[] = array('name' => 'free-in', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-in', 'packet-mark' => $PacketMark);
+
+    $this->BuildTree($this->System->Config['MainRouter']['DeviceId'], 140 * 1000 * 1000);
+
+    $this->BuildQueueItems($this->System->Config['MainRouter']['DeviceId']);
+
+    //print_r($this->ItemsQueue);
+    $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit',
+      'parent', 'packet-mark'), $this->ItemsQueue, array(), true);
   }
 }