[MERGED] osmo-ttcn3-hacks[master]: gprs_gb: Update config files

2018-03-03 Thread Harald Welte
Harald Welte has submitted this change and it was merged.

Change subject: gprs_gb: Update config files
..


gprs_gb: Update config files

Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46
---
M gprs_gb/Test.cfg
1 file changed, 24 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/gprs_gb/Test.cfg b/gprs_gb/Test.cfg
index 2f11dfb..2c2ffb8 100644
--- a/gprs_gb/Test.cfg
+++ b/gprs_gb/Test.cfg
@@ -1,5 +1,8 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+
 [LOGGING]
-SourceInfoFormat := Single;
 #*.FileMask := LOG_ALL
 ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC
 
@@ -8,8 +11,26 @@
 #mp_local_udp_port := 23000
 #mp_remote_ip := "192.168.100.196"
 #mp_remote_udp_port := 21000
-mp_nsei := 96
-mp_bvci := 196
+NS_Emulation.mp_local_ip := "127.0.0.1"
+NS_Emulation.mp_local_udp_port := 23000
+NS_Emulation.mp_remote_ip := "127.0.0.1"
+NS_Emulation.mp_remote_udp_port := 23001
+NS_Emulation.mp_nsei := 1234
+NS_Emulation.mp_nsvci := 1234
+Test.mp_gb_cfg := {
+   nsei := 1234,
+   bvci := 1234,
+   cell_id := {
+   ra_id := {
+   lai := {
+   mcc_mnc := '00101F'H, lac := 1
+   },
+   rac := 0
+   },
+   cell_id := 0
+   },
+   sgsn_role := true
+}
 
 [TESTPORT_PARAMETERS]
 #*.BSCVTY.CTRL_MODE := "client"

-- 
To view, visit https://gerrit.osmocom.org/7068
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder


osmo-ttcn3-hacks[master]: gprs_gb: Update config files

2018-03-03 Thread Harald Welte

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7068
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No


[PATCH] osmo-ttcn3-hacks[master]: gprs_gb: Update config files

2018-03-03 Thread Harald Welte

Review at  https://gerrit.osmocom.org/7068

gprs_gb: Update config files

Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46
---
M gprs_gb/Test.cfg
1 file changed, 24 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/68/7068/1

diff --git a/gprs_gb/Test.cfg b/gprs_gb/Test.cfg
index 2f11dfb..2c2ffb8 100644
--- a/gprs_gb/Test.cfg
+++ b/gprs_gb/Test.cfg
@@ -1,5 +1,8 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+
 [LOGGING]
-SourceInfoFormat := Single;
 #*.FileMask := LOG_ALL
 ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC
 
@@ -8,8 +11,26 @@
 #mp_local_udp_port := 23000
 #mp_remote_ip := "192.168.100.196"
 #mp_remote_udp_port := 21000
-mp_nsei := 96
-mp_bvci := 196
+NS_Emulation.mp_local_ip := "127.0.0.1"
+NS_Emulation.mp_local_udp_port := 23000
+NS_Emulation.mp_remote_ip := "127.0.0.1"
+NS_Emulation.mp_remote_udp_port := 23001
+NS_Emulation.mp_nsei := 1234
+NS_Emulation.mp_nsvci := 1234
+Test.mp_gb_cfg := {
+   nsei := 1234,
+   bvci := 1234,
+   cell_id := {
+   ra_id := {
+   lai := {
+   mcc_mnc := '00101F'H, lac := 1
+   },
+   rac := 0
+   },
+   cell_id := 0
+   },
+   sgsn_role := true
+}
 
 [TESTPORT_PARAMETERS]
 #*.BSCVTY.CTRL_MODE := "client"

-- 
To view, visit https://gerrit.osmocom.org/7068
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte