tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-09-26 03:09:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaObject: add merge method, use in Sync

Browse Source
This commit is contained in:
Thomas Gelf 2016-02-25 00:23:27 +01:00
parent f0d02edbe6
commit 1261bd93e1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,7 @@ class Sync
case 'merge': case 'merge':
// TODO: re-evaluate merge settings. vars.x instead of // TODO: re-evaluate merge settings. vars.x instead of
// just "vars" might suffice. // just "vars" might suffice.
$this->objects[$key]->setProperties($object); $this->objects[$key]->merge($object);
break; break;
default: default:

15
library/Director/Objects/IcingaObject.php
View File

@ -1114,6 +1114,21 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
return $this; return $this;
} }
// TODO: with rules? What if I want to override vars? Drop in favour of vars.x?
public function merge(IcingaObject $object)
{
$object = clone($object);
$vars = $object->getVars();
$object->vars = array();
$this->setProperties((array) $object->toPlainObject());
$myVars = $this->vars();
foreach ($vars as $key => $var) {
$myVars->set($key, $var);
}
return $this;
}
public function toPlainObject( public function toPlainObject(
$resolved = false, $resolved = false,
$skipDefaults = false, $skipDefaults = false,