[L] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Split TS 29.273 templates into its own file

2023-10-24 Thread pespin 
pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34872?usp=email )

Change subject: library/DIAMETER: Split TS 29.273 templates into its own file
..

library/DIAMETER: Split TS 29.273 templates into its own file

The templates are added in a new separate file with the aim of starting
splitting the tons of AVPs originating from different specs in order to
be able to quickly identify them and avoid confusion.

Change-Id: I77f917404dd70559b2b2cc62199ed70289ab0825
---
M epdg/EPDG_Tests.ttcn
M epdg/gen_links.sh
M library/DIAMETER_Templates.ttcn
A library/DIAMETER_ts29_273_Templates.ttcn
4 files changed, 264 insertions(+), 228 deletions(-)

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




diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 76fd45e..396ca0e 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -12,6 +12,7 @@

 import from DIAMETER_Types all;
 import from DIAMETER_Templates all;
+import from DIAMETER_ts29_273_Templates all;
 import from DIAMETER_Emulation all;

 import from GTPv2_Types all;
diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh
index 326d82e..b464203 100755
--- a/epdg/gen_links.sh
+++ b/epdg/gen_links.sh
@@ -41,7 +41,8 @@
 FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn 
Native_Functions.ttcn Native_FunctionDefs.cc "
 FILES+="Osmocom_CTRL_Types.ttcn "
 FILES+="L3_Common.ttcn "
-FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn 
DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc 
DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn "
+FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn 
DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc 
DIAMETER_Emulation.ttcn "
+FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn "
 FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn 
IPA_CodecPort_CtrlFunctDef.cc
 IPA_Emulation.ttcnpp "
 FILES+="GSUP_Types.ttcn GSUP_Emulation.ttcn "
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 62b797d..9a3e739 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -125,10 +125,6 @@
 const uint32_t c_DIAMETER_3GPP_S6_AID := 16777251;
 const uint32_t c_DIAMETER_3GPP_S13_AID := 16777252;
 const uint32_t c_DIAMETER_3GPP_S7_AID := 16777308;
-/* 3GPP TS 29.273 Section 8.2 */
-const uint32_t c_DIAMETER_3GPP_SWx_AID := 16777265;
-/* 3GPP TS 29.273 Section 9 */
-const uint32_t c_DIAMETER_3GPP_S6b_AID := 16777272;

 const octetstring c_def_sess_id := char2oct("ttcn3.session");

@@ -2296,227 +2292,4 @@
}
 }

