Commit 9cd4cc02 authored by YannGarcia's avatar YannGarcia
Browse files

Rename PICS & PIXITs

parent 873e73b8
Loading
Loading
Loading
Loading
+47 −46
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and E_SIP_URN3 and B_SDP_ULA1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_E_SIP_URN3 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIncomingCalls
        }
@@ -40,7 +40,7 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN,//"urn:service:sos.police", 
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "application/sdp",
                        Body containing
                            SDP_ULAW
@@ -63,7 +63,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and E_SIP_URN3 and B_SDP_ULA1 and S_SIP_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_E_SIP_URN3 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_REGISTRATION
        Initial conditions with {
            the IUT entity isRegistered to the ESRP entity and
            the IUT entity acceptingIncomingCalls
@@ -72,7 +72,7 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "application/sdp",
                        Body containing
                            SDP_ULAW
@@ -95,7 +95,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and E_SIP_URN3 and B_SDP_ALA1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_E_SIP_URN3 and PICS_PSAP_B_SDP_ALA1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIncomingCalls
        }
@@ -103,7 +103,7 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "application/sdp",
                        Body containing
                            SDP_ALAW
@@ -126,7 +126,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and E_SIP_URN3 and B_SDP_ALA1 and S_SIP_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_E_SIP_URN3 and PICS_PSAP_B_SDP_ALA1 and PICS_PSAP_S_SIP_REGISTRATION
        Initial conditions with {
            the IUT entity isRegistered to the ESRP entity and
            the IUT entity acceptingIncomingCalls
@@ -135,7 +135,7 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "application/sdp",
                        Body containing
                            SDP_ALAW
@@ -158,7 +158,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_TCP1 and E_SIP_URN3 and B_SDP_ULA1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_TCP1 and PICS_PSAP_E_SIP_URN3 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIncomingCalls
        }
@@ -166,7 +166,7 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "application/sdp",
                        Body containing
                            SDP_ULAW
@@ -189,7 +189,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_TCP1 and E_SIP_URN1 and B_SDP_ULA1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_TCP1 and PICS_PSAP_E_SIP_URN1 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIncomingCalls
        }
@@ -197,7 +197,7 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "multipart/mixed",
                        Body containing
                            SDP_AND_PIDF_MULTIPART
@@ -219,7 +219,7 @@ Package NG112_PSAP {
            "Next Generation 112 LTD [2], clause 4.7",
            "RFC3261 [6]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and A_SIP_BSC1 and B_SDP_ULA1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_A_SIP_BSC1 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIncomingCalls
        }
@@ -251,7 +251,7 @@ Package NG112_PSAP {
            "RFC5301 [7]",
            "RFC6442 [10]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and E_SIP_URN3 and B_SDP_ULA1 and S_SIP_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_E_SIP_URN3 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_REGISTRATION
        Initial conditions with {
            the IUT entity isRegistered to the ESRP entity and
            the IUT entity acceptingIncomingCalls
@@ -260,8 +260,8 @@ Package NG112_PSAP {
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Geolocation indicating value PX_GEOLOCATION, //"cid:target@example.com"
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Geolocation indicating value PX_GEOLOCATION,
                        Content_Type indicating value "multipart/mixed",
                        Body containing
                            SDP_AND_PIDF_MULTIPART
@@ -284,7 +284,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_UDP1 and E_SIP_URN3 and  S_SIP_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_E_SIP_URN3 and  PICS_PSAP_S_SIP_REGISTRATION
        Initial conditions with {
            the IUT entity isRegistered to the ESRP entity and
            the IUT entity acceptingIncomingCalls
@@ -312,7 +312,7 @@ Package NG112_PSAP {
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_TCP1 and E_SIP_URN1 and B_SDP_ULA1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_BYE1 and PICS_PSAP_S_SIP_TCP1 and PICS_PSAP_E_SIP_URN1 and PICS_PSAP_B_SDP_ULA1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity inAnActiveIncomingCall
        }
@@ -337,7 +337,7 @@ Reference
    "RFC3261 [6]",
    "RFC5301 [7]"
Config Id CFG_PSAP_01
PICS Selection S_SIP_TCP1 and E_SIP_URN1 and B_SDP_ULA1
PICS Selection PICS_PSAP_S_SIP_BYE1 and PICS_PSAP_S_SIP_TCP1 and PICS_PSAP_E_SIP_URN1 and PICS_PSAP_B_SDP_ULA1
Initial conditions with {
    the IUT entity inAnActiveIncomingCall
}
@@ -361,7 +361,7 @@ Expected behaviour
            "Next Generation 112 LTD [2], clause 4.7",
            "RFC3261 [6]"
        Config Id CFG_PSAP_01
        PICS Selection M_SIP_URN1 and S_SIP_REGISTRATION
        PICS Selection PICS_PSAP_M_SIP_URN1 and PICS_PSAP_S_SIP_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIM
        }
@@ -369,7 +369,8 @@ Expected behaviour
            ensure that {
                when {
                    the IUT entity receives a SIP_MESSAGE containing
                        Request_URI indicating value PX_SERVICE_URN ; //"urn:service:sos.police", 
                        Request_URI indicating value PX_PSAP_SERVICE_URN
                        ;
                }
                then {
                    the IUT entity sends a SIP_200OK_MESSAGE
@@ -386,7 +387,7 @@ Expected behaviour
            "Next Generation 112 LTD [2], clause 4.7",
            "RFC3261 [6]"
        Config Id CFG_PSAP_01
        PICS Selection M_SIP_URN1 and S_SIP_REGISTRATION
        PICS Selection PICS_PSAP_E_SIP_URN2 and PICS_PSAP_S_SIP_REGISTRATION
        Initial conditions with {
            the IUT entity acceptingIM
        }
@@ -394,9 +395,9 @@ Expected behaviour
            ensure that {
                when {
                    the IUT entity receives a SIP_MESSAGE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Geolocation indicating value PX_GEOLOCATION, //"cid:target@example.com"
                        Call_Info indicating value PX_CALL_INFO; //"urn:emergency:uid:callid:..."
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Geolocation indicating value PX_GEOLOCATION,
                        Call_Info indicating value PX_CALL_INFO;
                }
                then {
                    the IUT entity sends a SIP_200OK_MESSAGE
@@ -413,7 +414,7 @@ Expected behaviour
            "Next Generation 112 LTD [2], clause 4.7",
            "RFC3261 [6]"
        Config Id CFG_PSAP_01
        PICS Selection S_SIP_OPT1 and S_SIP_NO_REGISTRATION
        PICS Selection PICS_PSAP_S_SIP_OPT1 and PICS_PSAP_S_SIP_NO_REGISTRATION
        Initial conditions with {
            the IUT entity isDisconnected
        }
@@ -436,7 +437,7 @@ Reference
    "Next Generation 112 LTD [2], clause 4.7",
    "RFC3261 [6]"
Config Id CFG_PSAP_01
PICS Selection S_SIP_UDP1 and A_SIP_BSC1 and B_SDP_ULA1
PICS Selection PICS_PSAP_S_SIP_UDP1 and PICS_PSAP_A_SIP_BSC1 and PICS_PSAP_B_SDP_ULA1
Initial conditions with {
    the IUT entity acceptingIncomingCalls
}
@@ -462,7 +463,7 @@ Reference
    "RFC3261 [6]",
    "RFC5301 [7]"
Config Id CFG_PSAP_01
PICS Selection S_SIP_TCP1 and E_SIP_URN1 and B_SDP_ULA1
PICS Selection PICS_PSAP_S_SIP_TCP1 and PICS_PSAP_E_SIP_URN1 and PICS_PSAP_B_SDP_ULA1
Initial conditions with {
    the IUT entity inAnActiveIncomingCall
}
@@ -488,7 +489,7 @@ Expected behaviour
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_03
        PICS Selection S_HTTP_DEQUEUE_REGISTRATION
        PICS Selection PICS_PSAP_S_HTTP_DEQUEUE_REGISTRATION
        Initial conditions with {
            the IUT entity isDisconnected
        }
@@ -503,9 +504,9 @@ Expected behaviour
                        Content_type indicating value "application/json",
                        Body containing
                            JsonMessage containing
                                DequeueRegistrationQueueUri indicating value "{DQ_SIP_URL}",
                                DequeueRegistrationDequeuer indicating value "{PSAP_SIP_URL}",
                                DequeueRegistrationExpirationTime indicating value "{DQ_EXPIRY_TIME}" // {DQ_EXPIRY_TIME} is not 0
                                DequeueRegistrationQueueUri indicating value PX_PSAP_DQ_SIP_URL,
                                DequeueRegistrationDequeuer indicating value PX_PSAP_DQR_SIP_URL,
                                DequeueRegistrationExpirationTime indicating value PX_PSAP_DQ_EXPIRY_TIME
                            ;
                        ;
                    ;
@@ -515,9 +516,9 @@ Expected behaviour
                        From indicating value "{ESRP SIP URI}",
                        Body containing
                            JsonMessage containing
                                DequeueRegistrationQueueUri indicating value "{DQ_SIP_URL}",
                                DequeueRegistrationDequeuer indicating value "{PSAP_SIP_URL}",
                                DequeueRegistrationExpirationTime indicating value "{DQ_EXPIRY_TIME}" // {DQ_EXPIRY_TIME} is not 0
                                DequeueRegistrationQueueUri indicating value PX_PSAP_DQ_SIP_URL,
                                DequeueRegistrationDequeuer indicating value PX_PSAP_DQR_SIP_URL,
                                DequeueRegistrationExpirationTime indicating value PX_PSAP_DQ_EXPIRY_TIME
                            ;
                        ;
                    ;
@@ -527,9 +528,9 @@ Expected behaviour
                        From indicating value "{PSAP SIP URI}",
                        Body containing
                            JsonMessage containing
                                DequeueRegistrationQueueUri indicating value "{DQ_SIP_URL}",
                                DequeueRegistrationDequeuer indicating value "{PSAP_SIP_URL}",
                                DequeueRegistrationExpirationTime indicating value "{DQ_EXPIRY_TIME}" // {DQ_EXPIRY_TIME} is not 0
                                DequeueRegistrationQueueUri indicating value PX_PSAP_DQ_SIP_URL,
                                DequeueRegistrationDequeuer indicating value PX_PSAP_DQR_SIP_URL,
                                DequeueRegistrationExpirationTime indicating value PX_PSAP_DQ_EXPIRY_TIME
                            ;
                        ;
                    ;
@@ -549,7 +550,7 @@ Expected behaviour
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_02
        PICS Selection S_HTTP_DEQUEUE_REGISTRATION
        PICS Selection PICS_PSAP_S_HTTP_DEQUEUE_REGISTRATION
        Initial conditions with {
            the IUT entity isConnected and
            the IUT entity isRegistered
@@ -558,7 +559,7 @@ Expected behaviour
            ensure that {
                when {
                    the IUT entity receives a SIP_INVITE containing
                        Request_URI indicating value PX_SERVICE_URN, //"urn:service:sos.police",
                        Request_URI indicating value PX_PSAP_SERVICE_URN,
                        Content_Type indicating value "application/sdp"
                    ;
                }
@@ -579,7 +580,7 @@ Expected behaviour
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_03
        PICS Selection S_HTTP_DEQUEUE_REGISTRATION
        PICS Selection PICS_PSAP_S_HTTP_DEQUEUE_REGISTRATION
        Initial conditions with {
            the IUT entity isConnected
        }
@@ -594,9 +595,9 @@ Expected behaviour
                        Content_type indicating value "application/json",
                        Body containing
                            JsonMessage containing
                                DequeueRegistrationQueueUri indicating value "{DQ_SIP_URL}",
                                DequeueRegistrationDequeuer indicating value "{PSAP_SIP_URL}",
                                DequeueRegistrationExpirationTime indicating value "0" // 0 for deregister
                                DequeueRegistrationQueueUri indicating value PX_PSAP_DQ_SIP_URL,
                                DequeueRegistrationDequeuer indicating value PX_PSAP_DQR_SIP_URL,
                                DequeueRegistrationExpirationTime indicating value "0"
                            ;
                        ;
                    ;
@@ -616,7 +617,7 @@ Expected behaviour
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_03
        PICS Selection S_HTTP_HELD
        PICS Selection PICS_PSAP_S_HTTP_HELD
        Initial conditions with {
            the IUT entity isConnected and
            the IUT entity isRegistered
@@ -660,7 +661,7 @@ Expected behaviour
            "RFC3261 [6]",
            "RFC5301 [7]"
        Config Id CFG_PSAP_03
        PICS Selection S_HTTP_LOST
        PICS Selection PICS_PSAP_S_HTTP_LOST
        Initial conditions with {
            the IUT entity isConnected and
            the IUT entity isRegistered
+26 −17
Original line number Diff line number Diff line
Package psap_commons {
    Domain {
            pics:
                - A_SIP_BSC1 //admin call
                - E_SIP_URN1 //em call with geolocation (value)
                - E_SIP_URN2 //em call with geolocation (token)
                - E_SIP_URN3 //em call without geolocation (id)
                - B_SDP_ULA1 //SDP with uLaw
                - B_SDP_ALA1 //SDP with uLaw
                - S_SIP_UDP1 //call via UDP
                - S_SIP_TCP1 //call via TCP
                - S_SIP_BYE1 //BYE handled
                - M_SIP_URN1 //SIP message with geolocation (value)
                - S_SIP_OPT1 //receive SIP OPTIONS - respond OK
                - S_SIP_NO_REGISTRATION // PSAP does not register to the ESRP
                - S_SIP_REGISTRATION // PSAP is registered to the ESRP
                - S_HTTP_DEQUEUE_REGISTRATION // PRF is used and PSAP shall register to an ESRP Dequeue
                - S_HTTP_HELD // Support of HELD
                - S_HTTP_LOST // Support of LOST
                - PICS_PSAP_A_SIP_BSC1 //admin call
                - PICS_PSAP_E_SIP_URN1 //em call with geolocation (value)
                - PICS_PSAP_E_SIP_URN2 //em call with geolocation (token)
                - PICS_PSAP_E_SIP_URN3 //em call without geolocation (id)
                - PICS_PSAP_B_SDP_ULA1 //SDP with uLaw
                - PICS_PSAP_B_SDP_ALA1 //SDP with uLaw
                - PICS_PSAP_S_SIP_UDP1 //call via UDP
                - PICS_PSAP_S_SIP_TCP1 //call via TCP
                - PICS_PSAP_S_SIP_BYE1 //BYE handled
                - PICS_PSAP_M_SIP_URN1 //SIP message with geolocation (value)
                - PICS_PSAP_S_SIP_OPT1 //receive SIP OPTIONS - respond OK
                - PICS_PSAP_S_SIP_NO_REGISTRATION // PSAP does not register to the ESRP
                - PICS_PSAP_S_SIP_REGISTRATION // PSAP is registered to the ESRP
                - PICS_PSAP_S_HTTP_DEQUEUE_REGISTRATION // PRF is used and PSAP shall register to an ESRP Dequeue
                - PICS_PSAP_S_HTTP_HELD // Support of HELD
                - PICS_PSAP_S_HTTP_LOST // Support of LOST
                ;
            entities:
                - IUT
@@ -131,7 +131,16 @@ Package psap_commons {
                with
                    "STATUS" of type Number
                ;
          // ######
          // PIXITS
          URI PX_PSAP_SERVICE_URN; // "urn:service:sos.police"
          String PX_PSAP_DQ_SIP_URL;
          String PX_PSAP_DQR_SIP_URL;
          String PX_PSAP_DQ_EXPIRY_TIME;
          String PX_GEOLOCATION; // "cid:target@example.com"
          String PX_CALL_INFO; // "urn:emergency:uid:callid:..."
        }
        
        Configuration {
            Interface Type defaultGT accepts SIP_INVITE, SIP_REGISTER, SIP_200OK_INVITE, SIP_200OK_BYE;
            Component Type NG112Comp with gate g of type defaultGT;