Commit 72901341 authored by garciay's avatar garciay
Browse files

STF519 Week #19:

- Remove FIXME
- Remove TODOs (39/43)
- Comments review
parent cfe84e93
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ module LibS1AP_Interface {
            var S1AP_PDU vc_recvS1AP_PDUDefault ; //global variable defined to save Dimeter message received within default altstep
            var S1AP_PDU vc_recvS1AP_PDUDefault ; //global variable defined to save Dimeter message received within default altstep
            
            
            // Init of values at component started
            // Init of values at component started
            // TODO: generation of following MME and ENB UE IDs can be done randomly in init
            // Note: generation of following MME and ENB UE IDs can be done randomly in init
            var MME_UE_S1AP_ID vc_MME_UE_ID         := 10;
            var MME_UE_S1AP_ID vc_MME_UE_ID         := 10;
            var ENB_UE_S1AP_ID vc_eNB_UE_ID         := 11;
            var ENB_UE_S1AP_ID vc_eNB_UE_ID         := 11;
            
            
+39 −45
Original line number Original line Diff line number Diff line
@@ -31,34 +31,6 @@ module LibS1AP_Steps {
     */
     */
    group commonFunctions {
    group commonFunctions {
    
    
        /**
         * @desc  Indicate if the provided value is greather or equal to 0
         * @return true if value of p_int greater than 0
         * @param p_int - integer value
         */
        function f_gtZero( // FIXME: Not used to be removed
                          in integer p_int
        ) return boolean {
            if (p_int > 0){
                return true;
            }
            else{
                return false;
            }
        } // End of function f_gtZero
        
        /**
         * @desc  Increment the provided value by one
         * @return incremented value of p_int 0
         * @param p_int - integer value
         */
        function f_inc( // FIXME: Not used to be removed
                       inout UInt32 p_int
        ) return UInt32 {
            p_int := p_int + 1;
            return p_int;
        } // End of function f_inc
        
    } // End of group commonFunctions
    } // End of group commonFunctions
    
    
    /**
    /**
@@ -77,13 +49,13 @@ module LibS1AP_Steps {
            vc_recvS1AP_PDU := p_PDU;
            vc_recvS1AP_PDU := p_PDU;
            
            
            if (ischosen(p_PDU.initiatingMessage)) {
            if (ischosen(p_PDU.initiatingMessage)) {
                //TODO...
                // Nothing to do
            }
            }
            if (ischosen(p_PDU.successfulOutcome)) {
            if (ischosen(p_PDU.successfulOutcome)) {
                //TODO...
                // Nothing to do
            }
            }
            if (ischosen(p_PDU.unsuccessfulOutcome)) {
            if (ischosen(p_PDU.unsuccessfulOutcome)) {
                 //TODO...
                 // Nothing to do
            }
            }
        } // End of function f_S1APPDU_Get
        } // End of function f_S1APPDU_Get
        
        
@@ -738,14 +710,14 @@ module LibS1AP_Steps {
        
        
        /**
        /**
        * @desc Receive S1AP Message HANDOVER_REQUIRED
        * @desc Receive S1AP Message HANDOVER_REQUIRED
        * @param p_value Receive template for UPLINK_NON_UE_ASSOCIATED_LPPA_TRANSPORT IEs
        * @param p_value Receive template for HandoverRequired IEs
        * @see ETSI TS 136 413 V13.4.0 Clause 9.1.5.1 HANDOVER_REQUIRED
        * @see ETSI TS 136 413 V13.4.0 Clause 9.1.5.1 HANDOVER_REQUIRED
        */
        */
        function f_recv_Handover_Required(
        function f_recv_Handover_Required(
                                          template (present) RecordOf_ProtocolIE p_value := ?
                                          template (present) RecordOf_ProtocolIE p_value := ?
        ) runs on S1APComponent {
        ) runs on S1APComponent {
            // TODO
            f_recv_HandoverCommand(p_value);
        } // End of f_recv_Uplink_Non_UE_Associated_Lppa_Transport
        } // End of f_recv_Handover_Required
        
        
        /**
        /**
        * @desc Receive S1AP Message UE Context Release Request
        * @desc Receive S1AP Message UE Context Release Request
@@ -942,15 +914,12 @@ module LibS1AP_Steps {
        ) runs on S1APComponent {
        ) runs on S1APComponent {
            
            
            if (ischosen(p_PDU.initiatingMessage)) {
            if (ischosen(p_PDU.initiatingMessage)) {
                //TODO...
                vc_sendS1AP_PDU:=valueof(p_PDU);
                vc_sendS1AP_PDU:=valueof(p_PDU);
            }
            }
            if (ischosen(p_PDU.successfulOutcome)) {
            if (ischosen(p_PDU.successfulOutcome)) {
                //TODO...
                vc_sendS1AP_PDU:=valueof(p_PDU);
                vc_sendS1AP_PDU:=valueof(p_PDU);
            }
            }
            if (ischosen(p_PDU.unsuccessfulOutcome)) {
            if (ischosen(p_PDU.unsuccessfulOutcome)) {
                 //TODO...
                 vc_sendS1AP_PDU:=valueof(p_PDU);
                 vc_sendS1AP_PDU:=valueof(p_PDU);
            }
            }
            
            
@@ -1416,7 +1385,32 @@ module LibS1AP_Steps {
         * @desc Initiate an Handover procedure
         * @desc Initiate an Handover procedure
         */
         */
        function f_initiate_handover() runs on S1APComponent {
        function f_initiate_handover() runs on S1APComponent {
            // TODO 
            // Local variables
            const Source_ToTarget_TransparentContainer c_source_ToTarget_TransparentContainer := '12121212'O;
            
            f_send_HandoverRequest(
                m_HandoverReqIEs(
                    vc_MME_UE_ID,
                    intralte,                               // Handover Type
                    m_cause_ran(
                        successful_handover
                    ),                                      // Cause
                    m_UEAggregateMaximumBitrate(1,1),       // UE Aggregate_Max_Bit_Rate
                    {
                        m_E_RABToBeSetupItemHOReq (
                            -,
                            -,
                            -,
                            m_e_RABlevelQoSParameters (5)
                        )
                    },                                      // E_RabsToBeSetupList
                    c_source_ToTarget_TransparentContainer, // SourceToTargetTransparentContainer
                    m_UESecurityCapabilities(
                        '0101010101010101'B,
                        '0101010101010101'B
                    ),                                      // UeSecurityCapabilities
                    m_securityContext                       // SecurityContext
            ));
        } // End of function f_initiate_handover
        } // End of function f_initiate_handover
        
        
        /**
        /**
@@ -1714,7 +1708,7 @@ module LibS1AP_Steps {
             */
             */
            function f_preambleS1AP_MME()
            function f_preambleS1AP_MME()
            runs on S1APComponent {
            runs on S1APComponent {
                //TODO:...        
                // Nothing to do
            } // End of function f_preambleS1AP_MME
            } // End of function f_preambleS1AP_MME
            
            
            /**
            /**
@@ -1723,7 +1717,7 @@ module LibS1AP_Steps {
             */
             */
            function f_preambleS1AP_eNB()
            function f_preambleS1AP_eNB()
            runs on S1APComponent {
            runs on S1APComponent {
                //TODO:...        
                // Nothing to do
            } // End of function f_preambleS1AP_eNB
            } // End of function f_preambleS1AP_eNB
            
            
        } // End of group preamble_S1AP
        } // End of group preamble_S1AP
@@ -1740,7 +1734,7 @@ module LibS1AP_Steps {
             */
             */
            function f_postambleS1AP_MME()
            function f_postambleS1AP_MME()
            runs on S1APComponent {
            runs on S1APComponent {
                // TODO:...
                // Nothing to do
            } // End of function f_postambleS1AP_MME
            } // End of function f_postambleS1AP_MME
            
            
            /**
            /**
@@ -1749,7 +1743,7 @@ module LibS1AP_Steps {
             */
             */
            function f_postambleS1AP_eNB()
            function f_postambleS1AP_eNB()
            runs on S1APComponent {
            runs on S1APComponent {
                // TODO:...
                // Nothing to do
            } // End of function f_postambleS1AP_eNB
            } // End of function f_postambleS1AP_eNB
            
            
        } // End of group postamble_S1AP
        } // End of group postamble_S1AP
@@ -1870,7 +1864,7 @@ module LibS1AP_Steps {
                    stop;
                    stop;
                }
                }
            }
            }
            // TODO:...
            // Note: possible unscollicited messages should be filtered
        } // End of altstep a_defaultS1AP_MME
        } // End of altstep a_defaultS1AP_MME
        
        
        altstep a_defaultS1AP_eNB()
        altstep a_defaultS1AP_eNB()
