Changeset 829

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.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (13 diffs)
• Modules/NetworkConfigRouterOS/Generators/Netwatch.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (3 diffs)

trunk/Application/UpdateTrace.php

@@ -2020 +2020 @@
     ADD CONSTRAINT `NetworkInterfaceLatency_ibfk_1` FOREIGN KEY (`Interface`) REFERENCES `NetworkInterface` (`Id`);');
 }
+
+/*
+function UpdateTo829($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkLinkType` '.
+    'ADD `MaxLinkSpeed` INT NOT NULL AFTER `Name`, '.
+    'ADD `MaxRealSpeed` INT NOT NULL AFTER `MaxLinkSpeed`, '.
+    'ADD `FullDuplex` INT NOT NULL AFTER `MaxRealSpeed`, '.
+    'ADD `Color` VARCHAR(6) NOT NULL AFTER `FullDuplex`');
+}
+*/
 
 class Updates
@@ -2113 +2124 @@
       817 => array('Revision' => 818, 'Function' => 'UpdateTo818'),
       818 => array('Revision' => 824, 'Function' => 'UpdateTo824'),
+      //824 => array('Revision' => 829, 'Function' => 'UpdateTo829'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -100 +100 @@
 {
   var $MinNotifyTime;
-  
+
   function __construct($System)
   {
@@ -110 +110 @@
     $this->Description = 'Networking related tools';
     $this->Dependencies = array('Notify');
-    
+
     // TODO: Make notify time configurable
-    $this->MinNotifytime = 2 * 60; 
+    $this->MinNotifyTime = 2 * 60;
   }
 
@@ -125 +125 @@
   function DoStart()
   {
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability', 
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability',
       array($this, 'ReachabilityCheck'));
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort', 
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort',
       array($this, 'PortCheck'));
-    
-    
+
+
     $this->System->RegisterPage('network', 'PageNetwork');
     $this->System->RegisterPage(array('network', 'administration'), 'PageNetworkAdministration');
@@ -297 +297 @@
       'Items' => array(
         'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+        'MaxLinkSpeed' => array('Type' => 'Integer', 'Caption' => 'Maximální spojová rychlost', 'Default' => '0', 'Suffix' => 'bits/s'),
+        'MaxRealSpeed' => array('Type' => 'Integer', 'Caption' => 'Maximální reálná rychlost', 'Default' => '0', 'Suffix' => 'bits/s'),
+        'FullDuplex' => array('Type' => 'Boolean', 'Caption' => 'Plně duplexní', 'Default' => '0'),
+        'Color' => array('Type' => 'Color', 'Caption' => 'Barva', 'Default' => '0'),
       ),
     ));
@@ -669 +673 @@
       'Filter' => '1',
     ));
-    
+
     $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('Network',
       array('ModuleNetwork', 'ShowDashboardItem'));
@@ -680 +684 @@
     ));
   }
-  
+
   function AfterInsertNetworkDevice($Form)
   {
@@ -690 +694 @@
     $this->System->Models['NetworkDevice']->DoOnChange();
   }
-  
+
   function AfterInsertNetworkInterface($Form)
   {
@@ -700 +704 @@
     $this->System->Models['NetworkInterface']->DoOnChange();
   }
-  
+
   function BeforeDeleteNetworkInterface($Form, $Id)
   {
@@ -734 +738 @@
   {
   }
-  
+
   function OnlineList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
   {
@@ -748 +752 @@
       '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkInterface`.`Enabled`=1)'.
       'ORDER BY `Name` ASC');
-    if($DbResult3->num_rows > 0) 
+    if($DbResult3->num_rows > 0)
     {
       $Output .= $Title.'<br/>';
@@ -780 +784 @@
     return($Output);
   }
-  
+
   function PortCheckList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
   {
@@ -808 +812 @@
         $Days = floor($Duration / (60 * 60 * 24));
         if($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
-  
+
         $Output .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['Online']].
           '</td><td>'.$Item['LastOnline'].'</td><td>'.$DurationText.'</td></tr>'."\n";
@@ -818 +822 @@
     return $Output;
   }
-  
+
   function PortCheck()
   {

trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php

@@ -31 +31 @@
           if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
           echo($Name.', ');
-          $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:01:00', 'comment' => $Name);
+          $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:00:30', 'comment' => $Name);
         }
       }

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -91 +91 @@
   function Run()
   {
-    RepeatFunction(60, array($this, 'NetwatchImport'));
+    RepeatFunction(30, array($this, 'NetwatchImport'));
   }
 }

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);
+  }
 }