Commit 720bb3dc authored by Steffen Ludtke's avatar Steffen Ludtke
Browse files

Merge branch 'TTF016' of https://forge.etsi.org/rep/int/vxlte/sccas-con into TTF016

parents a3fad054 27a749e6
Loading
Loading
Loading
Loading
+63 −273
Original line number Original line Diff line number Diff line
@@ -29,16 +29,7 @@ module AtsSccas_PIXITS {


    group SUT {
    group SUT {


        group SUT_UE {
        // TODO - SUT_UE1 PIXITS to be removed
          /** @desc charstring for SUT - UE IP address to exchange SIP messages - connection point for PCSCF
            */
          modulepar charstring  PX_IMS_SUT_UE_IPADDR := "10.100.0.6";

          /** @desc	integer for SUT - UE port number to exchange SIP messages - connection point for PCSCF
            */
          modulepar integer	  PX_IMS_SUT_UE_PORT := 5060;
        } // End of group SUT_UE1

        group SUT_UE1 {
        group SUT_UE1 {
          /** @desc charstring for SUT - PCSCF1 IP address to exchange SIP messages - connection point for UE1
          /** @desc charstring for SUT - PCSCF1 IP address to exchange SIP messages - connection point for UE1
            */
            */
@@ -88,209 +79,7 @@ module AtsSccas_PIXITS {
          modulepar charstring  PX_IMS_SUT_UE1_DISPLAY := "alice-05@plugtest.net";
          modulepar charstring  PX_IMS_SUT_UE1_DISPLAY := "alice-05@plugtest.net";
        } // End of group SUT_UE1
        } // End of group SUT_UE1


        group SUT_UE2 {
        // TODO - SUT_SCSCF PIXITS to be removed when will be replaced in ATS code with TS SCSCF
          /** @desc	charstring for SUT - PCSCF2 IP address to exchange SIP messages - connection point for UE2
            */
          modulepar charstring  PX_IMS_SUT_PCSCF2_IPADDR := "esrp1.frequentis.plugtests.net";

          /** @desc	integer for SUT - PCSCF2 port number to exchange SIP messages - connection point for UE2
            */
          modulepar integer	    PX_IMS_SUT_PCSCF2_PORT := 5060;

          /** @desc	charstring for SUT/PCSCF2 domain - connection point for UE2
            */
          modulepar charstring  PX_IMS_SUT_PCSCF2_HOME_DOMAIN := "plugtests.net";

          /** @desc	charstring for IP address used by the TS to exchange media streams for UE2
            */
          modulepar charstring  PX_IMS_SUT_UE2_BEARER_IPADDR := "esrp1.frequentis.plugtests.net";

          /** @desc	charstring for identity of the tester UE2 local domain
            */
          modulepar charstring  PX_IMS_SUT_UE2_HOME_DOMAIN := "plugtests.net";

          /** @desc	charstring for identity of the tester UE2 local user
            */
          modulepar charstring  PX_IMS_SUT_UE2_PUBLIC_USER := "2910";

          /** @desc	charstring for RFC 2617 clause 3-2-2 username of UE2:
            * The name of user in the specified realm
            */
          modulepar charstring PX_IMS_SUT_UE2_PRIVAT_USERNAME := "abcd";

          /** @desc	charstring for RFC 2617 clause 3-2-2-2 passwd: A known shared secret, the password of user of the specified username of UE2
            */
          modulepar charstring PX_IMS_SUT_UE2_PRIVAT_PASSWD := "1234";
          
          /** @desc	charstring for RFC 2617 clause 3-2-1 qop options UE2:
            * Quoted string of one or more tokens indicating the "quality of protection" values supported by the server, the
            * value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.
            */
          modulepar charstring PX_IMS_SUT_UE2_QOP := "auth";
          
          /** @desc	charstring for home(SUT) REGISTRAR domain of UE2
            */
          modulepar charstring  PX_IMS_SUT_UE2_REGISTRAR := "plugtests.net";
        } // End of group SUT_UE2

        group SUT_UE3 {
          /** @desc	charstring for SUT - PCSCF3 IP address to exchange SIP messages - connection point for UE3
            */
          modulepar charstring  PX_IMS_SUT_PCSCF3_IPADDR := "172.31.10.2";

          /** @desc	integer for SUT - PCSCF3 port number to exchange SIP messages - connection point for UE3
            */
          modulepar integer	    PX_IMS_SUT_PCSCF3_PORT := 5060;

          /** @desc	charstring for SUT/PCSCF3 domain - connection point for UE3
            */
          modulepar charstring  PX_IMS_SUT_PCSCF3_HOME_DOMAIN := "pcscf3.home.net";

          /** @desc	charstring for IP address used by the TS to exchange media streams for UE3
            */
          modulepar charstring  PX_IMS_SUT_UE3_BEARER_IPADDR := "172.31.10.2";

          /** @desc	charstring for identity of the tester UE2 local domain
            */
          modulepar charstring  PX_IMS_SUT_UE3_HOME_DOMAIN := "sut.net";

          /** @desc	charstring for identity of the tester UE3 local user
            */
          modulepar charstring  PX_IMS_SUT_UE3_PUBLIC_USER := "2910";

          /** @desc	charstring for RFC 2617 clause 3-2-2 username of UE3:
            * The name of user in the specified realm
            */
          modulepar charstring PX_IMS_SUT_UE3_PRIVAT_USERNAME := "abcd";

          /** @desc	charstring for RFC 2617 clause 3-2-2-2 passwd: A known shared secret, the password of user of the specified username of UE3
            */
          modulepar charstring PX_IMS_SUT_UE3_PRIVAT_PASSWD := "1234";
          
          /** @desc	charstring for RFC 2617 clause 3-2-1 qop options UE3:
            * Quoted string of one or more tokens indicating the "quality of protection" values supported by the server, the
            * value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.
            */
          modulepar charstring PX_IMS_SUT_UE3_QOP := "auth";
          
          /** @desc	charstring for home(SUT) REGISTRAR domain of UE3
            */
          modulepar charstring  PX_IMS_SUT_UE3_REGISTRAR := "registrar.sut.net";
        } // End of group SUT_UE3

        group SUT_UE4 {//UE4 can be used as UE1Visited
          /** @desc	charstring for SUT - PCSCF4 IP address to exchange SIP messages - connection point for UE4
            */
          modulepar charstring  PX_IMS_SUT_PCSCF4_IPADDR := "172.31.10.2";

          /** @desc	integer for SUT - PCSCF4 port number to exchange SIP messages - connection point for UE4
            */
          modulepar integer	    PX_IMS_SUT_PCSCF4_PORT := 5060;

          /** @desc	charstring for SUT/PCSCF4 domain - connection point for UE4
            */
          modulepar charstring  PX_IMS_SUT_PCSCF4_HOME_DOMAIN := "pcscf4.home.net";

          /** @desc	charstring for IP address used by the TS to exchange media streams for UE4
            */
          modulepar charstring  PX_IMS_SUT_UE4_BEARER_IPADDR := "172.31.10.2";

          /** @desc	charstring for identity of the tester UE2 local domain
            */
          modulepar charstring  PX_IMS_SUT_UE4_HOME_DOMAIN := "sut.net";

          /** @desc	charstring for identity of the tester UE4 local user
            */
          modulepar charstring  PX_IMS_SUT_UE4_PUBLIC_USER := "2910";

          /** @desc	charstring for RFC 2617 clause 3-2-2 username of UE4:
            * The name of user in the specified realm
            */
          modulepar charstring PX_IMS_SUT_UE4_PRIVAT_USERNAME := "abcd";

          /** @desc	charstring for RFC 2617 clause 3-2-2-2 passwd: A known shared secret, the password of user of the specified username of UE2
            */
          modulepar charstring PX_IMS_SUT_UE4_PRIVAT_PASSWD := "1234";
          
          /** @desc	charstring for RFC 2617 clause 3-2-1 qop options UE4:
            * Quoted string of one or more tokens indicating the "quality of protection" values supported by the server, the
            * value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.
            */
          modulepar charstring PX_IMS_SUT_UE4_QOP := "auth";
          
          /** @desc	charstring for home(SUT) REGISTRAR domain of UE4
            */
          modulepar charstring  PX_IMS_SUT_UE4_REGISTRAR := "registrar.sut.net";
        } // End of group SUT_UE4

        group SUT_unknown {
          /** @desc	charstring for identity of unknown UE public user
            */
          modulepar charstring  PX_IMS_SUT_unknownUE_PUBLIC_USER := "0007";
        } // End of group SUT_unknown

        group EMERGENCY{
          /** @desc	charstring for identity of emergency service local domain
            */
          modulepar charstring  PX_IMS_SUT_EMERGENCY_HOME_DOMAIN := "plugtests.net";

          /** @desc	charstring for identity of the emergency service
            */
          modulepar charstring  PX_IMS_SUT_EMERGENCY_SERVICE := "112";

          /** @desc	charstring for identity of the invalid emergency service
            */
          modulepar charstring  PX_IMS_SUT_EMERGENCY_SERVICE_INVALID := "service.sos.invalid";
        } // End of group EMERGENCY service

        group SUT_IBCF {
          /** @desc	charstring for SUT/IBCF1 IP address to exchange SIP messages
            */
          modulepar charstring  PX_IMS_SUT_IBCF1_IPADDR := "172.31.10.5";	

          /** @desc	integer for SUT/IBCF1 port number to exchange SIP messages
            */
          modulepar integer	    PX_IMS_SUT_IBCF1_PORT := 5060;

          /** @desc	charstring for SUT/IBCF1 domain
            */
          modulepar charstring  PX_IMS_SUT_IBCF1_HOME_DOMAIN := "ibcf1.sut.net";

          /** @desc	charstring for SUT/IBCF2 IP address to exchange SIP messages
            */
          modulepar charstring  PX_IMS_SUT_IBCF2_IPADDR := "172.31.10.6";

          /** @desc	integer for SUT/IBCF2 port number to exchange SIP messages
            */
          modulepar integer	    PX_IMS_SUT_IBCF2_PORT := 5060;

          /** @desc	charstring for SUT/IBCF2 domain
            */
          modulepar charstring  PX_IMS_SUT_IBCF2_HOME_DOMAIN := "ibcf2.sut.net";
        } // End of group SUT_IBCF

        group SUT_PCSCF {
          /** @desc	charstring for SUT/P-CSCF IP address to exchange SIP messages
            */
          modulepar charstring  PX_IMS_SUT_PCSCF_IPADDR := "172.31.10.2";	

          /** @desc	integer for SUT/P-CSCF port number to exchange SIP messages
            */
          modulepar integer	    PX_IMS_SUT_PCSCF_PORT := 5060;

          /** @desc	charstring for SUT/P-CSCFdomain
            */
          modulepar charstring  PX_IMS_SUT_PCSCF_HOME_DOMAIN := "pcscf.sut.net";

          /** @desc	charstring for SUT/P-CSCF P_VisitedNetwork ID header (see RFC3455) 
            */
          modulepar charstring  PX_IMS_SUT_PCSCF_VisitedNetworkID := "sut token";

          /** @desc	charstring for SUT/P-CSCF Min-SE header lower bound for the session refresh interval (see RFC4028) 
            */
          modulepar charstring  PX_IMS_SUT_PCSCF_MinSE := "100";
        } // End of group SUT_PCSCF

        group SUT_SCSCF {
        group SUT_SCSCF {
          /** @desc	charstring for SUT/S-CSCF IP address to exchange SIP messages
          /** @desc	charstring for SUT/S-CSCF IP address to exchange SIP messages
            */
            */
@@ -309,20 +98,7 @@ module AtsSccas_PIXITS {
          modulepar charstring  PX_IMS_SUT_SCSCF_REALM := "realm.scscf";
          modulepar charstring  PX_IMS_SUT_SCSCF_REALM := "realm.scscf";
        } // End of group SUT_SCSCF
        } // End of group SUT_SCSCF


        group SUT_ICSCF {
        //used for AS, TAS, SCC-AS
          /** @desc	charstring for SUT/I-CSCF IP address to exchange SIP messages
            */
          modulepar charstring  PX_IMS_SUT_ICSCF_IPADDR := "172.31.10.3";	

          /** @desc	integer for SUT/I-CSCF port number to exchange SIP messages
            */
          modulepar integer	    PX_IMS_SUT_ICSCF_PORT := 5060;

          /** @desc	charstring for SUT/I-CSCFdomain
            */
          modulepar charstring  PX_IMS_SUT_ICSCF_HOME_DOMAIN := "icscf.sut.net";
        } // End of group SUT_ICSCF

        group SUT_AS {
        group SUT_AS {
          /** @desc charstring for SUT - AS IP address to exchange SIP messages - connection point for SCSCF
          /** @desc charstring for SUT - AS IP address to exchange SIP messages - connection point for SCSCF
            */
            */
@@ -334,60 +110,74 @@ module AtsSccas_PIXITS {


          /** @desc	charstring for SUT/AS domain
          /** @desc	charstring for SUT/AS domain
            */
            */
          modulepar charstring  PX_IMS_SUT_AS_HOME_DOMAIN := "as.sut.net";
          modulepar charstring  PX_IMS_SUT_AS_HOME_DOMAIN := "as.domain.net";


        } // End of group SUT_AS
        } // End of group SUT_AS


        group SUT_IMGCF {
      } // End of group SUT 
            /** @desc	charstring for SUT/I-MGCF IP address to exchange SIP messages

    group TS {
        group TS_UE1 {
    
            /** @desc   charstring for IP address used by the UE1 to exchange SIP messages
             */
             */
            modulepar charstring  PX_IMS_SUT_IMGCF_IPADDR := "172.31.10.10";	
            modulepar charstring PX_IMS_TS_UE1_IPADDR := "172.172.1.1";
    
    
            /** @desc	integer for SUT/I-MGCF port number to exchange SIP messages
            /** @desc   integer for port number used by the UE1 to exchange SIP messages
             */
             */
            modulepar integer	    PX_IMS_SUT_IMGCF_PORT := 5060;
            modulepar integer PX_IMS_TS_UE1_PORT := 5060;
    
            /** @desc   charstring for home(TS) REGISTRAR domain
             */
            modulepar charstring PX_IMS_TS_UE1_REGISTRAR := "registrar.domain.net";

            /** @desc charstring for IP address used by the TS to exchange media streams for UE1
              */
            modulepar charstring  PX_IMS_TS_UE1_BEARER_IPADDR := "192.168.1.1";


            /** @desc	charstring for SUT/I-MGCFdomain
            /** @desc charstring for identity of the tester UE1 local domain 
              */
              */
            modulepar charstring  PX_IMS_SUT_IMGCF_HOME_DOMAIN := "imgcf.sut.net";
            modulepar charstring  PX_IMS_TS_UE1_HOME_DOMAIN := "domain.net";
        } // End of group SUT_IMGCF


        group SUT_CONF {
            /** @desc charstring for identity of the tester UE1 local user 
            /**
            * @desc
            *     charstring for SUT/conference IP address to exchange SIP messages
              */
              */
            modulepar charstring PX_IMS_SUT_CONF_IPADDR := "172.31.10.10";
            modulepar charstring  PX_IMS_TS_UE1_PUBLIC_USER := "alice-06";
            /**

            * @desc integer for SUT/conference port number to exchange SIP messages
            /** @desc charstring for RFC 2617 clause 3-2-2 username of UE1:
              * The name of user in the specified realm
              */
              */
            modulepar integer PX_IMS_SUT_CONF_PORT := 5060;
            modulepar charstring PX_IMS_TS_UE1_PRIVAT_USERNAME := "alice-06";
            /**

            * @desc charstring for SUT/conference domain
            /** @desc charstring for RFC 2617 clause 3-2-2-2 passwd of UE1: A known shared secret, the password of user of the specified username
              */
              */
            modulepar charstring PX_IMS_SUT_CONF_HOME_DOMAIN := "conf.sut.net";
            modulepar charstring PX_IMS_TS_UE1_PRIVAT_PASSWD := "alice-05@1234";
            /**
          
            * @desc charstring for conference factory URI name
            /** @desc charstring for RFC 2617 clause 3-2-1 qop options of UE1:
              * Quoted string of one or more tokens indicating the "quality of protection" values supported by the server; the
              * value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.
              */
              */
            modulepar charstring PX_IMS_SUT_CONF_FACTORY_NAME := "factory.uri.name";
            modulepar charstring PX_IMS_TS_UE1_QOP := "auth";
        } // End of group SUT_CONF


      } // End of group SUT 
            /** @desc charstring for UE1 display name
              */
            modulepar charstring  PX_IMS_TS_UE1_DISPLAY := "alice-05@domain.net";
    
    
 group ts_ue1 {
        } // End of group ts_ue1 
        
        
    /** @desc   charstring for IP address used by the UE1 to exchange SIP messages
        group TS_SCSCF {
            /** @desc charstring for TS/S-CSCF IP address to exchange SIP messages
              */
              */
    modulepar charstring PX_IMS_TS_UE1_IPADDR := "conftest.plugtests.net";
            modulepar charstring  PX_IMS_TS_SCSCF_IPADDR := "172.31.10.4";   


    /** @desc   integer for port number used by the UE1 to exchange SIP messages
            /** @desc integer for TS/S-CSCF port number to exchange SIP messages
              */
              */
    modulepar integer PX_IMS_TS_UE1_PORT := 5060;
            modulepar integer   PX_IMS_TS_SCSCF_PORT := 5090;


    /** @desc   charstring for visited(TS) REGISTRAR domain
            /** @desc charstring for TS/S-CSCFdomain
              */
              */
    modulepar charstring PX_IMS_TS_UE1_REGISTRAR := "plugtests.net";
            modulepar charstring  PX_IMS_TS_SCSCF_HOME_DOMAIN := "scscf.domain.net";


  } // End of group ts_ue1 
        } // End of group TS_SCSCF
      } //end group TS {


} // end module AtsSccas_PIXITS
} // end module AtsSccas_PIXITS
+80 −49