@@ -1884,7 +1878,7 @@ module LibS1AP_Steps {
                    stop;
                    stop;
                }
                }
            }
            }
            // TODO:...
            // Note: possible unscollicited messages should be filtered
        } // End of altstep a_defaultS1AP_eNB
        } // End of altstep a_defaultS1AP_eNB
        
        
    } // End of group defaultsTestStep
    } // End of group defaultsTestStep
+73 −53

File changed.

Preview size limit exceeded, changes collapsed.

+23 −36
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ module S1AP_TCFunctions {
             */
             */
            function f_TC_S1AP_eNB_RAB_04() runs on S1APComponent { 
            function f_TC_S1AP_eNB_RAB_04() runs on S1APComponent { 
                // Local variables
                // Local variables
                const QCI c_qci_id := 1; // TODO
                const QCI c_qci_id := 1; 
                
                
                // Preamble
                // Preamble
                f_S1AP_enb_init();
                f_S1AP_enb_init();
@@ -226,7 +226,7 @@ module S1AP_TCFunctions {
             */
             */
            function f_TC_S1AP_eNB_RAB_05() runs on S1APComponent { 
            function f_TC_S1AP_eNB_RAB_05() runs on S1APComponent { 
                // Local variables
                // Local variables
                const QCI c_qci_id := 1; // TODO
                const QCI c_qci_id := 1;
    
    
                // Preamble
                // Preamble
                f_S1AP_enb_init();
                f_S1AP_enb_init();
@@ -533,7 +533,7 @@ module S1AP_TCFunctions {
             */
             */
            function f_TC_S1AP_eNB_RAB_11 () runs on S1APComponent { 
            function f_TC_S1AP_eNB_RAB_11 () runs on S1APComponent { 
                // Local variables
                // Local variables
                const QCI c_qci_id := 1; // TODO
                const QCI c_qci_id := 1; 
                const E_RAB_ID c_E_RAB_ID_A := 0;
                const E_RAB_ID c_E_RAB_ID_A := 0;
                const NAS_PDU c_nAS_PDU := '0000'O;
                const NAS_PDU c_nAS_PDU := '0000'O;
                
                
@@ -636,7 +636,7 @@ module S1AP_TCFunctions {
             */
             */
            function f_TC_S1AP_eNB_RAB_13  () runs on S1APComponent {
            function f_TC_S1AP_eNB_RAB_13  () runs on S1APComponent {
                // Local variables
                // Local variables
                const QCI c_qci_id := 99; // TODO unknown QCI Id 
                const QCI c_qci_id := 99; // Unknown QCI Id 
                const E_RAB_ID c_E_RAB_ID_A := 0;
                const E_RAB_ID c_E_RAB_ID_A := 0;
                const NAS_PDU c_nAS_PDU := '0000'O;
                const NAS_PDU c_nAS_PDU := '0000'O;
                
                
@@ -701,7 +701,6 @@ module S1AP_TCFunctions {
                        m_E_RABItem(
                        m_E_RABItem(
                            c_E_RAB_ID_A,
                            c_E_RAB_ID_A,
                            {
                            {
                                // TODO
                                radioNetwork :=not_supported_QCI_value
                                radioNetwork :=not_supported_QCI_value
                            }
                            }
                        )
                        )
@@ -748,7 +747,6 @@ module S1AP_TCFunctions {
                        m_E_RABItem(
                        m_E_RABItem(
                            c_E_RAB_ID_A,
                            c_E_RAB_ID_A,
                            {
                            {
                                // TODO
                                radioNetwork :=not_supported_QCI_value
                                radioNetwork :=not_supported_QCI_value
                            }
                            }
                        )
                        )
@@ -795,7 +793,6 @@ module S1AP_TCFunctions {
                        m_E_RABItem(
                        m_E_RABItem(
                            c_E_RAB_ID_A,
                            c_E_RAB_ID_A,
                            {
                            {
                                // TODO 
                                radioNetwork :=not_supported_QCI_value
                                radioNetwork :=not_supported_QCI_value
                            }
                            }
                        )
                        )
@@ -930,14 +927,12 @@ module S1AP_TCFunctions {
                        m_E_RABItem(
                        m_E_RABItem(
                            c_E_RAB_ID_A,
                            c_E_RAB_ID_A,
                            {
                            {
                                // TODO 
                                radioNetwork :=not_supported_QCI_value
                                radioNetwork :=not_supported_QCI_value
                            }
                            }
                        ),
                        ),
                        m_E_RABItem(
                        m_E_RABItem(
                            c_E_RAB_ID_A,
                            c_E_RAB_ID_A,
                            {
                            {
                                // TODO 
                                radioNetwork :=not_supported_QCI_value
                                radioNetwork :=not_supported_QCI_value
                            }
                            }
                        )
                        )
@@ -982,7 +977,6 @@ module S1AP_TCFunctions {
                        m_E_RABItem(
                        m_E_RABItem(
                            c_E_RAB_ID_A,
                            c_E_RAB_ID_A,
                            {
                            {
                                // TODO 
                                radioNetwork :=not_supported_QCI_value
                                radioNetwork :=not_supported_QCI_value
                            }
                            }
                        )
                        )
@@ -2552,9 +2546,8 @@ module S1AP_TCFunctions {
                                PX_PLMN_IDENTITY, 
                                PX_PLMN_IDENTITY, 
                                PX_CELL_ID
                                PX_CELL_ID
                            ),
                            ),
                            mw_cause_ran(
                            mw_cause_ran
                                - // TODO To be refined
                    ));
                    )));
                }
                }
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                
                
@@ -2590,9 +2583,8 @@ module S1AP_TCFunctions {
                            PX_PLMN_IDENTITY, 
                            PX_PLMN_IDENTITY, 
                            PX_CELL_ID
                            PX_CELL_ID
                        ),
                        ),
                        mw_cause_ran(
                        mw_cause_ran
                            - // TODO To be refined 
                ));
                )));
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                
                
@@ -2652,7 +2644,7 @@ module S1AP_TCFunctions {
                            vc_eNB_UE_ID,
                            vc_eNB_UE_ID,
                            -,
                            -,
                            mw_cause_ran(
                            mw_cause_ran(
                                unspecified // TODO Check the value to be used
                                unspecified // Check the value to be used
                            )
                            )
                    ));
                    ));
                }
                }
