TT#63466 TT#26264 Fix janus.service check test on PRO

Update condition when is should be running accordingly to
the current login in ngcp-service template:
>> /etc/ngcp-config/templates/etc/ngcp-service/nsservices.yml.tt2
> ...
> enable: [% (janus.enable == 'yes' || (rtcengine.conference.enable == 'yes' && rtcengine.conference.type == 'janus')) ? 'yes' : 'no' %]

Otherwise PRO system upgraded from mr6.5 to mr7.5 doesn't pass testing:

> Service: janus.service: running: doesn't match, expect: [false] found: [true]
> Process: janus: running: doesn't match, expect: [false] found: [true]

> root@sp1:~# ngcpcfg values janus.enable
> no
> root@sp1:~# ngcpcfg values rtcengine.conference.enable
> yes
> root@sp1:~# ngcpcfg values rtcengine.conference.type
> janus
> root@sp1:~#

So, test should be corrected here.

Change-Id: If087da14763f2016a18c5e00cf81582f93d4e1a6
(cherry picked from commit f4385e9a3c)
changes/78/32478/2
Alexander Lutay 7 years ago
parent 9401bc6013
commit 00f0887e29

@ -46,7 +46,7 @@ process:
running: true
janus:
running: [% janus.enable == "yes" && node_state == 'active' ? 'true' : 'false' %]
running: [% (node_state == 'active' && (janus.enable == 'yes' || (rtcengine.conference.enable == 'yes' && rtcengine.conference.type == 'janus'))) ? 'true' : 'false' %]
command:
"pgrep -c -n -f '[r]tcengine.js'":

@ -141,7 +141,7 @@ service:
janus.service:
enabled: false
running: [% node_state == 'active' && janus.enable == "yes" && general.ngcp_type != 'spce' ? 'true' : 'false' %]
running: [% (node_state == 'active' && general.ngcp_type != 'spce' && (janus.enable == 'yes' || (rtcengine.conference.enable == 'yes' && rtcengine.conference.type == 'janus'))) ? 'true' : 'false' %]
monit.service:
enabled: [% general.process_handler == 'monit' ? 'true' : 'false' %]

Loading…
Cancel
Save