Review at https://gerrit.osmocom.org/6155
ggsn_tests: Configure expected GGSN DNS values and improve error message
Change-Id: Ie64ca0b4cda22fd358c8c304d5b3909fd9685948
---
M ggsn_tests/GGSN_Tests.cfg
M ggsn_tests/GGSN_Tests.ttcn
2 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/55/6155/1
diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg
index e97578c..90368b9 100644
--- a/ggsn_tests/GGSN_Tests.cfg
+++ b/ggsn_tests/GGSN_Tests.cfg
@@ -14,8 +14,10 @@
[MODULE_PARAMETERS]
GGSN_Tests.m_bind_ip_gtpc := "127.0.42.1"
GGSN_Tests.m_bind_ip_gtpu := "127.0.42.1"
-GGSN_Tests.m_ggsn_ip_gtpc := "127.0.23.1"
-GGSN_Tests.m_ggsn_ip_gtpu := "127.0.23.1"
+GGSN_Tests.m_ggsn_ip_gtpc := "127.0.0.2"
+GGSN_Tests.m_ggsn_ip_gtpu := "127.0.0.2"
+GGSN_Tests.m_ggsn_ip4_dns1 := "192.168.100.1"
+GGSN_Tests.m_ggsn_ip4_dns2 := "8.8.8.8"
[EXECUTE]
#GGSN_Tests.TC_dummy
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 23e7054..06d9dcf 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -23,6 +23,9 @@
charstring m_ggsn_ip_gtpc := "127.0.0.6";
charstring m_ggsn_ip_gtpu := "127.0.0.6";
+
+ charstring m_ggsn_ip4_dns1 := "192.168.100.1"
+ charstring m_ggsn_ip4_dns2 := "8.8.8.8"
}
type set PdpContext {
@@ -954,6 +957,8 @@
/* Test PDP context activation for dynamic IPv4 EUA with IPv4 DNS in
IPCP */
testcase TC_pdp4_act_deact_ipcp() runs on GT_CT {
f_init();
+ var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1);
+ var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2);
var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H),
'1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn)));
ctx.pco_req := valueof(ts_PCO_IPv4_DNS_IPCP);
f_pdp_ctx_act(ctx);
@@ -963,8 +968,12 @@
}
/* verify IPCP contains both primary and secondary DNS */
var IpcpPacket ipcp :=
dec_IpcpPacket(f_PCO_extract_proto(ctx.pco_neg, '8021'O));
- if (not match(ipcp, tr_IPCP_Ack_DNS(0, 'C0A86401'O,
'08080808'O))) {
- setverdict(fail, "Primary/Secondary DNS not found in
IPCP");
+ if (not match(ipcp, tr_IPCP_Ack_DNS(0, ggsn_ip4_dns1,
ggsn_ip4_dns2))) {
+ if (not match(ipcp, tr_IPCP_Ack_DNS(0))) {
+ setverdict(fail, "Primary/Secondary DNS PCO
IPCP option not found");
+ } else {
+ setverdict(fail, "Primary/Secondary DNS PCO
IPCP option found but not matching expected values");
+ }
}
f_pdp_ctx_del(ctx, '1'B);
}
--
To view, visit https://gerrit.osmocom.org/6155
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie64ca0b4cda22fd358c8c304d5b3909fd9685948
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
