[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-28 Thread pespin 
pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )

Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..

asterisk: Use Action PJSIPAccessNetworkInfo

Validate P-Access-Network-Info should only be present in 2nd REGISTER
sent over ipsec.

Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
M asterisk/IMS_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
4 files changed, 111 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  pespin: Looks good to me, approved




diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index 9fbe973..4969905 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -28,6 +28,7 @@
 const charstring AMI_FIELD_ACTION := "Action";
 const charstring AMI_FIELD_ACTION_ID := "ActionID";
 const charstring AMI_FIELD_EVENT := "Event";
+const charstring AMI_FIELD_INFO := "Info";
 const charstring AMI_FIELD_USERNAME := "Username";
 const charstring AMI_FIELD_SECRET := "Secret";
 const charstring AMI_FIELD_RESPONSE := "Response";
@@ -79,6 +80,8 @@
 template (value) AMI_Field
 ts_AMI_Field_Event(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_EVENT, val);
 template (value) AMI_Field
+ts_AMI_Field_Info(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_INFO, val);
+template (value) AMI_Field
 ts_AMI_Field_Username(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_USERNAME, val);
 template (value) AMI_Field
 ts_AMI_Field_Secret(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_SECRET, val);
@@ -93,6 +96,8 @@
 template (present) AMI_Field
 tr_AMI_Field_Event(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val);
 template (present) AMI_Field
+tr_AMI_Field_Info(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val);
+template (present) AMI_Field
 tr_AMI_Field_Username(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val);
 template (present) AMI_Field
 tr_AMI_Field_Secret(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val);
@@ -139,6 +144,23 @@
tr_AMI_Field_Secret(secret)
 );

+/* Action: PJSIPAccessNetworkInfo
+ * Registration: volte_ims
+ * Info: 3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=238010001101
+ */
+template (value) AMI_Msg
+ts_AMI_Action_PJSIPAccessNetworkInfo(template (value) charstring registration 
:= "volte_ims",
+template (value) charstring info := "",
+template (value) charstring action_id := 
"0001") := {
+   ts_AMI_Field_Action("PJSIPAccessNetworkInfo"),
+   ts_AMI_Field_ActionId(action_id),
+   ts_AMI_Field_Registration(registration),
+   ts_AMI_Field_Info(info)
+};
+function f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(charstring uli_str) 
return charstring {
+   return "3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=" & uli_str;
+}
+
 /* Action: PJSIPRegister
  * ActionID: 
  * Registration: volte_ims
@@ -508,6 +530,13 @@
f_ami_transceive_match_response_success(pt, 
ts_AMI_Action_Login(username, secret, reg_action_id));
 }

+function f_ami_action_PJSIPAccessNetworkInfo(AMI_Msg_PT pt,
+template (value) charstring 
registration,
+template (value) charstring info) {
+   var charstring reg_action_id := f_gen_action_id();
+   f_ami_transceive_match_response_success(pt, 
ts_AMI_Action_PJSIPAccessNetworkInfo(registration, info, reg_action_id));
+}
+
 function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) {
var charstring reg_action_id := f_gen_action_id();
f_ami_transceive_match_response_success(pt, 
ts_AMI_Action_PJSIPRegister(register, reg_action_id));
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index a71bcad..df5904b 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -376,6 +376,12 @@
f_sleep(1.0);
/* Clear events: */
AMI_CLIENT.clear;
+
+   /* Announce network information, this should usually happen when UE
+* becomes attached to network and before IMS APN is set up: */
+   f_ami_action_PJSIPAccessNetworkInfo(AMI_CLIENT, 
mp_volte_ims_outbound_registration,
+   
f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(pars.uli_str));
+
/* Trigger registration: */
f_ami_action_PJSIPRegister(AMI_CLIENT, 
mp_volte_ims_outbound_registration);
/* TODO: Rx "Event: AuthRequest" */
diff --git a/asterisk/IMS_ConnectionHandler.ttcn 
b/asterisk/IMS_

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-28 Thread pespin 
Attention is currently required from: jolly.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )

Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30
Gerrit-Change-Number: 36886
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Attention: jolly 
Gerrit-Comment-Date: Tue, 28 May 2024 14:40:12 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-28 Thread osmith 
Attention is currently required from: jolly, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )

Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30
Gerrit-Change-Number: 36886
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Attention: jolly 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Tue, 28 May 2024 13:40:06 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-28 Thread pespin 
Attention is currently required from: jolly.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )

Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..


Patch Set 2:

(1 comment)

Patchset:

PS2:
I'm gonna merge this patchset later today after one week waiting here.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30
Gerrit-Change-Number: 36886
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-Attention: jolly 
Gerrit-Comment-Date: Tue, 28 May 2024 09:13:40 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-22 Thread laforge 
Attention is currently required from: jolly, pespin.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )

Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30
Gerrit-Change-Number: 36886
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-Attention: jolly 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Wed, 22 May 2024 15:34:18 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-21 Thread pespin 
Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: asterisk: Use Action PJSIPAccessNetworkInfo
..

