tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/sync-cleanup'

This commit is contained in:
Thomas Gelf 2018-05-25 19:51:26 +02:00
parent c3fd50003a 47fcd13075
commit f88e318dce
2 changed files with 99 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Director/Import/Sync.php
View File

@ -509,6 +509,10 @@ class Sync
} else { } else {
$object->vars()->$varName = $val; $object->vars()->$varName = $val;
} }
} else {
if ($val !== null) {
$object->set($prop, $val);
}
} }
} else { } else {
if ($val !== null) { if ($val !== null) {

95
test/php/library/Director/Import/HostSyncTest.php
View File

@ -2,6 +2,7 @@
namespace Tests\Icinga\Module\Director\IcingaConfig; namespace Tests\Icinga\Module\Director\IcingaConfig;
use Icinga\Module\Director\Objects\IcingaHostGroup;
use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Module\Director\Test\SyncTest; use Icinga\Module\Director\Test\SyncTest;
@ -55,6 +56,62 @@ class HostSyncTest extends SyncTest
$this->assertFalse($this->sync->hasModifications(), 'Should not have modifications pending'); $this->assertFalse($this->sync->hasModifications(), 'Should not have modifications pending');
} }
public function testSyncMultipleGroups()
{
$this->requireGroups(['SYNCTEST_groupa', 'SYNCTEST_groupb']);
$this->runImport([[
'host' => 'SYNCTEST_groups1',
'g1' => 'SYNCTEST_groupa',
'g2' => 'SYNCTEST_groupb'
], [
'host' => 'SYNCTEST_groups2',
'g1' => null,
'g2' => 'SYNCTEST_groupb'
]]);
$this->setUpProperty(array(
'source_expression' => '${host}',
'destination_field' => 'object_name',
'priority' => 10,
));
$this->setUpProperty(array(
'source_expression' => '${g1}',
'destination_field' => 'groups',
'priority' => 12,
));
$this->setUpProperty(array(
'source_expression' => '${g2}',
'destination_field' => 'groups',
'priority' => 11,
));
$this->assertTrue($this->sync->hasModifications(), 'Should have modifications pending');
$modifications = array();
/** @var IcingaObject $mod */
foreach ($this->sync->getExpectedModifications() as $mod) {
$name = $mod->object_name;
$modifications[$name] = $mod;
switch ($name) {
case 'SYNCTEST_groups1':
$this->assertEquals([
'SYNCTEST_groupa',
'SYNCTEST_groupb',
], $mod->get('groups'));
break;
case 'SYNCTEST_groups2':
$this->assertEquals([
'SYNCTEST_groupb',
], $mod->get('groups'));
break;
}
}
$this->assertGreaterThan(0, $this->sync->apply(), 'Should successfully apply at least 1 update');
$this->assertFalse($this->sync->hasModifications(), 'Should not have modifications pending after sync');
}
public function testSyncFilteredData() public function testSyncFilteredData()
{ {
$this->runImport(array( $this->runImport(array(
@ -152,4 +209,42 @@ class HostSyncTest extends SyncTest
'SYNCTEST_filtered_in_unusedfield_propfilter should be modified' 'SYNCTEST_filtered_in_unusedfield_propfilter should be modified'
); );
} }
/**
* @param $names
* @throws \Icinga\Exception\ConfigurationError
* @throws \Icinga\Exception\IcingaException
*/
protected function requireGroups($names)
{
foreach ($names as $name) {
if (! IcingaHostGroup::exists($name, $this->getDb())) {
IcingaHostGroup::create([
'object_name' => $name,
'object_type' => 'object',
], $this->getDb())->store();
}
}
}
/**
* @param $names
* @throws \Icinga\Exception\ConfigurationError
* @throws \Icinga\Exception\IcingaException
* @throws \Icinga\Exception\NotFoundError
*/
protected function removeGroups($names)
{
foreach ($names as $name) {
if (IcingaHostGroup::exists($name, $this->getDb())) {
IcingaHostGroup::load($name, $this->getDb())->delete();
}
}
}
public function tearDown()
{
$this->removeGroups(['SYNCTEST_groupa', 'SYNCTEST_groupb']);
parent::tearDown();
}
} }