Changeset 817

Timestamp:

Mar 16, 2016, 8:51:59 PM (9 years ago)

Author:

chronos

Message:

• Modified: NetworkConfig now register OnChange handler to NetworkDevice and NetworkInterface so network configuration can be propagated if network device or interface was changed.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (3 diffs)
• Modules/NetworkConfig/Generate.php (modified) (2 diffs)
• Modules/NetworkConfig/NetworkConfig.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/DHCP.php (modified) (1 diff)
• Packages/Common/AppModule.php (modified) (1 diff)
• Packages/Common/Application.php (modified) (3 diffs)

trunk/Application/FormClasses.php

@@ -143 +143 @@
     'States' => array('<span style="color:red;">Nedostupný</span>', '<span style="color:green;">Dostupný</span>'),
   ),
-  'TNetworkConfigurationState' => array(
-    'Type' => 'Enumeration',
-    'States' => array('Neplánováno', 'V plánu', 'Provádí se'),
-  ),
   'TAntennaPolarity' => array(
     'Type' => 'Enumeration',

trunk/Application/UpdateTrace.php

@@ -1970 +1970 @@
   $Manager->Execute('ALTER TABLE `NetworkDevice` CHANGE `LastOnline` `LastOnline` DATETIME NULL;');
   $Manager->Execute('UPDATE `NetworkDevice` SET `LastOnline` = NULL WHERE `LastOnline` = "0000-00-00 00:00:00"');
+}
+
+function UpdateTo817($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkConfiguration` ADD `SysName` VARCHAR(255) NOT NULL FIRST;');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="LinuxDNS" WHERE `Id`=1');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="LinuxIptables" WHERE `Id`=2');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="LinuxTrafficShaping" WHERE `Id`=3');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="LinuxDHCP" WHERE `Id`=4');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="LinuxVPN" WHERE `Id`=5');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosDHCP" WHERE `Id`=7');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosNetwatch" WHERE `Id`=8');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosQueue" WHERE `Id`=9');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosFirewallNAT" WHERE `Id`=10');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosFirewallMangle" WHERE `Id`=11');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosFirewallFilter" WHERE `Id`=12');
+  $Manager->Execute('UPDATE `NetworkConfiguration` SET `SysName`="RouterosDNS" WHERE `Id`=13');
+  $Manager->Execute('ALTER TABLE `NetworkConfiguration` DROP `Execute`;');
 }
 
@@ -2061 +2079 @@
       807 => array('Revision' => 808, 'Function' => 'UpdateTo808'),
       808 => array('Revision' => 814, 'Function' => 'UpdateTo814'),
+      814 => array('Revision' => 817, 'Function' => 'UpdateTo817'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 815; // Subversion revision
-$DatabaseRevision = 814; // SQL structure revision
-$ReleaseTime = strtotime('2016-03-09');
+$Revision = 817; // Subversion revision
+$DatabaseRevision = 817; // SQL structure revision
+$ReleaseTime = strtotime('2016-03-16');

trunk/Modules/Customer/Customer.php

@@ -13 +13 @@
     $this->Dependencies = array('User');
   }
-
+  
   function DoStart()
   {

trunk/Modules/Network/Network.php

@@ -171 +171 @@
         'API' => array('Type' => 'TDeviceAPIType', 'Caption' => 'API', 'Default' => '', 'Null' => true),
       ),
+      'AfterInsert' => array($this, 'AfterInsertNetworkDevice'),
+      'AfterModify' => array($this, 'AfterModifyNetworkDevice'),
+      'AfterDelete' => array($this, 'AfterModifyNetworkDevice'),
     ));
     $this->System->FormManager->RegisterClass('NetworkDeviceType', array(
@@ -201 +204 @@
         'Ports' => array('Type' => 'TDevicePortListInterface', 'Caption' => 'Síťové porty', 'Default' => ''),
       ),
+      'AfterInsert' => array($this, 'AfterInsertNetworkInterface'),
+      'AfterModify' => array($this, 'AfterModifyNetworkInterface'),
+      'AfterDelete' => array($this, 'AfterModifyNetworkInterface'),
     ));
     $this->System->FormManager->RegisterClass('NetworkInterfaceType', array(
@@ -594 +600 @@
     $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('Network',
       array('ModuleNetwork', 'ShowDashboardItem'));
-  }
-
+
+    $this->System->RegisterModel('NetworkDevice', array(
+      'Title' => 'Síťové zařízení',
+    ));
+    $this->System->RegisterModel('NetworkInterface', array(
+      'Title' => 'Síťové rozhraní',
+    ));
+  }
+  
+  function AfterInsertNetworkDevice($Form)
+  {
+    $this->System->Models['NetworkDevice']->DoOnChange();
+  }
+
+  function AfterModifyNetworkDevice($Form, $Id)
+  {
+    $this->System->Models['NetworkDevice']->DoOnChange();
+  }
+  
+  function AfterInsertNetworkInterface($Form)
+  {
+    $this->System->Models['NetworkInterface']->DoOnChange();
+  }
+
+  function AfterModifyNetworkInterface($Form, $Id)
+  {
+    $this->System->Models['NetworkInterface']->DoOnChange();
+  }
+  
   function ShowDashboardItem()
   {

trunk/Modules/NetworkConfig/Generate.php

@@ -13 +13 @@
   if($Service['UNIX_TIMESTAMP(LastTime)'] < (time() - $Service['Period']))
   {
-    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 2));
+    $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Changed' => 2));
     $ExecutionStart = time();
     //echo($Service['Caption'].'...');
@@ -27 +27 @@
     //echo("Done\n");
     $ExecutionTime = time() - $ExecutionStart;
-    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
-    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Log' => implode("\n", $Output)));
+    $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
+    $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Log' => implode("\n", $Output)));
   }
 }

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -51 +51 @@
       ),
     ));
+    $this->System->FormManager->RegisterFormType('TNetworkConfigurationState', array(
+      'Type' => 'Enumeration',
+      'States' => array('Neplánováno', 'V plánu', 'Provádí se'),
+    ));
+    
     $this->System->RegisterCommandLine('config', array($this, 'Config'));
+    $this->System->Models['NetworkDevice']->RegisterOnChange('NetworkConfig', array($this, 'DoNetworkChange'));
+    $this->System->Models['NetworkInterface']->RegisterOnChange('NetworkConfig', array($this, 'DoNetworkChange'));
+  }
+  
+  function DoNetworkChange()
+  {
+    $this->Database->query('UPDATE `NetworkConfiguration` SET `Changed`=1 WHERE '.
+      '(`Id`=1) OR (`Id`=7) OR (`Id`=8) OR (`Id`=9) OR (`Id`=10) OR (`Id`=11) OR (`Id`=12) OR (`Id`=13)');
   }
 

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -20 +20 @@
       $Items = array();
       $Server = 'dhcp'.$Subnet['Id'];
-      $DbResult2 = $this->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` '.
-          ' LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
-          ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
+      $DbResult2 = $this->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
+        'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
+        'WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') '.
+        'AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
       while($Interface = $DbResult2->fetch_assoc())
       {

trunk/Packages/Common/AppModule.php

@@ -69 +69 @@
     $this->License = '';
     $this->Version = '';
-    $this->Creator = '';
     $this->Description = '';
     $this->Dependencies = array();
     $this->Type = ModuleType::Normal;
   }