@@ -2689,7 +2681,7 @@ module S1AP_TCFunctions {
                f_send_Reset(
                f_send_Reset(
                    m_resetIEs(
                    m_resetIEs(
                        m_cause_nas(
                        m_cause_nas(
                            unspecified // TODO Check the value to be used
                            unspecified // Check the value to be used
                        ),
                        ),
                        m_resetType_all
                        m_resetType_all
                ));
                ));
@@ -2733,7 +2725,7 @@ module S1AP_TCFunctions {
                    f_recv_Reset(
                    f_recv_Reset(
                        mw_resetIEs(
                        mw_resetIEs(
                            mw_cause_nas(
                            mw_cause_nas(
                                unspecified // TODO Check the value to be used
                                unspecified // Check the value to be used
                            ),
                            ),
                            m_resetType_all
                            m_resetType_all
                    ));
                    ));
@@ -2762,7 +2754,7 @@ module S1AP_TCFunctions {
                f_send_Reset(
                f_send_Reset(
                    m_resetIEs(
                    m_resetIEs(
                        m_cause_nas(
                        m_cause_nas(
                            unspecified // TODO Check the value to be used
                            unspecified // Check the value to be used
                        ),
                        ),
                        m_resetType_partOfS1_Interface(
                        m_resetType_partOfS1_Interface(
                            {
                            {
@@ -3092,8 +3084,7 @@ module S1AP_TCFunctions {
                    f_recv_eNB_UE_Capability_Info_Indication(
                    f_recv_eNB_UE_Capability_Info_Indication(
                        mw_uE_Capability_Info_IndicationIEs(
                        mw_uE_Capability_Info_IndicationIEs(
                            vc_MME_UE_ID,
                            vc_MME_UE_ID,
                            vc_eNB_UE_ID,
                            vc_eNB_UE_ID
                            - // TODO To be refined
                    ));
                    ));
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                }
                }
@@ -3142,8 +3133,7 @@ module S1AP_TCFunctions {
                    mw_trace_Failure_IndicationIEs(
                    mw_trace_Failure_IndicationIEs(
                        vc_MME_UE_ID,
                        vc_MME_UE_ID,
                        vc_eNB_UE_ID,
                        vc_eNB_UE_ID,
                        PX_EUTRAN_TRACE_ID,
                        PX_EUTRAN_TRACE_ID
                        - // TODO To be refined
                ));
                ));
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                
                
@@ -3182,8 +3172,7 @@ module S1AP_TCFunctions {
                    mw_trace_Failure_IndicationIEs(
                    mw_trace_Failure_IndicationIEs(
                        vc_MME_UE_ID,
                        vc_MME_UE_ID,
                        vc_eNB_UE_ID,
                        vc_eNB_UE_ID,
                        PX_EUTRAN_TRACE_ID,
                        PX_EUTRAN_TRACE_ID
                        - // TODO To be refined
                ));
                ));
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                
                
@@ -3217,8 +3206,7 @@ module S1AP_TCFunctions {
                        vc_MME_UE_ID,
                        vc_MME_UE_ID,
                        vc_eNB_UE_ID,
                        vc_eNB_UE_ID,
                        PX_EUTRAN_TRACE_ID,
                        PX_EUTRAN_TRACE_ID,
                        mw_eUTRAN_CGI,
                        mw_eUTRAN_CGI
                        - // TODO To be refined
                ));
                ));
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                
                
@@ -3418,7 +3406,7 @@ module S1AP_TCFunctions {
                    mw_location_Report_Failure_IndicationIEs(
                    mw_location_Report_Failure_IndicationIEs(
                        vc_MME_UE_ID,
                        vc_MME_UE_ID,
                        vc_eNB_UE_ID,
                        vc_eNB_UE_ID,
                        ? // TODO To be refined: what kind of cause :-(
                        ?
                ));
                ));
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                
                
@@ -4746,8 +4734,7 @@ module S1AP_TCFunctions {
                            mw_uEPagingID_iMSI(
                            mw_uEPagingID_iMSI(
                                PX_IMSI
                                PX_IMSI
                            ),
                            ),
                            PX_CNDOMAIN,
                            PX_CNDOMAIN
                            - // TODO To be refined
                    ));
                    ));
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                }
                }
