Commit e112f01a authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'meeting/LI59e' into 'master' 

Meeting LI59e

See merge request li/trial!78
parents 1d23738c a5eac2be

.gitlab-ci.yml

+14 −10
Original line number Diff line number Diff line 
image: "python:3.7"



before_script:

  - python3 --version

  - pip3 install -q asn1tools lxml xmlschema



stages:

  - Check Schemas

  - check



checkASN1:

  stage: Check Schemas

process_asn:

  image: "mcanterb/asn1test:latest"

  stage: check

  interruptible: true

  script:

  - python3 testing/check_asn1.py
 
 No newline at end of file
 
    - python3 testing/asn_process.py



process_xsd:

  image: "mcanterb/xsdtest:latest"

  stage: check

  interruptible: true

  script:

    - python3 testing/xsd_process.py

102232-1/LI-PS-PDU.asn

+5 −5
Original line number Diff line number Diff line 
LI-PS-PDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -34,7 +34,7 @@ IMPORTS 
	MessagingMMCC,

	MessagingIRI

		FROM EmailPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}



	-- from ETSI TS 102 232-3 [6]

	IPCC,
@@ -54,7 +54,7 @@ IMPORTS 
	IPMMCC,

	IPMMIRI

		FROM IPMultimediaPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)}



	-- from ETSI TS 102 232-6 [36]

	PstnIsdnCC,
@@ -204,7 +204,7 @@ IMPORTS 


lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}



li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)}



-- ====================

-- Top-level definition

102232-2/EmailPDU.asn

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ Messaging-Party-Identity ::= CHOICE 
{

	msisdn					[0] OCTET STRING (SIZE (1..9)),

		-- MSISDN of the target, encoded in the same format as the AddressString

		-- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8.

		-- parameters defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.

	e164-format				[1] OCTET STRING (SIZE (1..25)),

		-- E.164 address of the node in international format. Coded in the same format as 

		-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])

102232-4/L2AccessPDU.asn

+3 −3
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ L2CC ::= SEQUENCE 
			-- The ethernet protocol is used

		...,

		l2ATM2684		[6] OCTET STRING,

			-- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used

			-- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used

		l2FR2427		[7] OCTET STRING

			-- The protocol RFC 2427 “Multiprotocol Interconnect over Frame Relay” [18] is used

			-- The protocol RFC 2427 "Multiprotocol Interconnect over Frame Relay" [18] is used

	}

}
@@ -194,7 +194,7 @@ L2ProtocolInformation ::= ENUMERATED 
	l2ProtocolATM2684(7),

		-- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used

	l2ProtocolFR2427(8)

		-- The protocol RFC2427 “Multiprotocol Interconnect over Frame Relay” [18] is used

		-- The protocol RFC2427 "Multiprotocol Interconnect over Frame Relay" [18] is used

}



END -- end of L2AccessPDU

102232-5/IPMultimediaPDU.asn

+6 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 




IPMultimediaPDU 

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -22,8 +22,8 @@ IMPORTS 
-- Object Identifier Definition

-- ============================



iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)}

iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)}

iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)}

iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)}

	-- both definitions relative to: 

	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
@@ -51,7 +51,9 @@ IPMMCC ::= SEQUENCE 
		-- May contain c= and m= lines extracts for instance

	mMCCprotocol				[4] MMCCprotocol OPTIONAL

		-- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.)

		-- Absence means mMCCContents contains RTP/RTCP packets

		-- Absence means mMCCContents contains RTP/RTCP packets or audio frame as indicated by the 

		-- frameType parameter. 



}



FrameType ::= ENUMERATED