-
+  
   function Install()
   {

trunk/Packages/Common/Application.php

@@ -1 +1 @@
 <?php
+
+class ModelDef
+{
+  var $OnChange;
+  
+  function __construct()
+  {
+    $this->OnChange = array();
+  }
+  
+  function DoOnChange()
+  {
+    foreach($this->OnChange as $Callback)
+    {
+      call_user_func($Callback);
+    }
+  }
+  
+  function RegisterOnChange($SysName, $Callback)
+  {
+    $this->OnChange[$SysName] = $Callback;
+  }
+  
+  function UnregisterOnChange($SysName)
+  {
+    unset($this->OnChange[$SysName]);
+  }
+}
 
 class Application extends System
@@ -7 +35 @@
   var $ModuleManager;
   var $Modules;
-
+  var $Models;
+  
   function __construct()
   {
@@ -14 +43 @@
     $this->ModuleManager = new AppModuleManager($this);
     $this->Modules = array();
+    $this->Models = array();
+  }
+  
+  function RegisterModel($SysName, $Model)
+  {
+    $NewModelDef = new ModelDef();
+    $NewModelDef->Title = $Model['Title'];
+    $this->Models[$SysName] = $NewModelDef;
   }
 
+  function UnregisterModel($SysName)
+  {
+    unset($this->Models[$SysName]);
+  }
+  
   function Run()
   {