File changed.

Preview size limit exceeded, changes collapsed.

+80 −154

File changed.

Preview size limit exceeded, changes collapsed.

+64 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ module AtsSccas_Templates
            fcParams := p_fcParams
            fcParams := p_fcParams
        } // End of template m_fcValue
        } // End of template m_fcValue


        template FcValue mw_fcValue(
        template (present) FcValue mw_fcValue(
                                    template (present) charstring p_wildcard := ?,
                                    template (present) charstring p_wildcard := ?,
                                    template SemicolonParam_List p_fcParams := *
                                    template SemicolonParam_List p_fcParams := *
                                    ) := {
                                    ) := {
@@ -140,6 +140,28 @@ module AtsSccas_Templates
                    messageBody := p_mb
                    messageBody := p_mb
                }
                }
                group request_sent_Axel {
                group request_sent_Axel {

				template (omit) INVITE_Request m_sccas_invite_replaces(
															  in template(value) SipUrl p_requestUri,
															  in template(value) CallId p_callId,
															  in template(value) CSeq p_cSeq,
															  in template(value) From p_from,
															  in template(value) To p_to,
															  in template(value) LibSip_SIPTypesAndValues.Via p_via,
															  in template(value) LibSip_SIPTypesAndValues.Contact p_contact,
															  in template(omit) Require p_require := omit,
															  in template(omit) Route p_route := omit,
															  in template(omit) Supported p_supported := omit,
															  in template(value) MessageBody p_mb,
															  in template(omit) Replaces p_replaces := omit
				) modifies m_INVITE_Request_UE := {
					msgHeader := {
						contentLength := m_contentLength(f_MessageBodyLength(p_mb)),
						contentType := m_contentType(c_sdpApplication)
					},
					messageBody := p_mb
				}
				
                }
                }
            
            
                group request_sent_Steffen {
                group request_sent_Steffen {
@@ -393,6 +415,25 @@ module AtsSccas_Templates
                            },
                            },
                            messageBody := p_mb
                            messageBody := p_mb
                        }
                        }
                        group response_sent{
							template(value) Response m_Response_18XonINVITE_AS_Featurecaps(
								template(value) StatusLine_18x p_statusLine,
								template(value) CallId p_callId,
								template(value) CSeq p_cSeq,
								template(value) From p_from,
								template(value) To p_to,
								template(value) Via p_via,
								template(omit) Contact p_contact := omit,
								template(omit) FeatureCaps p_featureCaps := omit
                                                                          
							) modifies m_Response_18x_Base := {
								msgHeader := {
									contact := p_contact, // mandatory field due to 24 229 rel 7.9
									featureCaps   := p_featureCaps
								}
							}
                        
                        } //End of group response
                }
                }
                
                
                group request_sent_Yann {
                group request_sent_Yann {
@@ -486,6 +527,13 @@ module AtsSccas_Templates
                
                


                group request_receive_Axel {
                group request_receive_Axel {
                
				template(present) INVITE_Request mw_INVITE_Request_contact(
					template Contact p_contact
				) modifies mw_INVITE_Request_Base := {
					msgHeader := {contact := p_contact}
				}
				
                }
                }
            
            
                group request_receive_Steffen {
                group request_receive_Steffen {
@@ -718,6 +766,21 @@ module AtsSccas_Templates
								   },
								   },
								   messageBody := p_mb 
								   messageBody := p_mb 
				    } // End of template mw_sccas_MESSAGE_Request
				    } // End of template mw_sccas_MESSAGE_Request
				    
				    group response{
						template(present) Response mw_Response_PCV_FeatureCaps(
											template(present) StatusLine.statusCode p_statusCode := ?,
											template CallId p_callId,
											template CSeq p_cSeq,
											template(present) PChargingVector p_chargingVector := ?,
						                    template(omit) FeatureCaps p_featureCaps := omit
										) modifies mw_Response_StatusCode_Base := {
											msgHeader := {
												pChargingVector := p_chargingVector,
												featureCaps   := p_featureCaps
											}
										}
				    }
                }   
                }   
                group request_receive_Yann {
                group request_receive_Yann {
                }
                }
+4 −4
Original line number Original line Diff line number Diff line
@@ -313,7 +313,7 @@ module AtsSccas_Testcases
                f_cf_1IscUp(v_imsComponent_ueims);
                f_cf_1IscUp(v_imsComponent_ueims);
				
				
                //Start
                //Start
                f_IncCSeq(p_cSeq_s); v_imsComponent_ueims.start(f_TC_ISC_SCCAS_ORI_INV_02(p_cSeq_s));
                f_IncCSeq(p_cSeq_s); v_imsComponent_ueims.start(f_TC_ISC_SCCAS_ORI_INV_02_UE(p_cSeq_s));
				
				
                // synchronize both PTCs on 3 sychronization points
                // synchronize both PTCs on 3 sychronization points
                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});