From 5616d61c32c308fc96d7b9c84844cccd62175447 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Tue, 17 Apr 2018 11:28:48 +0200 Subject: [PATCH] TT#26264 Test disabled service by goss/system-tests The old code didn't check the services if they were disabled in YML, so far the service could be up and running without notice. Which is wrong. We should test such situation. Also move ngcpcfg-api to PRO only section as it should be not available on CE. Change-Id: Ie4dc71e238fb6c73e26310b4ea215cf4fd3cfb1f --- templates/510_init-daemons-ngcp.yaml.tt2 | 121 ++++++------------- templates/511_init-daemons-ngcp-pro.yaml.tt2 | 4 +- 2 files changed, 39 insertions(+), 86 deletions(-) diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index 5a3d407..203227e 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -40,144 +40,99 @@ [% END -%] service: -[% IF asterisk.enable == "yes" -%] - asterisk.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF intercept.enable == "yes" -%] + enabled: [% general.process_handler == 'none' && asterisk.enable == "yes" ? 'true' : 'false' %] + running: [% is_proxy && node_state == 'active' && asterisk.enable == "yes" ? 'true' : 'false' %] captagent.service: enabled: false - running: [% is_proxy || is_rtp ? 'true' : 'false' %] -[% END -%] -[% IF turnserver.enable == 'yes' -%] + running: [% ( is_proxy || is_rtp ) && intercept.enable == "yes" ? 'true' : 'false' %] coturn.service: enabled: false - running: [% is_rtp ? 'true' : 'false' %] -[% END -%] -[% IF bootenv.dhcp.enable == 'yes' -%] + running: [% is_rtp && turnserver.enable == 'yes' ? 'true' : 'false' %] dnsmasq.service: enabled: false - running: [% is_mgmt ? 'true' : 'false' %] -[% END -%] -[% IF haproxy.enable == "yes" -%] + running: [% is_mgmt && bootenv.dhcp.enable == 'yes' ? 'true' : 'false' %] haproxy.service: enabled: false - running: [% is_lb ? 'true' : 'false' %] -[% END -%] -[% IF heartbeat.hb_watchdog.enable == 'yes' -%] + running: [% is_lb && haproxy.enable == "yes" ? 'true' : 'false' %] hb_watchdog.service: - enabled: true - running: true -[% END -%] -[% IF kamailio.lb.start == "yes" -%] + enabled: [% heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %] + running: [% heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %] kamailio-lb.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_lb && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF kamailio.proxy.start == "yes" -%] + enabled: [% general.process_handler == 'none' && kamailio.lb.start == "yes" ? 'true' : 'false' %] + running: [% is_lb && node_state == 'active' && kamailio.lb.start == "yes" ? 'true' : 'false' %] kamailio-proxy.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF mediator.enable == 'yes' -%] + enabled: [% general.process_handler == 'none' && kamailio.proxy.start == "yes" ? 'true' : 'false' %] + running: [% is_proxy && node_state == 'active' && kamailio.proxy.start == "yes" ? 'true' : 'false' %] mediator.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF www_admin.enable == 'yes' -%] + enabled: [% general.process_handler == 'none' && mediator.enable == 'yes' ? 'true' : 'false' %] + running: [% is_proxy && node_state == 'active' && mediator.enable == 'yes' ? 'true' : 'false' %] ngcp-panel.service: - enabled: [% is_mgmt ? 'true' : 'false' %] - running: [% is_mgmt ? 'true' : 'false' %] -[% END -%] -[% IF rateomat.enable == "yes" -%] + enabled: [% is_mgmt && www_admin.enable == 'yes' ? 'true' : 'false' %] + running: [% is_mgmt && www_admin.enable == 'yes' ? 'true' : 'false' %] ngcp-rate-o-mat.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF rtpproxy.recording.enable == "yes" -%] + enabled: [% general.process_handler == 'none' && rateomat.enable == "yes" ? 'true' : 'false' %] + running: [% is_proxy && node_state == 'active' && rateomat.enable == "yes" ? 'true' : 'false' %] ngcp-rtpengine-recording-daemon.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_rtp && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF rtpproxy.enable == "yes" -%] + enabled: [% general.process_handler == 'none' && rtpproxy.recording.enable == "yes" ? 'true' : 'false' %] + running: [% is_rtp && node_state == 'active' && rtpproxy.recording.enable == "yes" ? 'true' : 'false' %] ngcp-rtpengine-daemon.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_rtp && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF sems.enable == "yes" -%] + enabled: [% general.process_handler == 'none' && rtpproxy.enable == "yes" ? 'true' : 'false' %] + running: [% is_rtp && node_state == 'active' && rtpproxy.enable == "yes" ? 'true' : 'false' %] ngcp-sems.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] + enabled: [% general.process_handler == 'none' && sems.enable == "yes" ? 'true' : 'false' %] + running: [% is_proxy && node_state == 'active' && sems.enable == "yes" ? 'true' : 'false' %] ngcp-witnessd.service: enabled: true running: true -[% IF nginx.enable == 'yes' -%] nginx.service: - enabled: true - running: [% (is_mgmt || is_li_enabled) ? 'true' : 'false' %] -[% END -%] -[% IF prosody.enable == 'yes' -%] + enabled: [% nginx.enable == 'yes' ? 'true' : 'false' %] + running: [% (is_mgmt || is_li_enabled) && nginx.enable == 'yes' ? 'true' : 'false' %] prosody.service: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF pushd.enable == "yes" -%] + enabled: [% general.process_handler == 'none' && prosody.enable == 'yes' ? 'true' : 'false' %] + running: [% is_proxy && node_state == 'active' && prosody.enable == 'yes' ? 'true' : 'false' %] ngcp-pushd.service: - enabled: true - running: [% is_lb ? 'true' : 'false' %] -[% END -%] -[% IF redis.enable == "yes" -%] + enabled: [% pushd.enable == "yes" ? 'true' : 'false' %] + running: [% is_lb && pushd.enable == "yes" ? 'true' : 'false' %] redis-server.service: - enabled: true - running: [% (is_rtp || is_proxy || is_db) ? 'true' : 'false' %] -[% END -%] -[% IF ldap.enable == "yes" -%] + enabled: [% redis.enable == "yes" ? 'true' : 'false' %] + running: [% (is_rtp || is_proxy || is_db) && redis.enable == "yes" ? 'true' : 'false' %] slapd.service: enabled: false - running: [% is_mgmt ? 'true' : 'false' %] -[% END -%] -[% IF pbx.enable == "yes" -%] + running: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %] sems-pbx.service: enabled: false - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF voisniff.daemon.start == 'yes' -%] + running: [% is_proxy && node_state == 'active' && pbx.enable == "yes" ? 'true' : 'false' %] voisniff-ng.service: enabled: false - running: [% (is_proxy || is_lb || is_rtp) && node_state == 'active' ? 'true' : 'false' %] -[% END -%] -[% IF is_mgmt && general.ngcp_type == 'carrier' -%] + running: [% (is_proxy || is_lb || is_rtp) && node_state == 'active' && voisniff.daemon.start == 'yes' ? 'true' : 'false' %] ngcpcfg-api.service: - enabled: false - running: true -[% END -%] -[% IF general.license_key != '' -%] + enabled: [% is_mgmt && general.ngcp_type != 'spce' ? 'true' : 'false' %] + running: [% is_mgmt && general.ngcp_type != 'spce' ? 'true' : 'false' %] +[% IF general.license_key != '' -%] ngcp-license-client.service: enabled: true running: true diff --git a/templates/511_init-daemons-ngcp-pro.yaml.tt2 b/templates/511_init-daemons-ngcp-pro.yaml.tt2 index cb25c8b..d5a7d40 100644 --- a/templates/511_init-daemons-ngcp-pro.yaml.tt2 +++ b/templates/511_init-daemons-ngcp-pro.yaml.tt2 @@ -31,11 +31,9 @@ service: ngcp-snmp-agent.service: enabled: true running: true -[% IF faxserver.enable == "yes" -%] # XXX: This should be moved to the non-pro file, but the faxserver.enable # is incorrectly enabled on spce. ngcp-faxserver.service: enabled: false - running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] -[% END -%] + running: [% is_proxy && node_state == 'active' && faxserver.enable == "yes" ? 'true' : 'false' %]