@@ -4868,7 +4855,7 @@ module S1AP_TCFunctions {
                    f_recv_Reset(
                    f_recv_Reset(
                        mw_resetIEs(
                        mw_resetIEs(
                            mw_cause_nas(
                            mw_cause_nas(
                                unspecified // TODO Check the value to be used
                                unspecified // Check the value to be used
                            ),
                            ),
                            m_resetType_all
                            m_resetType_all
                    ));
                    ));
@@ -4897,7 +4884,7 @@ module S1AP_TCFunctions {
                f_send_Reset(
                f_send_Reset(
                    m_resetIEs(
                    m_resetIEs(
                        m_cause_nas(
                        m_cause_nas(
                            unspecified // TODO Check the value to be used
                            unspecified // Check the value to be used
                        ),
                        ),
                        m_resetType_all
                        m_resetType_all
                ));
                ));
@@ -4935,7 +4922,7 @@ module S1AP_TCFunctions {
                f_send_Reset(
                f_send_Reset(
                    m_resetIEs(
                    m_resetIEs(
                        m_cause_nas(
                        m_cause_nas(
                            unspecified // TODO Check the value to be used
                            unspecified // Check the value to be used
                        ),
                        ),
                        m_resetType_all
                        m_resetType_all
                ));
                ));
@@ -5314,7 +5301,7 @@ module S1AP_TCFunctions {
                            vc_MME_UE_ID,
                            vc_MME_UE_ID,
                            vc_eNB_UE_ID,
                            vc_eNB_UE_ID,
                            {
                            {
                                mw_eRABDataForwardingItem // TODO To be refined
                                mw_eRABDataForwardingItem
                            },
                            },
                            PX_CDMA200_PDU,
                            PX_CDMA200_PDU,
                            PX_CDMA200_RAT_TYPE
                            PX_CDMA200_RAT_TYPE
+1 −5
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@
 *                 All rights reserved.
 *                 All rights reserved.
 *    @see      ETSI TS 136 413 / 3GPP TS 36.413 version 13.4.0 Release 13
 *    @see      ETSI TS 136 413 / 3GPP TS 36.413 version 13.4.0 Release 13
 */
 */
module S1AP_Templates {
module S1AP_Templates { // TODO Remove this file, it seems to be useless
    
    
    group S1AP_PDU {
    group S1AP_PDU {
        
        
@@ -44,8 +44,6 @@ module S1AP_Templates {
                    
                    
                } //End group HandoverResourceAllocation
                } //End group HandoverResourceAllocation
                
                
                //TODO: Other....
                
            } // End of group Send
            } // End of group Send
            
            
            group Receive {
            group Receive {
@@ -58,8 +56,6 @@ module S1AP_Templates {
                    
                    
                }//End group HandoverResourceAllocation
                }//End group HandoverResourceAllocation
                
                
                //TODO: Other....
                
            } // End of group Receive
            } // End of group Receive
            
            
        } //End of group Class1
        } //End of group Class1
Loading