dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36603?usp=email )
Change subject: HTTP_Adapter: put HTTP config options into a record
......................................................................
HTTP_Adapter: put HTTP config options into a record
The function f_http_init currently takes only two config options. For the
moment this is not a problem, but the amount of additional options may grow
in the future. So let's put the options in a record to have them separate.
Change-Id: I4c1c204ea38d76d5fdd7e539d56ca2bf9f693d7d
Related: SYS#6824
---
M cbc/CBC_Tests.ttcn
M library/HTTP_Adapter.ttcn
M remsim/RemsimServer_Tests.ttcn
3 files changed, 35 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/36603/1
diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn
index 2f1ad7f..18f9e6d 100644
--- a/cbc/CBC_Tests.ttcn
+++ b/cbc/CBC_Tests.ttcn
@@ -187,7 +187,12 @@
}
private function f_init(integer num_bsc := 0, integer num_mme := 0) runs on test_CT {
- f_http_init(mp_cbc_host, mp_cbc_ecbe_port);
+ var HTTP_Adapter_cfg http_adapter_cfg;
+ http_adapter_cfg := {
+ host := mp_cbc_host,
+ http_port := mp_cbc_ecbe_port
+ };
+ f_http_init(http_adapter_cfg);
g_num_bsc := num_bsc;
for (var integer i := 0; i < g_num_bsc; i := i + 1) {
diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn
index c54d599..b9448ff 100644
--- a/library/HTTP_Adapter.ttcn
+++ b/library/HTTP_Adapter.ttcn
@@ -23,10 +23,16 @@
var integer g_http_port;
};
-function f_http_init(charstring host, integer http_port) runs on http_CT {
+type record HTTP_Adapter_cfg {
+ charstring host,
+ integer http_port
+}
+
+function f_http_init(HTTP_Adapter_cfg cfg) runs on http_CT {
map(self:HTTP, system:HTTP);
- g_http_host := host;
- g_http_port := http_port;
+ g_http_host := cfg.host;
+ g_http_port := cfg.http_port;
+ g_use_ssl := use_ssl;
}
template (value) Connect ts_HTTP_Connect(template (value) charstring hostname,
diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn
index 6d2b27d..7307faf 100644
--- a/remsim/RemsimServer_Tests.ttcn
+++ b/remsim/RemsimServer_Tests.ttcn
@@ -68,7 +68,12 @@
function f_rsres_init() runs on http_CT {
- f_http_init(mp_server_ip, mp_rsres_port);
+ var HTTP_Adapter_cfg http_adapter_cfg;
+ http_adapter_cfg := {
+ host := mp_server_ip,
+ http_port := mp_rsres_port
+ };
+ f_http_init(http_adapter_cfg);
f_rsres_post_reset();
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36603?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4c1c204ea38d76d5fdd7e539d56ca2bf9f693d7d
Gerrit-Change-Number: 36603
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504?usp=email )
Change subject: HTTP_Adapter: allow API users to specifiy custom header
......................................................................
Patch Set 2:
(4 comments)
File library/HTTP_Adapter.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504/comment/a703254b_c50d…
PS1, Line 41: function ts_HTTP_Header(template charstring body := omit,
> I'd prefer having this one prefixed "f_ts_", since it's actually a function. […]
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504/comment/c033169a_48c0…
PS1, Line 42: template charstring host := omit,
> template (omit) charstring
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504/comment/2752abad_bcf7…
PS1, Line 55: if (ispresent(body)) {
> I'm not sure ispresent() can be used this way, or only for optional fields in a record. […]
I have verified that it works with ispresent(), but if (not istemplatekind(body, "omit")) also works.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504/comment/05a2da73_5e25…
PS1, Line 59: /* Add custom header lines, already existing headers (name) are updated */
> I think it makes sense to move this to a separate function "merge_headers()" or "overlay_headers()". […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I115fd14254e0957c0955649aeb47059dc180bf57
Gerrit-Change-Number: 36504
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 Apr 2024 11:55:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: HTTP_Adapter: allow API users to specifiy custom header
......................................................................
HTTP_Adapter: allow API users to specifiy custom header
At the moment HTTP_Adapter can only make requests with a fixed
pre-defined HTTP header. However, some application may require
additional custom header lines or different values than the ones
specified in the pre-defined HTTP header.
Related: SYS#6824
Change-Id: I115fd14254e0957c0955649aeb47059dc180bf57
---
M library/HTTP_Adapter.ttcn
1 file changed, 63 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/36504/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I115fd14254e0957c0955649aeb47059dc180bf57
Gerrit-Change-Number: 36504
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505?usp=email )
Change subject: HTTP_Adapter: allow body to be "omit"
......................................................................
Patch Set 2:
(2 comments)
File library/HTTP_Adapter.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505/comment/07586ff9_134a…
PS1, Line 85: msg.request := {
> I'm not really liking this kind of functions you are adding here and in previous messages, it differ […]
I am not agreeing here. we are defining templates through functions in various places, see SGsAP_Templates.ttcn or RANAP_Templates.ttcn. Its not done very often, but its also not an exotic practice.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505/comment/f131a978_1300…
PS1, Line 148: template charstring body := omit, template HTTPMessage exp := tr_HTTP_Resp2xx,
> this is most probably a "template (omit) charstring body".
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifedc8c2a590835663d1ba0b08b1fe4d54bdd0fff
Gerrit-Change-Number: 36505
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 Apr 2024 11:55:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by pespin, Verified+1 by Jenkins Builder
Change subject: HTTP_Adapter: allow body to be "omit"
......................................................................
HTTP_Adapter: allow body to be "omit"
In HTTP not all requests have a body. At the moment we describe a
missing body with body := "". This is not 100% correct since the rest of
the code interprets this as a present body with zero length and will put
a content_length = 0 header line into the HTTP header, even in the GET
request. This will most likely be ignored by any HTTP server, but it is
still not 100% spec compliant.
Related: SYS#6824
Change-Id: Ifedc8c2a590835663d1ba0b08b1fe4d54bdd0fff
---
M library/HTTP_Adapter.ttcn
1 file changed, 38 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/36505/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifedc8c2a590835663d1ba0b08b1fe4d54bdd0fff
Gerrit-Change-Number: 36505
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36506?usp=email )
Change subject: HTTP_Adapter: Allow API users to enable/disable SSL
......................................................................
Patch Set 2:
(1 comment)
File library/HTTP_Adapter.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36506/comment/5a1ab3b7_67ea…
PS1, Line 27: function f_http_init(charstring host, integer http_port, boolean use_ssl := false) runs on http_CT {
> I agree it's likely useful, as there might be more and more parameters, like specifying certificates […]
Yes, we should do this rather sooner than later. I have now cleaned this up a in a patch before this one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36506?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6487deea50cd9b4ed4905d9a3a78e00def8ea319
Gerrit-Change-Number: 36506
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 Apr 2024 11:55:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment