Change in osmo-ttcn3-hacks[master]: MSC_Tests: Remove duplicated structures from BSSMAP_Templates

2019-05-21 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/14120


Change subject: MSC_Tests: Remove duplicated structures from BSSMAP_Templates
..

MSC_Tests: Remove duplicated structures from BSSMAP_Templates

Change-Id: Ia82b65fe7e53cc0ab73df94b844b9b85aba9468b
---
M msc/MSC_Tests.ttcn
1 file changed, 0 insertions(+), 138 deletions(-)



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

diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index f6ab439..b64b872 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -330,144 +330,6 @@
activate(as_Tguard_direct());
 }

-template PDU_BSSAP ts_BSSAP_BSSMAP := {
-   discriminator := '0'B,
-   spare := '000'B,
-   dlci := omit,
-   lengthIndicator := 0,   /* overwritten by codec */
-   pdu := ?
-}
-
-template PDU_BSSAP tr_BSSAP_BSSMAP := {
-   discriminator := '0'B,
-   spare := '000'B,
-   dlci := omit,
-   lengthIndicator := ?,
-   pdu := {
-   bssmap := ?
-   }
-}
-
-
-type integer BssmapCause;
-
-template (value) BSSMAP_IE_Cause ts_BSSMAP_IE_Cause(BssmapCause val) := {
-   elementIdentifier := '04'O,
-   lengthIndicator := 0,
-   causeValue := int2bit(val, 7),
-   extensionCauseValue := '0'B,
-   spare1 := omit
-}
-
-template (value) PDU_BSSAP ts_BSSMAP_Reset(BssmapCause cause) modifies 
ts_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   reset := {
-   messageType := '30'O,
-   cause := ts_BSSMAP_IE_Cause(cause),
-   a_InterfaceSelectorForReset := omit
-   }
-   }
-   }
-}
-
-template (value) PDU_BSSAP ts_BSSMAP_ResetAck modifies ts_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   resetAck := {
-   messageType := '31'O,
-   a_InterfaceSelectorForReset := omit
-   }
-   }
-   }
-}
-
-template PDU_BSSAP tr_BSSMAP_ResetAck modifies tr_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   resetAck := {
-   messageType := '31'O,
-   a_InterfaceSelectorForReset := *
-   }
-   }
-   }
-}
-
-template BSSMAP_IE_CellIdentifier ts_BSSMAP_IE_CellID := {
-   elementIdentifier := '05'O,
-   lengthIndicator := 0,
-   cellIdentifierDiscriminator := ''B,
-   spare1_4 := ''B,
-   cellIdentification := ?
-}
-
-type uint16_t BssmapLAC;
-type uint16_t BssmapCI;
-
-/*
-template BSSMAP_IE_CellIdentifier ts_CellId_CGI(mcc, mnc, lac, ci)
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_LAC_CGI := {
-   mnc_mcc := FIXME,
-   lac := int2oct(lac, 2),
-   ci := int2oct(ci, 2)
-   }
-   }
-}
-*/
-
-template BSSMAP_IE_CellIdentifier ts_CellID_LAC_CI(BssmapLAC lac, BssmapCI ci)
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_LAC_CI := {
-   lac := int2oct(lac, 2),
-   ci := int2oct(ci, 2)
-   }
-   }
-}
-
-template BSSMAP_IE_CellIdentifier ts_CellId_CI(BssmapCI ci)
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_CI := int2oct(ci, 2)
-   }
-}
-
-template BSSMAP_IE_CellIdentifier ts_CellId_none
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_noCell := ''O
-   }
-}
-
-
-template BSSMAP_IE_Layer3Information ts_BSSMAP_IE_L3Info(octetstring l3info) 
:= {
-   elementIdentifier := '17'O,
-   lengthIndicator := 0,
-   layer3info := l3info
-}
-
-template PDU_BSSAP ts_BSSMAP_ComplL3(BSSMAP_IE_CellIdentifier cell_id, 
octetstring l3_info)
-modifies ts_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   completeLayer3Information := {
-   messageType := '57'O,
-   cellIdentifier := cell_id,
-   layer3Information := 
ts_BSSMAP_IE_L3Info(l3_info),
-   chosenChannel := omit,
-   lSAIdentifier := omit,
-   aPDU := omit,
-   codecList := omit,
-   redirectAttemptFlag := omit,
-   sendSequenceNumber := omit,
-   iMSI := omit
-   }
-   }
-   }
-}
-
 type function void_fn(charstring id, BSC_ConnHdlrPars pars) runs on 
BSC_ConnHdlr;

 /* FIXME: move into BSC_ConnectionHandler? */

--
To view, visit https://gerrit.

Change in osmo-ttcn3-hacks[master]: MSC_Tests: Remove duplicated structures from BSSMAP_Templates

2019-05-23 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/14120 )

