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

Sync: same for objects

This commit is contained in:
Thomas Gelf 2016-02-23 17:47:18 +01:00
parent 4d100a6b65
commit fc45de5f31
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,13 @@ class Sync
*/ */
protected $imported; protected $imported;
/**
* Objects to work with
*
* @var array
*/
protected $objects;
protected $modify = array(); protected $modify = array();
protected $remove = array(); protected $remove = array();
@ -230,7 +237,7 @@ class Sync
$this->sources = array(); $this->sources = array();
foreach ($this->syncProperties as $p) { foreach ($this->syncProperties as $p) {
$id = $p->source_id; $id = $p->source_id;
if (! array_key_exists($id, $sources)) { if (! array_key_exists($id, $this->sources)) {
$this->sources[$id] = ImportSource::load($id, $this->db); $this->sources[$id] = ImportSource::load($id, $this->db);
} }
} }
@ -348,7 +355,7 @@ class Sync
} }
// TODO: This is rubbish, we need to filter at fetch time // TODO: This is rubbish, we need to filter at fetch time
protected function removeForeignListEntries(& $objects) protected function removeForeignListEntries()
{ {
$listId = null; $listId = null;
foreach ($this->syncProperties as $prop) { foreach ($this->syncProperties as $prop) {
@ -364,17 +371,33 @@ class Sync
} }
$no = array(); $no = array();
foreach ($objects as $k => $o) { foreach ($this->objects as $k => $o) {
if ($o->list_id !== $listId) { if ($o->list_id !== $listId) {
$no[] = $k; $no[] = $k;
} }
} }
foreach ($no as $k) { foreach ($no as $k) {
unset($objects[$k]); unset($this->objects[$k]);
} }
} }
protected function loadExistingObjects()
{
// TODO: Make object_type (template, object...) and object_name mandatory?
$this->objects = IcingaObject::loadAllByType(
$this->rule->object_type,
$this->db
);
// TODO: should be obsoleted by a better "loadFiltered" method
if ($this->rule->object_type === 'datalistEntry') {
$this->removeForeignListEntries($this->objects);
}
return $this;
}
protected function prepareNewObjects() protected function prepareNewObjects()
{ {
$newObjects = array(); $newObjects = array();
@ -464,44 +487,37 @@ class Sync
{ {
$rule = $this->rule; $rule = $this->rule;
$this->prepareRelatedImportSources() $this->prepareRelatedImportSources()
->fetchImportedData(); ->fetchImportedData()
->loadExistingObjects();
// TODO: Make object_type (template, object...) and object_name mandatory?
$objects = IcingaObject::loadAllByType($rule->object_type, $this->db);
// TODO: should be obsoleted by a better "loadFiltered" method
if ($rule->object_type === 'datalistEntry') {
$this->removeForeignListEntries($objects);
}
// TODO: directly work on existing objects, remember imported keys, then purge // TODO: directly work on existing objects, remember imported keys, then purge
$newObjects = $this->prepareNewObjects(); $newObjects = $this->prepareNewObjects();
foreach ($newObjects as $key => $object) { foreach ($newObjects as $key => $object) {
if (array_key_exists($key, $objects)) { if (array_key_exists($key, $this->objects)) {
switch ($rule->update_policy) { switch ($rule->update_policy) {
case 'override': case 'override':
$objects[$key]->replaceWith($object); $this->objects[$key]->replaceWith($object);
break; break;
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.
$objects[$key]->setProperties($object); $this->objects[$key]->setProperties($object);
break; break;
default: default:
// policy 'ignore', no action // policy 'ignore', no action
} }
} else { } else {
$objects[$key] = $object; $this->objects[$key] = $object;
} }
} }
$objectKey = $rule->object_type === 'datalistEntry' ? 'entry_name' : 'object_name'; $objectKey = $rule->object_type === 'datalistEntry' ? 'entry_name' : 'object_name';
$noAction = array(); $noAction = array();
foreach ($objects as $key => $object) { foreach ($this->objects as $key => $object) {
if (array_key_exists($key, $newObjects)) { if (array_key_exists($key, $newObjects)) {
// Stats? // Stats?
@ -517,10 +533,10 @@ class Sync
} }
foreach ($noAction as $key) { foreach ($noAction as $key) {
unset($objects[$key]); unset($this->objects[$key]);
} }
return $objects; return $this->objects;
} }
/** /**