[icinga-checkins] icinga.org: icingaweb2-module-director/master: Handle expressions only for apply objects

git at icinga.org git at icinga.org
Tue Oct 25 04:39:55 CEST 2016


Module: icingaweb2-module-director
Branch: master
Commit: ddcfb09f584c2f9ea613515291ed25d3b7635a7f
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=ddcfb09f584c2f9ea613515291ed25d3b7635a7f

Author: Corentin Ardeois <cardeois at internap.com>
Date:   Thu Sep  1 17:25:38 2016 -0400

Handle expressions only for apply objects

Expressions will be handled only if the object is an ApplyRule.
Only properties and custom variables are replaced.

refs #11976

---

 library/Director/CustomVariable/CustomVariable.php |    6 +--
 .../CustomVariable/CustomVariableString.php        |    4 +-
 .../Director/CustomVariable/CustomVariables.php    |    8 +--
 library/Director/Db/Cache/PrefetchCache.php        |    6 +--
 .../Director/IcingaConfig/IcingaConfigHelper.php   |   20 +++++--
 library/Director/Objects/IcingaObject.php          |   11 ++--
 .../CustomVariable/CustomVariablesTest.php         |   15 ++++++
 .../IcingaConfig/IcingaConfigHelperTest.php        |   13 +++--
 .../library/Director/Objects/IcingaServiceTest.php |   56 ++++++++++++++++++--
 .../library/Director/Objects/rendered/service3.out |   16 ++++++
 .../library/Director/Objects/rendered/service4.out |   12 +++++
 11 files changed, 136 insertions(+), 31 deletions(-)

Diff:   https://git.icinga.org/?p=icingaweb2-module-director.git;a=commitdiff;h=ddcfb09f584c2f9ea613515291ed25d3b7635a7f


More information about the icinga-checkins mailing list