laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/21111 )
Change subject: NS_Configuration: Adjust config regarding support for NS-VCG
......................................................................
NS_Configuration: Adjust config regarding support for NS-VCG
In osmo-ttcn3-hacks.git Change-Id If1220852785853f8a5d8de183d5053ddd6ccb958
we introduce support for multiple NS-VC inside a NS-VCG. This modifies
the configuration structures, and we need to adjust all config files
accordingly.
Change-Id: I6ac250555c3ac2aa8feb70bd3a052aafec5d4210
---
M ttcn3-gbproxy-test/GBProxy_Tests.cfg
M ttcn3-pcu-test/PCU_Tests.cfg
M ttcn3-pcu-test/sns/PCU_Tests.cfg
M ttcn3-sgsn-test/SGSN_Tests.cfg
4 files changed, 100 insertions(+), 66 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/11/21111/1
diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index 7f6c303..6b097a3 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -14,44 +14,58 @@
[MODULE_PARAMETERS]
GBProxy_Tests.mp_nsconfig_sgsn := {
{
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.24.103",
- local_udp_port := 23000,
- remote_ip := "172.18.24.10"
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.24.103",
+ local_udp_port := 23000,
+ remote_ip := "172.18.24.10"
+ }
+ }
}
}
}
}
GBProxy_Tests.mp_nsconfig_pcu := {
- {
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10"
- }
- }
- },
- {
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10"
- }
- }
- },
- {
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10"
+ {
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.24.103",
+ remote_ip := "172.18.24.10"
+ }
}
}
}
+ }, {
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.24.103",
+ remote_ip := "172.18.24.10"
+ }
+ }
+ }
+ }
+ }, {
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.24.103",
+ remote_ip := "172.18.24.10"
+ }
+ }
+ }
+ }
+ }
}
[MAIN_CONTROLLER]
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 4bf2906..9e69f86 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -15,18 +15,22 @@
PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10"
SGSN_Components.mp_nsconfig := {
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.13.10",
- local_udp_port := 23000,
- remote_ip := "172.18.13.101",
- remote_udp_port := 23000
- }
- },
- nsvci := 1234,
nsei := 1234,
- handle_sns := false
+ handle_sns := false,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.13.10",
+ local_udp_port := 23000,
+ remote_ip := "172.18.13.101",
+ remote_udp_port := 23000
+ }
+ },
+ nsvci := 1234
+ }
+ }
}
Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";
StatsD_Checker.mp_enable_stats := true;
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
index 45b3fc7..9cd4b38 100644
--- a/ttcn3-pcu-test/sns/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -9,17 +9,21 @@
[MODULE_PARAMETERS]
PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
SGSN_Components.mp_nsconfig := {
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.14.10",
- local_udp_port := 23000,
- remote_ip := "172.18.14.101",
- remote_udp_port := 23000
+ nsei := 1234,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.14.10",
+ local_udp_port := 23000,
+ remote_ip := "172.18.14.101",
+ remote_udp_port := 23000
+ }
+ },
+ nsvci := 1234
}
- },
- nsvci := 1234,
- nsei := 1234
+ }
}
[MAIN_CONTROLLER]
diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg
index 612fe03..b77fffd 100644
--- a/ttcn3-sgsn-test/SGSN_Tests.cfg
+++ b/ttcn3-sgsn-test/SGSN_Tests.cfg
@@ -14,29 +14,41 @@
[MODULE_PARAMETERS]
SGSN_Tests.mp_nsconfig := {
{
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.8.103",
- remote_ip := "172.18.8.10"
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.8.103",
+ remote_ip := "172.18.8.10"
+ }
+ }
}
}
},
{
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.8.103",
- remote_ip := "172.18.8.10"
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.8.103",
+ remote_ip := "172.18.8.10"
+ }
+ }
}
}
},
{
- provider := {
- ip := {
- address_family := AF_INET,
- local_ip := "172.18.8.103",
- remote_ip := "172.18.8.10"
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.8.103",
+ remote_ip := "172.18.8.10"
+ }
+ }
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21111
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6ac250555c3ac2aa8feb70bd3a052aafec5d4210
Gerrit-Change-Number: 21111
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <lafo...@osmocom.org>
Gerrit-MessageType: newchange
