Commit Graph

95 Commits

Author SHA1 Message Date
Thomas Gelf 2ad1c5a183 TemplateTreeTest: intensive tests for new resolver 2017-07-14 13:21:42 +02:00
Thomas Gelf f91dd5fa0e PropertyModifierCombine: implementation, tests...
...and related changes with some documentation

fixes #922
2017-05-03 10:39:49 +02:00
Thomas Gelf c284dfef88 PropertyModifierArrayFilter: new modifier
fixes #908
2017-04-20 12:33:54 +02:00
Thomas Gelf da41e2f4db AssignRenderer: improve/separate in-related code
fixes #844
2017-03-13 22:25:04 +01:00
Thomas Gelf 158ce18302 SyncUtilsTest: use nicer test name
refs #839
2017-03-09 11:03:59 +01:00
Thomas Gelf 1b57171583 SyncUtils: allow special varnames, add tests
fixes #839
2017-03-09 10:57:37 +01:00
Thomas Gelf a48e0c6dda AssignRenderer: test and fix contains rendering
fixes #803
2017-03-06 11:10:24 +01:00
Thomas Gelf bff76dad8e HostApplyMatches: fix matching for "contains"
fixes  #803
2017-03-03 09:41:25 +01:00
Thomas Gelf 5842e40fb6 AssignRenderer: do not re-use json-encoded value
...as encoding in Icinga 2 differs

fixes #558
2017-03-03 09:24:15 +01:00
Thomas Gelf a99252ee5e HostApplyMatchesTest: new tests 2017-03-03 09:07:43 +01:00
Thomas Gelf f2bbd2d5d7 test: add compatibility layer for phpunit 2017-02-08 16:42:00 +01:00
Thomas Gelf b7a10d296c phpcs: mostly new PSR-2 SpacingAfter/Before checks 2017-01-13 20:54:52 +01:00
Thomas Gelf 8cc99f76d0 tests: simplify bootstrap, enforce PSR-2 2017-01-13 20:10:35 +01:00
Thomas Gelf 9e771f2d5a Fix phpcs complaints 2017-01-13 19:47:54 +01:00
Thomas Gelf 012b302386 IcingaTemplateResolverTest: fix tests 2017-01-02 12:21:29 +01:00
Thomas Gelf a9874879dd TemplateResolver: add new methods for stricter...
...path resolution. Also ships related tests

refs #13839
2016-12-30 10:15:25 +01:00
Thomas Gelf df71b40548 test/bootstrap: no more symlinking...
...as we can load the module anyways

fixes #13589
2016-12-14 21:43:38 +01:00
Thomas Gelf b9e05be111 IcingaServiceSetTest: add aliases the ZF way...
...and use the correct db adapter, fixes broken tests
2016-11-30 09:19:30 +01:00
Thomas Gelf 1e9e15278a Merge branch 'bugfix/service-set-contraints-13309' 2016-11-30 08:16:47 +01:00
Markus Frosch 9fb94e82c0 Add travis.yml 2016-11-29 10:20:35 +01:00
Markus Frosch 84f39a60ac IcingaServiceSetTest: Add test case
refs #13309
2016-11-28 15:32:41 +01:00
Thomas Gelf d5131f7fac Arguments: always render += instead of =
This allows to extend existing arguments

fixes #12941
2016-11-15 17:57:02 +01:00
Thomas Gelf fee8e7847d IcingaHostTest: fix erroneous test
Code behaves correct now, the test wasn't up to date. However, it wasn't
failing as the object has been changed at runtime while the (at that time
already filled) internal lookup cache wasn't cleared. Woulnd't have had any
effect on real-world environments. However, it's fixed right now.
2016-11-14 13:39:20 +01:00
Markus Frosch 738f6a5c9f Update gitignores 2016-11-07 14:06:43 +01:00
Markus Frosch 10ee7901c8 Add composer support for testing 2016-11-03 10:19:25 +01:00
Thomas Gelf 7e2f8c9430 test/bootstrap: allow fallback to configdir 2016-11-03 03:06:06 +01:00
Thomas Gelf a52e52b517 IcingaHostTest: temporarily skip broken test 2016-11-03 02:54:59 +01:00
Thomas Gelf b996a684be tests: refactor bootstrapping, initial Gitlab-CI..
...support. Currently expects three test-runners offering Debian Jessie,
Ubuntu 16.04 LTS (Xenial) and CentOS 7. Removed all dependencies on the
Icinga Web 2 test module, installing phpunit should suffice to run tests
in a normal environment.

This is a first attempt to make things easier, more to come.
2016-11-03 02:50:39 +01:00
Thomas Gelf 6c23a02252 Test: add test suite prototype and command
refs #12905
2016-11-02 19:30:11 +01:00
Thomas Gelf ad7c5bc997 IcingaHost: fix tests 2016-10-25 00:30:12 +00:00
Thomas Gelf 0d86c24cd8 Huge change, getting rid of legacy assignment...
...code. All objects should work with the new code base right now
2016-10-24 03:41:37 +00:00
Thomas Gelf 9ba6116091 IcingaService: support and test speciall object...
...name variants with apply for
2016-10-22 06:54:53 +00:00
Thomas Gelf 4c9de0fa34 IcingaServiceTest: no need to store when setting...
...a connection
2016-10-22 06:37:22 +00:00
Thomas Gelf 5d693debeb IcingaServiceTest: re-add tests lost on rebase 2016-10-22 06:23:59 +00:00
Corentin Ardeois 3e30d34098 Use `config` variable in apply for rules
* use `config` instead of `value` in apply for rules
* update documentation

refs #11976
2016-10-22 06:07:57 +00:00
Corentin Ardeois e7bd4343b5 Add support for Apply for rules in services
Apply for rules are defined through `apply_for` property
Only Array custom variables will be eligible in apply_for dropdown.

API Example:
```bash
 ./director-curl POST director/service?name=my_service '{"apply_for": "for (checked_tcp_port in host.vars.checked_tcp_ports)" }'
 ```

 Will render as:
 ```
  apply Service "my_service" for (checked_tcp_port in host.vars.checked_tcp_ports) {
      ...
  }
  ```
Feature: https://dev.icinga.org/issues/11976

Depends-On: https://github.com/Icinga/icingaweb2-module-director/pull/20
refs #11976
2016-10-22 06:00:54 +00:00
Thomas Gelf b7eaab715b Make explicit calls to renderStringWithVariables 2016-10-22 05:48:09 +00:00
Corentin Ardeois 37c91050c7 Expressions syntax is now $var$
Instead of $$var$$.
We make sure $$var$$ is left untouched.

refs #11976
2016-10-22 00:15:09 +00:00
Corentin Ardeois ddcfb09f58 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
2016-10-22 00:15:09 +00:00
Corentin Ardeois bcef87f4c9 Add support for expressions
Any rendered string can contain variables encapsulated with "$$" characters.

Example:
Display Name declared with `Port $$host.vars.tcp_port$$ check` will
be processed as `"Port " + host.vars.tcp_port + " check"`

API:
```bash
 ./director-curl POST director/service?name=my_service '{"display_name": "Port $$host.vars.tcp_port$$ check" }'
 ```

 Rendered config:
 ```
  apply Service "my_service" {
      import "my_template"

      display_name = "Port " + host.vars.tcp_port + " check"
  }
 ```

refs #11976
2016-10-22 00:15:09 +00:00
Thomas Gelf c4da25ef25 IcingaCommandArgument: render set_if without format
Icinga DSL support was introduced in 348cb1aa6 and works fine, but breaks
rendering of legacy arguments with set_if_format = NULL. This should default
to 'string', as we should IMO not force NOT NULL in the DB in this case.

refs #12153
fixes #12886
2016-10-11 09:45:11 +00:00
Thomas Gelf 89f86abdda IcingaHostTest: remove obsolete workaround 2016-10-09 13:15:51 +00:00
Thomas Gelf d915bb25f7 CustomVariablesTest: testVarsCanBeUnsetAndSetAgain 2016-09-08 23:13:48 +00:00
Thomas Gelf 8390457939 test/Objects: check for new constant imports 2016-09-08 22:41:58 +00:00
Thomas Gelf 2c6afcbd66 IcingaTimePeriodTest: adjust to recent changes 2016-09-08 15:25:36 +00:00
Thomas Gelf 8a3956b6a2 IcingaServiceTest: delete after storing them 2016-09-08 13:52:07 +00:00
Thomas Gelf 999019ba16 IcingaService: make sure to have a db connection
...when rendering, as we require settings
2016-09-08 13:30:37 +00:00
Thomas Gelf 4f4b6eb63a IcingaService: allow host vars to override vars...
...for applied services

refs #12546
2016-09-08 10:45:02 +00:00
Thomas Gelf 4cd399e059 IcingaConfigHelper: use string-based sort for...
...dictionary fields to make PHP 5.x and PHP 7.x produce the same output.

refs #12591
2016-09-07 20:44:03 +00:00
Thomas Gelf 6427b22621 IcingaConfigHelper: fix numeric dictionary key...
...rendering and add related tests

fixes #12591
2016-08-30 12:15:48 +00:00