-/***
- * SWx 3GPP TS 29.273 section 8
- ***/
-
-/* SIP-Auth-Data-Item , 3GPP TS 29.273 8.2.3.9 */
-template (present) GenericAVP tr_AVP_3GPP_SIPAuthDataItem(template (present) 
uint32_t num := ?) := {
-   avp := {
-   avp_header := 
tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Auth_Data_Item),
-   avp_data := {
-   avp_CxDx_3GPP_SIP_Auth_Data_Item := superset(
-   //tr_AVP_3GPP_SIPItemNumber(num), /* Optional */
-   tr_AVP_3GPP_SIPAuthScheme(?)//, /* Optional */
-   //tr_AVP_3GPP_SIPAuthenticate(?), /* Optional */
-   //tr_AVP_3GPP_SIPAuthorization(?), /* Optional 
*/
-   //tr_AVP_3GPP_SIPAuthContext(?), /* Optional */
-   //tr_AVP_3GPP_ConfidentialityKey(?), /* 
Optional */
-   //tr_AVP_3GPP_IntegrityKey(?) /* Optional */
-   /* TODO:
-   [ SIP-Digest-Authenticate ]
-   [ Framed-IP-Address ]
-   [ Framed-IPv6-Prefix ]
-   [ Framed-Interface-Id ]
-   [ Line-Identifier ]
-   *[AVP]
-   */
-   )
-   }
-   }
-}
-template (value) GenericAVP ts_AVP_3GPP_SIPAuthDataItem(uint32_t num, OCT16 
rand, OCT16 ik, OCT16 ck, OCT16 autn, OCT14 auts) := {
-   avp := {
-   avp_header := 
ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Auth_Data_Item),
-   avp_data := {
-   avp_CxDx_3GPP_SIP_Auth_Data_Item := {
-   ts_AVP_3GPP_SIPItemNumber(num),
-   
ts_AVP_3GPP_SIPAuthScheme(char2oct("Digest-AKAv1-MD5")),
-   ts_AVP_3GPP_SIPAuthenticate(rand & autn),
-   ts_AVP_3GPP_SIPAuthorization(rand & auts),
-   ts_AVP_3GPP_SIPAuthContext(char2oct("foobar")),
-

[L] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Split TS 29.273 templates into its own file

2023-10-24 Thread laforge 
Attention is currently required from: pespin.

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

Change subject: library/DIAMETER: Split TS 29.273 templates into its own file
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34872?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: I77f917404dd70559b2b2cc62199ed70289ab0825
Gerrit-Change-Number: 34872
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Tue, 24 Oct 2023 19:11:51 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Split TS 29.273 templates into its own file

2023-10-24 Thread osmith 
Attention is currently required from: pespin.

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

Change subject: library/DIAMETER: Split TS 29.273 templates into its own file
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34872?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: I77f917404dd70559b2b2cc62199ed70289ab0825
Gerrit-Change-Number: 34872
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Tue, 24 Oct 2023 09:00:38 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Split TS 29.273 templates into its own file

2023-10-23 Thread pespin 
pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34872?usp=email )


Change subject: library/DIAMETER: Split TS 29.273 templates into its own file
..

library/DIAMETER: Split TS 29.273 templates into its own file

The templates are added in a new separate file with the aim of starting
splitting the tons of AVPs originating from different specs in order to
be able to quickly identify them and avoid confusion.

Change-Id: I77f917404dd70559b2b2cc62199ed70289ab0825
---
M epdg/EPDG_Tests.ttcn
M epdg/gen_links.sh
M library/DIAMETER_Templates.ttcn
A library/DIAMETER_ts29_273_Templates.ttcn
4 files changed, 264 insertions(+), 228 deletions(-)



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

diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 76fd45e..396ca0e 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -12,6 +12,7 @@

 import from DIAMETER_Types all;
 import from DIAMETER_Templates all;
+import from DIAMETER_ts29_273_Templates all;
 import from DIAMETER_Emulation all;

 import from GTPv2_Types all;
diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh
index 326d82e..b464203 100755
--- a/epdg/gen_links.sh
+++ b/epdg/gen_links.sh
@@ -41,7 +41,8 @@
 FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn 
Native_Functions.ttcn Native_FunctionDefs.cc "
 FILES+="Osmocom_CTRL_Types.ttcn "
 FILES+="L3_Common.ttcn "
-FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn 
DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc 
DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn "
+FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn 
DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc 
DIAMETER_Emulation.ttcn "
+FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn "
 FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn 
IPA_CodecPort_CtrlFunctDef.cc
 IPA_Emulation.ttcnpp "
 FILES+="GSUP_Types.ttcn GSUP_Emulation.ttcn "
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index f46bf37..3b4590e 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -125,10 +125,6 @@
 const uint32_t c_DIAMETER_3GPP_S6_AID := 16777251;
 const uint32_t c_DIAMETER_3GPP_S13_AID := 16777252;
 const uint32_t c_DIAMETER_3GPP_S7_AID := 16777308;
-/* 3GPP TS 29.273 Section 8.2 */
-const uint32_t c_DIAMETER_3GPP_SWx_AID := 16777265;
-/* 3GPP TS 29.273 Section 9 */
-const uint32_t c_DIAMETER_3GPP_S6b_AID := 16777272;

 const octetstring c_def_sess_id := char2oct("ttcn3.session");

@@ -2306,227 +2302,4 @@
}
 }

-/***
- * SWx 3GPP TS 29.273 section 8
- ***/
-
-/* SIP-Auth-Data-Item , 3GPP TS 29.273 8.2.3.9 */
-template (present) GenericAVP tr_AVP_3GPP_SIPAuthDataItem(template (present) 
uint32_t num := ?) := {
-   avp := {
-   avp_header := 
tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Auth_Data_Item),
-   avp_data := {
-   avp_CxDx_3GPP_SIP_Auth_Data_Item := superset(
-   //tr_AVP_3GPP_SIPItemNumber(num), /* Optional */
-   tr_AVP_3GPP_SIPAuthScheme(?)//, /* Optional */
-   //tr_AVP_3GPP_SIPAuthenticate(?), /* Optional */
-   //tr_AVP_3GPP_SIPAuthorization(?), /* Optional 
*/
-   //tr_AVP_3GPP_SIPAuthContext(?), /* Optional */
-   //tr_AVP_3GPP_ConfidentialityKey(?), /* 
Optional */
-   //tr_AVP_3GPP_IntegrityKey(?) /* Optional */
-   /* TODO:
-   [ SIP-Digest-Authenticate ]
-   [ Framed-IP-Address ]
-   [ Framed-IPv6-Prefix ]
-   [ Framed-Interface-Id ]
-   [ Line-Identifier ]
-   *[AVP]
-   */
-   )
-   }
-   }
-}
-template (value) GenericAVP ts_AVP_3GPP_SIPAuthDataItem(uint32_t num, OCT16 
rand, OCT16 ik, OCT16 ck, OCT16 autn, OCT14 auts) := {
-   avp := {
-   avp_header := 
ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Auth_Data_Item),
-   avp_data := {
-   avp_CxDx_3GPP_SIP_Auth_Data_Item := {
-   ts_AVP_3GPP_SIPItemNumber(num),
-   
ts_AVP_3GPP_SIPAuthScheme(char2oct("Digest-AKAv1-MD5")),
-   ts_AVP_3GPP_SIPAuthenticate(rand & autn),
-   ts_AVP_3GPP_SIPAuthorization(rand & auts),
-   ts_AVP_3GPP_SIPAuthContext(char2oct("foobar")),
-   ts_AVP_3GPP_ConfidentialityKey(ck),
-