Change subject: MSC_Tests: Remove duplicated structures from BSSMAP_Templates
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/14120
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia82b65fe7e53cc0ab73df94b844b9b85aba9468b
Gerrit-Change-Number: 14120
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Thu, 23 May 2019 14:08:36 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ttcn3-hacks[master]: MSC_Tests: Remove duplicated structures from BSSMAP_Templates

2019-05-23 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/14120 )

Change subject: MSC_Tests: Remove duplicated structures from BSSMAP_Templates
..

MSC_Tests: Remove duplicated structures from BSSMAP_Templates

Change-Id: Ia82b65fe7e53cc0ab73df94b844b9b85aba9468b
---
M msc/MSC_Tests.ttcn
1 file changed, 0 insertions(+), 138 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index f6ab439..b64b872 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -330,144 +330,6 @@
activate(as_Tguard_direct());
 }

-template PDU_BSSAP ts_BSSAP_BSSMAP := {
-   discriminator := '0'B,
-   spare := '000'B,
-   dlci := omit,
-   lengthIndicator := 0,   /* overwritten by codec */
-   pdu := ?
-}
-
-template PDU_BSSAP tr_BSSAP_BSSMAP := {
-   discriminator := '0'B,
-   spare := '000'B,
-   dlci := omit,
-   lengthIndicator := ?,
-   pdu := {
-   bssmap := ?
-   }
-}
-
-
-type integer BssmapCause;
-
-template (value) BSSMAP_IE_Cause ts_BSSMAP_IE_Cause(BssmapCause val) := {
-   elementIdentifier := '04'O,
-   lengthIndicator := 0,
-   causeValue := int2bit(val, 7),
-   extensionCauseValue := '0'B,
-   spare1 := omit
-}
-
-template (value) PDU_BSSAP ts_BSSMAP_Reset(BssmapCause cause) modifies 
ts_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   reset := {
-   messageType := '30'O,
-   cause := ts_BSSMAP_IE_Cause(cause),
-   a_InterfaceSelectorForReset := omit
-   }
-   }
-   }
-}
-
-template (value) PDU_BSSAP ts_BSSMAP_ResetAck modifies ts_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   resetAck := {
-   messageType := '31'O,
-   a_InterfaceSelectorForReset := omit
-   }
-   }
-   }
-}
-
-template PDU_BSSAP tr_BSSMAP_ResetAck modifies tr_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   resetAck := {
-   messageType := '31'O,
-   a_InterfaceSelectorForReset := *
-   }
-   }
-   }
-}
-
-template BSSMAP_IE_CellIdentifier ts_BSSMAP_IE_CellID := {
-   elementIdentifier := '05'O,
-   lengthIndicator := 0,
-   cellIdentifierDiscriminator := ''B,
-   spare1_4 := ''B,
-   cellIdentification := ?
-}
-
-type uint16_t BssmapLAC;
-type uint16_t BssmapCI;
-
-/*
-template BSSMAP_IE_CellIdentifier ts_CellId_CGI(mcc, mnc, lac, ci)
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_LAC_CGI := {
-   mnc_mcc := FIXME,
-   lac := int2oct(lac, 2),
-   ci := int2oct(ci, 2)
-   }
-   }
-}
-*/
-
-template BSSMAP_IE_CellIdentifier ts_CellID_LAC_CI(BssmapLAC lac, BssmapCI ci)
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_LAC_CI := {
-   lac := int2oct(lac, 2),
-   ci := int2oct(ci, 2)
-   }
-   }
-}
-
-template BSSMAP_IE_CellIdentifier ts_CellId_CI(BssmapCI ci)
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_CI := int2oct(ci, 2)
-   }
-}
-
-template BSSMAP_IE_CellIdentifier ts_CellId_none
-modifies ts_BSSMAP_IE_CellID := {
-   cellIdentification := {
-   cI_noCell := ''O
-   }
-}
-
-
-template BSSMAP_IE_Layer3Information ts_BSSMAP_IE_L3Info(octetstring l3info) 
:= {
-   elementIdentifier := '17'O,
-   lengthIndicator := 0,
-   layer3info := l3info
-}
-
-template PDU_BSSAP ts_BSSMAP_ComplL3(BSSMAP_IE_CellIdentifier cell_id, 
octetstring l3_info)
-modifies ts_BSSAP_BSSMAP := {
-   pdu := {
-   bssmap := {
-   completeLayer3Information := {
-   messageType := '57'O,
-   cellIdentifier := cell_id,
-   layer3Information := 
ts_BSSMAP_IE_L3Info(l3_info),
-   chosenChannel := omit,
-   lSAIdentifier := omit,
-   aPDU := omit,
-   codecList := omit,
-   redirectAttemptFlag := omit,
-   sendSequenceNumber := omit,
-   iMSI := omit
-   }
-   }
-   }
-}
-
 type function void_fn(charstring id, BSC_ConnHdlrPars pars) runs on 
BSC_ConnHdlr;

 /* FIXME: move into BSC_ConnectionHandler? */

--
To view, visit https://gerr