OsmoPcuSysmo: Integrate  with Sysmobts and OsmoSgsn

Change-Id: I01485c5d74e5fe62d0ffea9eb1fad29041426eef
diff --git a/selftest/template_test.ok b/selftest/template_test.ok
index dcfacc2..bae21d2 100644
--- a/selftest/template_test.ok
+++ b/selftest/template_test.ok
@@ -50,7 +50,34 @@
   rach max transmission 7
   ip.access unit_id val_bts.unit_id_bts0 0
   oml ip.access stream_id val_bts.stream_id_bts0 line 0
-  gprs mode none
+  gprs mode gprs
+  gprs routing area 0
+  gprs network-control-order nc1
+  gprs cell bvci 1800
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 1800
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 1800
+  gprs nsvc 0 local udp port 23020
+  gprs nsvc 0 remote udp port 23000
+  gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts0
+  no force-combined-si
   trx 0
    rf_locked 0
    arfcn val_trx_arfcn_trx0
@@ -94,7 +121,34 @@
   rach max transmission 7
   ip.access unit_id val_bts.unit_id_bts1 0
   oml ip.access stream_id val_bts.stream_id_bts1 line 0
-  gprs mode none
+  gprs mode gprs
+  gprs routing area 0
+  gprs network-control-order nc1
+  gprs cell bvci 1800
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 1800
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 1800
+  gprs nsvc 0 local udp port 23020
+  gprs nsvc 0 remote udp port 23000
+  gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts1
+  no force-combined-si
   trx 0
    rf_locked 0
    arfcn val_trx_arfcn_trx0