From 30a371d76cfc19eebd3ecc01ee221f59ecc0e394 Mon Sep 17 00:00:00 2001
From: Donat Zenichev <dzenichev@sipwise.com>
Date: Mon, 2 May 2022 18:15:34 +0200
Subject: [PATCH] TT#169602 Adopt tests due to config.yml (sems/b2b) options
 merge

From now on the 'sems' config.yml section is deprecated,
and we have to only use 'b2b'. This commit concerns it.

Change-Id: I8e1a4c480011404a005ea52d66a7f770f97123bf
---
 templates/410_process-ngcp.yaml.tt2       |  4 +--
 templates/510_init-daemons-ngcp.yaml.tt2  |  6 ++---
 templates/821_network-ports-ngcp.yaml.tt2 | 32 ++++++-----------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/templates/410_process-ngcp.yaml.tt2 b/templates/410_process-ngcp.yaml.tt2
index eb61bde..678bd93 100644
--- a/templates/410_process-ngcp.yaml.tt2
+++ b/templates/410_process-ngcp.yaml.tt2
@@ -97,10 +97,10 @@ process:
     running: {{if and [% is_proxy ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
 
   sems-b2b:
-    running: {{if and [% is_proxy && b2b.enable == "yes"? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
+    running: {{if and [% is_proxy && b2b.enable == "yes" && general.ngcp_type != 'spce' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
 
   ngcp-sems:
-    running: {{if and [% is_proxy && sems.enable == "yes"? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
+    running: [% general.ngcp_type == 'spce' ? 'true' : 'false' %]
 
   ngcp-witnessd:
     running: true
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 758a6e1..53a58f3 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -68,8 +68,8 @@ service:
     running: {{if and [% is_rtp && rtpproxy.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
 
   ngcp-sems.service:
-    enabled: [% general.process_handler == 'none' && sems.enable == "yes" ? 'true' : 'false' %]
-    running: {{if and [% is_proxy && sems.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
+    enabled: [% general.process_handler == 'none' && b2b.enable == "yes" && general.ngcp_type == 'spce' ? 'true' : 'false' %]
+    running: [% general.ngcp_type == 'spce' ? 'true' : 'false' %]
 
   ngcp-witnessd.service:
     enabled: true
@@ -101,7 +101,7 @@ service:
 
   ngcp-sems-b2b.service:
     enabled: false
-    running: {{if and [% is_proxy && b2b.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
+    running: {{if and [% is_proxy && b2b.enable == "yes" && general.ngcp_type != 'spce' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
 
   ngcp-voisniff.service:
     enabled: false
diff --git a/templates/821_network-ports-ngcp.yaml.tt2 b/templates/821_network-ports-ngcp.yaml.tt2
index 27f0580..2078f08 100644
--- a/templates/821_network-ports-ngcp.yaml.tt2
+++ b/templates/821_network-ports-ngcp.yaml.tt2
@@ -159,41 +159,25 @@ port:
   tcp:5582:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
-[%  IF sems.enable == "yes" -%]
-  # SEMS
-  tcp:[% sems.xmlrpcport %]:
-    listening: {{.Vars.NODE_ACTIVE}}
-    ip: ["[% sip_int_ips.0 %]"]
-
-  # SEMS
-  udp:5040:
-    listening: {{.Vars.NODE_ACTIVE}}
-    ip: ["[% sip_int_ips.0 %]"]
-
-  # SEMS
-  udp:[% sems.bindport %]:
-    listening: {{.Vars.NODE_ACTIVE}}
-    ip: ["[% sip_int_ips.0 %]"]
 
-[%  END -%]
 [%  IF b2b.enable == "yes" -%]
-  # sems-b2b
-  tcp:[% b2b.bindport %]:
+  # SEMS: XMLRPC server of B2B
+  tcp:[% b2b.xmlrpcport %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
 
-  # sems-b2b
-  tcp:[% b2b.xmlrpcport %]:
+  # SEMS: B2B server UDP listener
+  udp:[% b2b.bindport %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
 
-  # sems-b2b
-  udp:5048:
+  # SEMS: B2B server TCP listener
+  tcp:[% b2b.bindport %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
 
-  # sems-b2b
-  udp:[% b2b.bindport %]:
+  # SEMS: Monit UDP port
+  udp:[% general.ngcp_type == 'spce' ? '5040' : '5048' %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]