fix(agw): Migrated ue_id_coll hashlist to protobuf map #12965
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…tion_10869 Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…_c_to_cpp Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…tion_10869 Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…_c_to_cpp Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…ad/magma into rsarwad_s1ap_integrate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…ad/magma into rsarwad_s1ap_integrate_proto_map
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…ad/magma into rsarwad_s1ap_integrate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…_c_to_cpp Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…ad/magma into rsarwad_s1ap_integrate_proto_map
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…tion_10869 Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…tion_10869 Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…odule Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…tion_10869 Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
rsarwad
force-pushed
the
rsarwad_s1ap_integrate_proto_map
branch
from
9e36fe0
to
83a96b9
Compare
…grate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
nstng
approved these changes
Jun 23, 2022
ssanadhya
requested changes
Jun 23, 2022
| @@ -34,7 +34,7 @@ message EnbDescription { | |||
| uint32 instreams = 8; // sctp_stream_id_t | |||
| uint32 outstreams = 9; // sctp_stream_id_t | |||
|
|
|||
| map<uint64, uint64> ue_ids = 10; // mme_ue_s1ap_id -> comp_s1ap_id | |||
There was a problem hiding this comment.
You cannot modify the proto field since it will not be backwards compatible. We need to mark this as deprecated, and add a new field
map<uint32, uint64> ue_id_map = 14;
5d50a9f
to
f97500f
Compare
|
rsarwad
force-pushed
the
rsarwad_s1ap_integrate_proto_map
branch
from
f97500f
to
c99727b
Compare
pull-request-size
bot
added
size/XL
rsarwad
force-pushed
the
rsarwad_s1ap_integrate_proto_map
branch
from
c99727b
to
d8e3e36
Compare
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…grate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
…grate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
Incorporated review comment. |
…grate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
ssanadhya
reviewed
Jun 27, 2022
| hash_table_uint64_ts_t ue_id_coll; ///< Contains comp_s1ap_id assoc to | ||
| ///< enodeb, key is mme_ue_s1ap_id; | ||
| magma::proto_map_uint32_uint64_t | ||
| ue_id_coll; ///< Contains comp_s1ap_id assoc to |
There was a problem hiding this comment.
The comment here can be simplified to
/// key: mme_ue_s1ap_id, value: comp_s1ap_id
| @@ -0,0 +1,32 @@ | |||
| /** | |||
| * Copyright 2022 The Magma Authors. | |||
There was a problem hiding this comment.
But the init function for each task should be part of that task directory, instead of being in a common header. It will be good to retain this under s1ap_mme.hpp.
| rc = s1ap_mme_generate_s1_setup_failure( | ||
| assoc_id, S1ap_Cause_PR_transport, | ||
| S1ap_CauseTransport_transport_resource_unavailable, | ||
| S1ap_TimeToWait_v20s); | ||
| increment_counter("s1_setup", 1, 2, "result", "failure", "cause", | ||
| "invalid_state"); | ||
| /* UE state at s1ap task is created on reception of initial ue message | ||
| * Hash list, ue_id_coll is updated after mme_app_task assigns and provides | ||
| * map, ue_id_coll is updated after mme_app_task assigns and provides |
There was a problem hiding this comment.
Suggested change
| * map, ue_id_coll is updated after mme_app_task assigns and provides | |
| * The map ue_id_coll is updated after mme_app_task assigns and provides |
| @@ -3704,12 +3699,12 @@ status_code_e s1ap_handle_sctp_disconnection(s1ap_state_t* state, | |||
|
|
|||
| if (reset) { | |||
| /* UE state at s1ap task is created on reception of initial ue message | |||
| * Hash list, ue_id_coll is updated after mme_app_task assigns and provides | |||
| * map, ue_id_coll is updated after mme_app_task assigns and provides | |||
There was a problem hiding this comment.
Suggested change
| * map, ue_id_coll is updated after mme_app_task assigns and provides | |
| * The map ue_id_coll is updated after mme_app_task assigns and provides |
Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
rsarwad
force-pushed
the
rsarwad_s1ap_integrate_proto_map
branch
from
cf803ed
to
5eac6aa
Compare
ssanadhya
approved these changes
Jun 28, 2022
| @@ -3704,12 +3699,12 @@ status_code_e s1ap_handle_sctp_disconnection(s1ap_state_t* state, | |||
|
|
|||
| if (reset) { | |||
| /* UE state at s1ap task is created on reception of initial ue message | |||
| * Hash list, ue_id_coll is updated after mme_app_task assigns and provides | |||
| * The map, ue_id_coll is updated after mme_app_task assigns and provides | |||
There was a problem hiding this comment.
Suggested change
| * The map, ue_id_coll is updated after mme_app_task assigns and provides | |
| * The map ue_id_coll is updated after mme_app_task assigns and provides |
…grate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
rsarwad
force-pushed
the
rsarwad_s1ap_integrate_proto_map
branch
from
2937e05
to
d1a4597
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| if (free_callback_func) { | ||
| valueT value; | ||
| if (get(key, &value) == PROTO_MAP_OK) { | ||
| free_callback_func( reinterpret_cast<void**>(&value)); |
There was a problem hiding this comment.
[cpplint] reported by reviewdog 🐶
Extra space after ( in function call [whitespace/parens] [4]
…grate_proto_map Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
rsarwad
force-pushed
the
rsarwad_s1ap_integrate_proto_map
branch
from
7f60dba
to
920b433
Compare
… for enb_description_t in s1ap module"
…b_hl Revert "fix(agw): Modified code to replace hashlist with protobuf map for enb_description_t in s1ap module"
emakeev
pushed a commit
to emakeev/magma
that referenced
this pull request
Aug 5, 2022
* fix(agw): Added code to migrate ue_id_coll hashlist to ptotbuf map
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Migrated ue_id_coll hashlist to protobuf map. The PR partially addresses the issue, #11190
All tasks are initialized from oai_mme.c file in main function. As we port the individual tasks to cpp, initialize functions are called from main function. And declaration of initialization function of all tasks shall we moved to include/mme_init.hpp file
Test Plan
Executed s1ap sanity test suite