Skip to content

Commit a3b791b

Browse files
rsarwadrsarwad
committed
Defined S1ap UE state in proto file and removed the enum definition
from s1ap_types.hpp Signed-off-by: Rashmi <[email protected]>
1 parent 42719e6 commit a3b791b

File tree

8 files changed

+48
-102
lines changed

8 files changed

+48
-102
lines changed

‎lte/gateway/c/core/oai/include/s1ap_types.hpp‎

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,6 @@ typedef struct s1ap_imsi_map_s {
5454
magma::proto_map_uint32_uint64_t mme_ueid2imsi_map;
5555
} s1ap_imsi_map_t;
5656

57-
enum s1_timer_class_s {
58-
S1AP_INVALID_TIMER_CLASS,
59-
S1AP_ENB_TIMER,
60-
S1AP_UE_TIMER
61-
};
62-
63-
/* Timer structure */
64-
struct s1ap_timer_t {
65-
long id; /* The timer identifier */
66-
long msec; /* The timer interval value in seconds */
67-
};
68-
6957
// The current s1 state of the MME relating to the specific eNB.
7058
enum mme_s1_enb_state_s {
7159
S1AP_INIT, /// The sctp association has been established but s1 hasn't been
@@ -76,61 +64,6 @@ enum mme_s1_enb_state_s {
7664
S1AP_SHUTDOWN /// The S1 state is being torn down due to sctp shutdown.
7765
};
7866

79-
enum s1_ue_state_s {
80-
S1AP_UE_INVALID_STATE,
81-
S1AP_UE_WAITING_CSR, ///< Waiting for Initial Context Setup Response
82-
S1AP_UE_HANDOVER, ///< Handover procedure triggered
83-
S1AP_UE_CONNECTED, ///< UE context ready
84-
S1AP_UE_WAITING_CRR, /// UE Context release Procedure initiated , waiting for
85-
/// UE context Release Complete
86-
};
87-
88-
typedef struct s1ap_handover_state_s {
89-
mme_ue_s1ap_id_t mme_ue_s1ap_id;
90-
uint32_t source_enb_id;
91-
uint32_t target_enb_id;
92-
enb_ue_s1ap_id_t source_enb_ue_s1ap_id : 24;
93-
enb_ue_s1ap_id_t target_enb_ue_s1ap_id : 24;
94-
sctp_stream_id_t source_sctp_stream_recv; ///< source eNB -> MME stream
95-
sctp_stream_id_t target_sctp_stream_recv; ///< target eNB -> MME stream
96-
sctp_stream_id_t source_sctp_stream_send; ///< MME -> source eNB stream
97-
sctp_stream_id_t target_sctp_stream_send; ///< MME -> target eNB stream
98-
e_rab_admitted_list_t e_rab_admitted_list;
99-
} s1ap_handover_state_t;
100-
101-
/** Main structure representing UE association over s1ap
102-
* Generated every time a new InitialUEMessage is received
103-
**/
104-
typedef struct ue_description_s {
105-
enum s1_ue_state_s s1_ue_state; ///< S1AP UE state
106-
107-
enb_ue_s1ap_id_t
108-
enb_ue_s1ap_id : 24; ///< Unique UE id over eNB (24 bits wide)
109-
mme_ue_s1ap_id_t mme_ue_s1ap_id; ///< Unique UE id over MME (32 bits wide)
110-
sctp_assoc_id_t sctp_assoc_id; ///< Assoc id of eNB which this UE is attached
111-
uint64_t comp_s1ap_id; ///< Unique composite UE id (sctp_assoc_id &
112-
///< enb_ue_s1ap_id)
113-
114-
/** SCTP stream on which S1 message will be sent/received.
115-
* During an UE S1 connection, a pair of streams is
116-
* allocated and is used during all the connection.
117-
* Stream 0 is reserved for non UE signalling.
118-
* @name sctp stream identifier
119-
**/
120-
/*@{*/
121-
sctp_stream_id_t sctp_stream_recv; ///< eNB -> MME stream
122-
sctp_stream_id_t sctp_stream_send; ///< MME -> eNB stream
123-
/*@}*/
124-
125-
// UE Context Release procedure guard timer
126-
struct s1ap_timer_t s1ap_ue_context_rel_timer;
127-
128-
// Handover status. We intentionally do not persist all of this state since
129-
// it's time sensitive; if the MME restarts during a HO procedure the RAN
130-
// will abort the procedure due to timeouts, rendering this state useless.
131-
s1ap_handover_state_t s1ap_handover_state;
132-
} ue_description_t;
133-
13467
// Map- Key:uint64_t, Data: pointer to protobuf object, UeDescription
13568
typedef magma::proto_map_s<uint64_t, magma::lte::oai::UeDescription*>
13669
map_uint64_ue_description_t;

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ void s1ap_remove_ue(s1ap_state_t* state, UeDescription* ue_ref) {
456456
ue_ref->enb_ue_s1ap_id(), ue_ref->mme_ue_s1ap_id(),
457457
enb_ref->enb_id);
458458

459-
ue_ref->set_s1_ue_state(S1AP_UE_INVALID_STATE);
459+
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_INVALID_STATE);
460460
if (ue_ref->s1ap_ue_context_rel_timer().id() != S1AP_TIMER_INACTIVE_ID) {
461461
s1ap_stop_timer(ue_ref->s1ap_ue_context_rel_timer().id());
462462
ue_ref->mutable_s1ap_ue_context_rel_timer()->set_id(S1AP_TIMER_INACTIVE_ID);

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_handlers.cpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ status_code_e s1ap_mme_handle_initial_context_setup_response(
10071007
} else {
10081008
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
10091009
}
1010-
ue_ref_p->set_s1_ue_state(S1AP_UE_CONNECTED);
1010+
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
10111011
message_p = DEPRECATEDitti_alloc_new_message_fatal(
10121012
TASK_S1AP, MME_APP_INITIAL_CONTEXT_SETUP_RSP);
10131013
MME_APP_INITIAL_CONTEXT_SETUP_RSP(message_p).ue_id =
@@ -1398,7 +1398,7 @@ status_code_e s1ap_mme_generate_ue_context_release_command(
13981398
}
13991399
if (rc == RETURNok) {
14001400
// Start timer to track UE context release complete from eNB
1401-
ue_ref_p->set_s1_ue_state(S1AP_UE_WAITING_CRR);
1401+
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_WAITING_CRR);
14021402
ue_ref_p->mutable_s1ap_ue_context_rel_timer()->set_id(s1ap_start_timer(
14031403
ue_ref_p->s1ap_ue_context_rel_timer().msec(), TIMER_REPEAT_ONCE,
14041404
handle_ue_context_rel_timer_expiry, mme_ue_s1ap_id));
@@ -1645,7 +1645,7 @@ status_code_e s1ap_mme_handle_ue_context_release_complete(
16451645
s1ap_imsi_map_t* imsi_map = get_s1ap_imsi_map();
16461646
imsi_map->mme_ueid2imsi_map.get(mme_ue_s1ap_id, &imsi64);
16471647

1648-
ue_ref_p->set_s1_ue_state(S1AP_UE_WAITING_CRR);
1648+
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_WAITING_CRR);
16491649
// We can safely remove UE context now and stop timer
16501650
s1ap_mme_release_ue_context(state, ue_ref_p, imsi64);
16511651

@@ -2261,11 +2261,11 @@ status_code_e s1ap_mme_handle_handover_failure(s1ap_state_t* state,
22612261
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
22622262
}
22632263

2264-
if (ue_ref_p->s1_ue_state() == S1AP_UE_HANDOVER) {
2264+
if (ue_ref_p->s1ap_ue_state() == magma::lte::oai::S1AP_UE_HANDOVER) {
22652265
// this effectively cancels the HandoverPreparation proecedure as we
22662266
// only send a HandoverCommand if the UE is in the S1AP_UE_HANDOVER
22672267
// state.
2268-
ue_ref_p->set_s1_ue_state(S1AP_UE_CONNECTED);
2268+
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
22692269
ue_ref_p->mutable_s1ap_handover_state()->Clear();
22702270
} else {
22712271
// Not a failure, but nothing for us to do.
@@ -2415,11 +2415,11 @@ status_code_e s1ap_mme_handle_handover_cancel(s1ap_state_t* state,
24152415
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
24162416
}
24172417

2418-
if (ue_ref_p->s1_ue_state() == S1AP_UE_HANDOVER) {
2418+
if (ue_ref_p->s1ap_ue_state() == magma::lte::oai::S1AP_UE_HANDOVER) {
24192419
// this effectively cancels the HandoverPreparation proecedure as we
24202420
// only send a HandoverCommand if the UE is in the S1AP_UE_HANDOVER
24212421
// state.
2422-
ue_ref_p->set_s1_ue_state(S1AP_UE_CONNECTED);
2422+
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
24232423
/* Free all the transport layer address pointers in ERAB admitted list
24242424
* before actually resetting the S1AP handover state
24252425
*/
@@ -2973,7 +2973,7 @@ status_code_e s1ap_mme_handle_handover_command(
29732973
}
29742974

29752975
// we're doing handover, update the ue state
2976-
ue_ref_p->set_s1_ue_state(S1AP_UE_HANDOVER);
2976+
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_HANDOVER);
29772977
ue_ref_p->mutable_s1ap_handover_state()->set_mme_ue_s1ap_id(
29782978
ho_command_p->mme_ue_s1ap_id);
29792979
ue_ref_p->mutable_s1ap_handover_state()->set_source_enb_id(
@@ -3163,7 +3163,8 @@ status_code_e s1ap_mme_handle_handover_notify(s1ap_state_t* state,
31633163
tgt_enb_ue_s1ap_id);
31643164
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
31653165
}
3166-
new_ue_ref_p->set_s1_ue_state(S1AP_UE_CONNECTED); // handover has completed
3166+
new_ue_ref_p->set_s1ap_ue_state(
3167+
magma::lte::oai::S1AP_UE_CONNECTED); // handover has completed
31673168
new_ue_ref_p->set_enb_ue_s1ap_id(tgt_enb_ue_s1ap_id);
31683169
// Will be allocated by NAS
31693170
new_ue_ref_p->set_mme_ue_s1ap_id(mme_ue_s1ap_id);
@@ -3422,7 +3423,7 @@ status_code_e s1ap_mme_handle_path_switch_request(
34223423
enb_ue_s1ap_id);
34233424
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
34243425
}
3425-
new_ue_ref_p->set_s1_ue_state(ue_ref_p->s1_ue_state());
3426+
new_ue_ref_p->set_s1ap_ue_state(ue_ref_p->s1ap_ue_state());
34263427
new_ue_ref_p->set_enb_ue_s1ap_id(enb_ue_s1ap_id);
34273428
// Will be allocated by NAS
34283429
new_ue_ref_p->set_mme_ue_s1ap_id(mme_ue_s1ap_id);
@@ -3826,7 +3827,7 @@ void s1ap_mme_release_ue_context(s1ap_state_t* state, UeDescription* ue_ref_p,
38263827
message_p->ittiMsgHeader.imsi = imsi64;
38273828
send_msg_to_task(&s1ap_task_zmq_ctx, TASK_MME_APP, message_p);
38283829

3829-
if (!(ue_ref_p->s1_ue_state() == S1AP_UE_WAITING_CRR)) {
3830+
if (!(ue_ref_p->s1ap_ue_state() == magma::lte::oai::S1AP_UE_WAITING_CRR)) {
38303831
OAILOG_ERROR(LOG_S1AP, "Incorrect S1AP UE state\n");
38313832
}
38323833
OAILOG_DEBUG_UE(LOG_S1AP, imsi64, "Removed S1AP UE " MME_UE_S1AP_ID_FMT "\n",

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_nas_procedures.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ status_code_e s1ap_mme_handle_initial_ue_message(s1ap_state_t* state,
160160

161161
OAILOG_DEBUG(LOG_S1AP, "Creating new UE Ref on S1ap");
162162

163-
ue_ref->set_s1_ue_state(S1AP_UE_WAITING_CSR);
163+
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_WAITING_CSR);
164164

165165
ue_ref->set_enb_ue_s1ap_id(enb_ue_s1ap_id);
166166
// Will be allocated by NAS
@@ -268,7 +268,7 @@ status_code_e s1ap_mme_handle_initial_ue_message(s1ap_state_t* state,
268268
"Initial UE Message- Duplicate ENB_UE_S1AP_ID. Ignoring the "
269269
"message, eNB UE S1AP ID:" ENB_UE_S1AP_ID_FMT
270270
"\n, mme UE s1ap ID: " MME_UE_S1AP_ID_FMT "UE state %u",
271-
enb_ue_s1ap_id, ue_ref->mme_ue_s1ap_id(), ue_ref->s1_ue_state());
271+
enb_ue_s1ap_id, ue_ref->mme_ue_s1ap_id(), ue_ref->s1ap_ue_state());
272272
}
273273

274274
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNok);
@@ -347,7 +347,7 @@ status_code_e s1ap_mme_handle_uplink_nas_transport(
347347
}
348348
}
349349

350-
if (ue_ref->s1_ue_state() != S1AP_UE_CONNECTED) {
350+
if (ue_ref->s1ap_ue_state() != magma::lte::oai::S1AP_UE_CONNECTED) {
351351
OAILOG_WARNING(LOG_S1AP,
352352
"Received S1AP UPLINK_NAS_TRANSPORT while UE in state != "
353353
"S1AP_UE_CONNECTED\n");
@@ -456,7 +456,7 @@ status_code_e s1ap_mme_handle_nas_non_delivery(s1ap_state_t* state,
456456
s1ap_imsi_map_t* imsi_map = get_s1ap_imsi_map();
457457
imsi_map->mme_ueid2imsi_map.get(mme_ue_s1ap_id, &imsi64);
458458

459-
if (ue_ref->s1_ue_state() != S1AP_UE_CONNECTED) {
459+
if (ue_ref->s1ap_ue_state() != magma::lte::oai::S1AP_UE_CONNECTED) {
460460
OAILOG_DEBUG_UE(
461461
LOG_S1AP, imsi64,
462462
"Received S1AP NAS_NON_DELIVERY_INDICATION while UE in state != "
@@ -535,14 +535,14 @@ status_code_e s1ap_generate_downlink_nas_transport(
535535

536536
out = &pdu.choice.initiatingMessage.value.choice.DownlinkNASTransport;
537537

538-
if (ue_ref->s1_ue_state() == S1AP_UE_WAITING_CRR) {
538+
if (ue_ref->s1ap_ue_state() == magma::lte::oai::S1AP_UE_WAITING_CRR) {
539539
OAILOG_ERROR_UE(
540540
LOG_S1AP, imsi64,
541541
"Already triggered UE Context Release Command and UE is"
542542
"in S1AP_UE_WAITING_CRR, so dropping the DownlinkNASTransport \n");
543543
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
544544
} else {
545-
ue_ref->set_s1_ue_state(S1AP_UE_CONNECTED);
545+
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
546546
}
547547
/*
548548
* Setting UE informations with the ones found in ue_ref
@@ -648,7 +648,7 @@ status_code_e s1ap_generate_s1ap_e_rab_setup_req(
648648
pdu.choice.initiatingMessage.value.present =
649649
S1ap_InitiatingMessage__value_PR_E_RABSetupRequest;
650650
out = &pdu.choice.initiatingMessage.value.choice.E_RABSetupRequest;
651-
ue_ref->set_s1_ue_state(S1AP_UE_CONNECTED);
651+
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
652652
/*
653653
* Setting UE information with the ones found in ue_ref
654654
*/
@@ -1295,7 +1295,7 @@ status_code_e s1ap_generate_s1ap_e_rab_rel_cmd(
12951295
ie->value.present = S1ap_E_RABReleaseCommandIEs__value_PR_ENB_UE_S1AP_ID;
12961296
ie->value.choice.ENB_UE_S1AP_ID = ue_ref->enb_ue_s1ap_id();
12971297
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
1298-
ue_ref->set_s1_ue_state(S1AP_UE_CONNECTED);
1298+
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
12991299

13001300
ie = (S1ap_E_RABReleaseCommandIEs_t*)calloc(
13011301
1, sizeof(S1ap_E_RABReleaseCommandIEs_t));

‎lte/gateway/c/core/oai/test/s1ap_task/s1ap_mme_test_utils.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ extern "C" {
3030
namespace magma {
3131
namespace lte {
3232

33+
using oai::S1apUeState;
3334
using oai::UeDescription;
3435
extern task_zmq_ctx_t task_zmq_ctx_main_s1ap;
3536

@@ -429,7 +430,7 @@ bool is_num_enbs_valid(s1ap_state_t* state, uint32_t expected_num_enbs) {
429430
}
430431

431432
bool is_ue_state_valid(sctp_assoc_id_t assoc_id, enb_ue_s1ap_id_t enb_ue_id,
432-
enum s1_ue_state_s expected_ue_state) {
433+
enum S1apUeState expected_ue_state) {
433434
UeDescription* ue = nullptr;
434435
map_uint64_ue_description_t* state_ue_map = get_s1ap_ue_state();
435436
uint64_t comp_s1ap_id = S1AP_GENERATE_COMP_S1AP_ID(assoc_id, enb_ue_id);
@@ -438,7 +439,7 @@ bool is_ue_state_valid(sctp_assoc_id_t assoc_id, enb_ue_s1ap_id_t enb_ue_id,
438439
if (magma::PROTO_MAP_OK != rc) {
439440
return false;
440441
}
441-
return ue->s1_ue_state() == expected_ue_state ? true : false;
442+
return ue->s1ap_ue_state() == expected_ue_state ? true : false;
442443
}
443444

444445
status_code_e simulate_pdu_s1_message(uint8_t* bytes, long bytes_len,

‎lte/gateway/c/core/oai/test/s1ap_task/s1ap_mme_test_utils.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extern "C" {
2424
namespace magma {
2525
namespace lte {
2626

27+
using oai::S1apUeState;
2728
status_code_e setup_new_association(s1ap_state_t* state,
2829
sctp_assoc_id_t assoc_id);
2930

@@ -85,7 +86,7 @@ bool is_enb_state_valid(s1ap_state_t* state, sctp_assoc_id_t assoc_id,
8586
bool is_num_enbs_valid(s1ap_state_t* state, uint32_t expected_num_enbs);
8687

8788
bool is_ue_state_valid(sctp_assoc_id_t assoc_id, enb_ue_s1ap_id_t enb_ue_id,
88-
enum s1_ue_state_s expected_ue_state);
89+
enum S1apUeState expected_ue_state);
8990

9091
status_code_e simulate_pdu_s1_message(uint8_t* bytes, long bytes_len,
9192
s1ap_state_t* state,

‎lte/gateway/c/core/oai/test/s1ap_task/test_s1ap_mme_handlers.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ TEST_F(S1apMmeHandlersTest, HandleS1apHandoverCommand) {
10481048
std::this_thread::sleep_for(std::chrono::milliseconds(200));
10491049

10501050
// State validation
1051-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_HANDOVER));
1051+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_HANDOVER));
10521052
}
10531053

10541054
TEST_F(S1apMmeHandlersTest, HandleMmeHandover) {
@@ -1154,7 +1154,7 @@ TEST_F(S1apMmeHandlersTest, HandleMmeHandover) {
11541154
assoc_id, stream_id),
11551155
RETURNok);
11561156

1157-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
1157+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
11581158

11591159
// Simulate Attach Complete
11601160
uint8_t attach_compl_bytes[] = {
@@ -1206,7 +1206,7 @@ TEST_F(S1apMmeHandlersTest, HandleMmeHandover) {
12061206

12071207
UeDescription* ue_ref_p = s1ap_state_get_ue_mmeid(7);
12081208
cv.wait_for(lock, std::chrono::milliseconds(1000));
1209-
ASSERT_EQ(ue_ref_p->s1_ue_state(), S1AP_UE_HANDOVER);
1209+
ASSERT_EQ(ue_ref_p->s1ap_ue_state(), oai::S1AP_UE_HANDOVER);
12101210

12111211
// Simulate ENB Status Transfer
12121212
uint8_t enb_transfer[] = {0x00, 0x18, 0x40, 0x24, 0x00, 0x00, 0x03, 0x00,
@@ -1338,7 +1338,7 @@ TEST_F(S1apMmeHandlersTest, HandleMmeHandoverFailure) {
13381338
assoc_id, stream_id),
13391339
RETURNok);
13401340

1341-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
1341+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
13421342

13431343
// Simulate Attach Complete
13441344
uint8_t attach_compl_bytes[] = {
@@ -1483,7 +1483,7 @@ TEST_F(S1apMmeHandlersTest, HandleMmeHandoverCancel) {
14831483
assoc_id, stream_id),
14841484
RETURNok);
14851485

1486-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
1486+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
14871487

14881488
// Simulate Attach Complete
14891489
uint8_t attach_compl_bytes[] = {
@@ -1536,7 +1536,7 @@ TEST_F(S1apMmeHandlersTest, HandleMmeHandoverCancel) {
15361536

15371537
UeDescription* ue_ref_p = s1ap_state_get_ue_mmeid(7);
15381538
cv.wait_for(lock, std::chrono::milliseconds(1000));
1539-
ASSERT_EQ(ue_ref_p->s1_ue_state(), S1AP_UE_HANDOVER);
1539+
ASSERT_EQ(ue_ref_p->s1ap_ue_state(), oai::S1AP_UE_HANDOVER);
15401540

15411541
// Simulate Handover Cancel
15421542
uint8_t hand_cancel[] = {0x00, 0x04, 0x00, 0x15, 0x00, 0x00, 0x03, 0x00, 0x00,
@@ -1635,7 +1635,7 @@ TEST_F(S1apMmeHandlersTest, HandleErabSetupResponse) {
16351635
assoc_id, stream_id),
16361636
RETURNok);
16371637

1638-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
1638+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
16391639

16401640
// Simulate Attach Complete
16411641
uint8_t attach_compl_bytes[] = {
@@ -1761,7 +1761,7 @@ TEST_F(S1apMmeHandlersTest, HandleErrorIndicationMessage) {
17611761
assoc_id, stream_id),
17621762
RETURNok);
17631763

1764-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
1764+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
17651765

17661766
// Simulate Attach Complete
17671767
uint8_t attach_compl_bytes[] = {
@@ -1885,7 +1885,7 @@ TEST_F(S1apMmeHandlersTest, HandleEnbResetPartial) {
18851885
assoc_id, stream_id),
18861886
RETURNok);
18871887

1888-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
1888+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
18891889

18901890
// Simulate Attach Complete
18911891
uint8_t attach_compl_bytes[] = {
@@ -2110,7 +2110,7 @@ TEST_F(S1apMmeHandlersTest, HandlePathSwitchRequestSuccess) {
21102110
RETURNok);
21112111

21122112
// State validation
2113-
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, S1AP_UE_CONNECTED));
2113+
ASSERT_TRUE(is_ue_state_valid(assoc_id, 1, oai::S1AP_UE_CONNECTED));
21142114
ASSERT_TRUE(is_enb_state_valid(state, assoc_id, S1AP_READY, 1));
21152115

21162116
// Simulate Attach Complete
@@ -2166,7 +2166,7 @@ TEST_F(S1apMmeHandlersTest, HandlePathSwitchRequestSuccess) {
21662166
RETURNok);
21672167

21682168
// Confirm UE state update (assoc_id, enb_ue_s1ap_id)
2169-
ASSERT_TRUE(is_ue_state_valid(switch_assoc_id, 2, S1AP_UE_CONNECTED));
2169+
ASSERT_TRUE(is_ue_state_valid(switch_assoc_id, 2, oai::S1AP_UE_CONNECTED));
21702170

21712171
// Simulate Detach request PDU payload
21722172
uint8_t detach_req_bytes[] = {

0 commit comments

Comments
 (0)