fixeria submitted this change.
s1gw: enable the REST interface, fix wrong REST port
REST had been disabled because only nightly builds supported it.
The latest stable release (v0.4.0) also supports the REST interface,
so let's enable it unconditionally by removing the mp_rest_enable.
Also fix the REST port: mp_rest_port was incorrectly set
to 8125 (the StatsD port) instead of the actual REST port 8080.
Change-Id: I012749076c652ab541e569026eb01c696ad5adc8
Related: SYS#7052, SYS#7066
---
M s1gw/S1GW_Tests.cfg
M s1gw/S1GW_Tests.ttcn
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg
index 8174b9e..961639e 100644
--- a/s1gw/S1GW_Tests.cfg
+++ b/s1gw/S1GW_Tests.cfg
@@ -19,8 +19,7 @@
S1GW_Tests.mp_local_statsd_ip := "127.0.4.10";
S1GW_Tests.mp_local_statsd_port := 8125;
S1GW_Tests.mp_rest_host := "127.0.0.1";
-S1GW_Tests.mp_rest_port := 8125;
-S1GW_Tests.mp_rest_enable := false;
+S1GW_Tests.mp_rest_port := 8080;
[MAIN_CONTROLLER]
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index f522406..b7b01b1 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -66,7 +66,6 @@
integer mp_multi_enb_num := 42; /* number of eNBs in _multi TCs */
integer mp_multi_ue_num := 128; /* number of UEs in _multi TCs */
- boolean mp_rest_enable := false; /* whether enable the HTTP/REST interface */
charstring mp_rest_host := "127.0.0.1";
integer mp_rest_port := 8080;
}
@@ -103,9 +102,7 @@
f_init_pfcp();
f_pfcp_assoc();
}
- if (mp_rest_enable) {
- f_init_rest();
- }
+ f_init_rest();
}
/* compute the IP address for pool MME server [idx]: mp_mme_bind_ip + idx */
@@ -228,11 +225,9 @@
vc_conn := ConnHdlr.create(id) alive;
f_ConnHdlr_connect(vc_conn);
- if (mp_rest_enable) {
- /* Init the HTTP client (M2M/REST interface) */
- vc_conn.start(f_http_init(valueof(t_HTTP_Adapter_Params)));
- vc_conn.done;
- }
+ /* Init the HTTP client (M2M/REST interface) */
+ vc_conn.start(f_http_init(valueof(t_HTTP_Adapter_Params)));
+ vc_conn.done;
/* run the actual testcase logic */
vc_conn.start(f_ConnHdlr_init(fn, id, pars));
@@ -1405,11 +1400,9 @@
execute( TC_mme_pool_enb_disc_wait_s1setup_rsp() );
/* REST interface TCs */
- if (mp_rest_enable) {
- execute( TC_rest_mme_list() );
- execute( TC_rest_mme_add_del() );
- execute( TC_rest_mme_del_fallback() );
- }
+ execute( TC_rest_mme_list() );
+ execute( TC_rest_mme_add_del() );
+ execute( TC_rest_mme_del_fallback() );
}
}
To view, visit change 42361. To unsubscribe, or for help writing mail filters, visit settings.