asterisk: Use Action PJSIPAccessNetworkInfo

Validate P-Access-Network-Info should only be present in 2nd REGISTER
sent over ipsec.

Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
M asterisk/IMS_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
4 files changed, 111 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/86/36886/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30
Gerrit-Change-Number: 36886
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

2024-05-21 Thread pespin 
pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )


Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..

asterisk: Use Action PJSIPAccessNetworkInfo

Validate P-Access-Network-Info should only be present in 2nd REGISTER
sent over ipsec.

Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
M asterisk/IMS_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
4 files changed, 107 insertions(+), 0 deletions(-)



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

diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index 9fbe973..4969905 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -28,6 +28,7 @@
 const charstring AMI_FIELD_ACTION := "Action";
 const charstring AMI_FIELD_ACTION_ID := "ActionID";
 const charstring AMI_FIELD_EVENT := "Event";
+const charstring AMI_FIELD_INFO := "Info";
 const charstring AMI_FIELD_USERNAME := "Username";
 const charstring AMI_FIELD_SECRET := "Secret";
 const charstring AMI_FIELD_RESPONSE := "Response";
@@ -79,6 +80,8 @@
 template (value) AMI_Field
 ts_AMI_Field_Event(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_EVENT, val);
 template (value) AMI_Field
+ts_AMI_Field_Info(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_INFO, val);
+template (value) AMI_Field
 ts_AMI_Field_Username(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_USERNAME, val);
 template (value) AMI_Field
 ts_AMI_Field_Secret(template (value) charstring val) := 
ts_AMI_Field(AMI_FIELD_SECRET, val);
@@ -93,6 +96,8 @@
 template (present) AMI_Field
 tr_AMI_Field_Event(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val);
 template (present) AMI_Field
+tr_AMI_Field_Info(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val);
+template (present) AMI_Field
 tr_AMI_Field_Username(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val);
 template (present) AMI_Field
 tr_AMI_Field_Secret(template (present) charstring val := ?) := 
tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val);
@@ -139,6 +144,23 @@
tr_AMI_Field_Secret(secret)
 );

+/* Action: PJSIPAccessNetworkInfo
+ * Registration: volte_ims
+ * Info: 3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=238010001101
+ */
+template (value) AMI_Msg
+ts_AMI_Action_PJSIPAccessNetworkInfo(template (value) charstring registration 
:= "volte_ims",
+template (value) charstring info := "",
+template (value) charstring action_id := 
"0001") := {
+   ts_AMI_Field_Action("PJSIPAccessNetworkInfo"),
+   ts_AMI_Field_ActionId(action_id),
+   ts_AMI_Field_Registration(registration),
+   ts_AMI_Field_Info(info)
+};
+function f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(charstring uli_str) 
return charstring {
+   return "3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=" & uli_str;
+}
+
 /* Action: PJSIPRegister
  * ActionID: 
  * Registration: volte_ims
@@ -508,6 +530,13 @@
f_ami_transceive_match_response_success(pt, 
ts_AMI_Action_Login(username, secret, reg_action_id));
 }

+function f_ami_action_PJSIPAccessNetworkInfo(AMI_Msg_PT pt,
+template (value) charstring 
registration,
+template (value) charstring info) {
+   var charstring reg_action_id := f_gen_action_id();
+   f_ami_transceive_match_response_success(pt, 
ts_AMI_Action_PJSIPAccessNetworkInfo(registration, info, reg_action_id));
+}
+
 function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) {
var charstring reg_action_id := f_gen_action_id();
f_ami_transceive_match_response_success(pt, 
ts_AMI_Action_PJSIPRegister(register, reg_action_id));
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index a71bcad..df5904b 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -376,6 +376,12 @@
f_sleep(1.0);
/* Clear events: */
AMI_CLIENT.clear;
+
+   /* Announce network information, this should usually happen when UE
+* becomes attached to network and before IMS APN is set up: */
+   f_ami_action_PJSIPAccessNetworkInfo(AMI_CLIENT, 
mp_volte_ims_outbound_registration,
+   
f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(pars.uli_str));
+
/* Trigger registration: */
f_ami_action_PJSIPRegister(AMI_CLIENT, 
mp_volte_ims_outbound_registration);
/* TODO: Rx "Event: AuthRequest" */
diff --git a/asterisk/IMS_ConnectionHandler.ttcn 
b/asterisk/IMS_ConnectionHandler.ttcn
index d1e3185..ae291b5 100644
--- a/asterisk/IMS_ConnectionHandler.ttcn
+++