fix(agw): Replaced the key for guti hashtable, currently the key is GUTI in string format #12653

rsarwad · 2022-05-09T11:31:44Z

Summary

Guti hash table is of object hash table, for which earlier key was pointer to object of structure, guti_t. As part of this PR, we changed the key as string format of GUTI.
Partially fixes the issue, #11189
The other part would be fixed by PR, #12573

Test Plan

Executed s1ap sanity test suite and manually verified the GUTI values with mme restart, so that GUTI is correctly written to DB and fetched from DB
Executed unit test cases.

github-actions · 2022-05-09T11:32:01Z

Thanks for opening a PR! 💯

A couple initial guidelines

All commits must be signed off. This is enforced by DCO check.
All PR titles must follow the semantic commits format. This is enforced by Semantic PR.

Howto

Reviews. The "Reviewers" listed for this PR are the Magma maintainers who will shepherd it.
Checks. All required CI checks must pass before merge.
Merge. Once approved and passing CI checks, use the ready2merge label to indicate the maintainers can merge your PR.

More info

Please take a moment to read through the Magma project's

Contributing Conventions for norms around contributed code

If this is your first Magma PR, also consider reading

Developer Onboarding for onboarding as a new Magma developer
Development Workflow for guidance on your first pull request
CI Checks for points of contact for failing or flaky CI checks
GitHub-to-Slack mappings for Magma maintainers for guidance on how to contact maintainers on Slack

github-actions · 2022-05-09T11:34:04Z

lte/gateway/c/core/oai/common/conversions.h

@@ -757,4 +757,5 @@ bstring paa_to_bstring(const paa_t* paa);
 // Return the hex representation of a char array
 char* bytes_to_hex(char* byte_array, int length, char* hex_array);

+void convert_guti_to_string(guti_t* guti_p, char (*guti_str)[]);


[cpplint] _{reported by reviewdog 🐶}
Extra space before ( in function call [whitespace/parens] [4]

github-actions · 2022-05-09T11:34:04Z

lte/gateway/c/core/oai/tasks/mme_app/mme_app_state_converter.cpp

-                 (*key_array_p)[i], *((*key_list)[i]));
-    hashtable_rc_t ht_rc = obj_hashtable_uint64_ts_get(
-        guti_htbl, (const void*)(*key_array_p)[i], sizeof(guti_t), &mme_ue_id);
+    std::string guti_str((char*)(*key_array_p)[i], (GUTI_STRING_LEN - 1));


[cpplint] _{reported by reviewdog 🐶}
Using C-style cast. Use reinterpret_cast<char*>(...) instead [readability/casting] [4]

github-actions · 2022-05-09T11:34:04Z

lte/gateway/c/core/oai/tasks/mme_app/mme_app_state_converter.cpp

@@ -180,9 +179,10 @@ void MmeNasStateConverter::proto_to_guti_table(
    std::unique_ptr<guti_t> guti = std::make_unique<guti_t>();
    memset(guti.get(), 0, sizeof(guti_t));

-    mme_app_convert_string_to_guti(guti.get(), kv.first);
+    char guti_str[GUTI_STRING_LEN] = {};
+    strcpy(guti_str, (char*)(kv.first.c_str()));


[cpplint] _{reported by reviewdog 🐶}
Using C-style cast. Use reinterpret_cast<char*>(...) instead [readability/casting] [4]

github-actions · 2022-05-09T11:34:04Z

lte/gateway/c/core/oai/tasks/mme_app/mme_app_state_converter.cpp

@@ -180,9 +179,10 @@ void MmeNasStateConverter::proto_to_guti_table(
    std::unique_ptr<guti_t> guti = std::make_unique<guti_t>();
    memset(guti.get(), 0, sizeof(guti_t));

-    mme_app_convert_string_to_guti(guti.get(), kv.first);
+    char guti_str[GUTI_STRING_LEN] = {};
+    strcpy(guti_str, (char*)(kv.first.c_str()));


[cpplint] _{reported by reviewdog 🐶}
Almost always, snprintf is better than strcpy [runtime/printf] [4]

github-actions · 2022-05-09T11:41:09Z

feg-workflow

    2 files 202 suites 38s ⏱️
371 tests 371 ✔️ 0 💤 0 ❌
385 runs 385 ✔️ 0 💤 0 ❌

Results for commit 7a6e558.

♻️ This comment has been updated with latest results.

github-actions · 2022-05-09T14:14:50Z

agw-workflow

    77 files   122 suites 7m 28s ⏱️
1 151 tests 1 147 ✔️ 4 💤 0 ❌
1 152 runs 1 148 ✔️ 4 💤 0 ❌

Results for commit 7a6e558.

♻️ This comment has been updated with latest results.

ssanadhya

Lgtm, with minor change

ssanadhya · 2022-05-19T04:56:40Z

lte/gateway/c/core/oai/common/conversions.c

@@ -367,3 +367,12 @@ char* bytes_to_hex(char* byte_array, int length, char* hex_array) {
  }
  return hex_array;
 }
+
+void convert_guti_to_string(guti_t* guti_p, char (*guti_str)[]) {
+#define GUTI_STRING_LEN 21


This is already defined in conversions.h below

ssanadhya · 2022-05-19T04:59:37Z

lte/gateway/c/core/oai/tasks/nas/emm/emm_data.h

@@ -541,8 +541,6 @@ struct emm_context_s* emm_context_get(emm_data_t* emm_data,
                                      const mme_ue_s1ap_id_t ue_id);
 struct emm_context_s* emm_context_get_by_imsi(emm_data_t* emm_data,
                                              imsi64_t imsi64);
-struct emm_context_s* emm_context_get_by_guti(emm_data_t* emm_data,


ssanadhya · 2022-05-19T04:59:49Z

lte/gateway/c/core/oai/tasks/nas/emm/emm_data_ctx.c

@@ -662,26 +662,6 @@ struct emm_context_s* emm_context_get_by_imsi(
  return emm_context_p;
 }

-//------------------------------------------------------------------------------
-struct emm_context_s* emm_context_get_by_guti(emm_data_t* emm_data,


Thanks for the clean up!

github-actions · 2022-05-27T10:37:03Z

Oops! Looks like you failed the Semantic PR check.

Howto

Instructions on formatting your PR title
For PRs with only one commit, the commit message must also be semantic. See Changing a commit message for a howto
Guide to the different CI checks and resolution guidelines

♻️ Updated: ✅ The check is passing the Semantic PR after the last commit.

github-actions · 2022-05-27T10:59:15Z

dp-workflow

  2 files   2 suites 3m 15s ⏱️
15 tests 15 ✔️ 0 💤 0 ❌

Results for commit 7a6e558.

♻️ This comment has been updated with latest results.

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

github-actions · 2022-05-27T15:02:02Z

lte/gateway/c/core/oai/common/conversions.c

@@ -367,3 +367,11 @@ char* bytes_to_hex(char* byte_array, int length, char* hex_array) {
  }
  return hex_array;
 }
+
+void convert_guti_to_string(guti_t* guti_p, char (*guti_str)[]) {


[cpplint] _{reported by reviewdog 🐶}
Extra space before ( in function call [whitespace/parens] [4]

…hashtable_conversion Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

…UTI in string format (magma#12653) * Modified code to use guti in string format Signed-off-by: Rashmi <rashmi.sarwad@radisys.com> * Fixed OAI build failure Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

rsarwad requested review from a team and ssanadhya May 9, 2022 11:31

pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines. label May 9, 2022

github-actions bot added the component: agw Access gateway-related issue label May 9, 2022

github-actions bot reviewed May 9, 2022

View reviewed changes

rsarwad force-pushed the rsarwad_lte_guti_hashtable_conversion branch from f2dbcf1 to 9b89ba4 Compare May 9, 2022 12:02

pull-request-size bot added size/L Denotes a Pull Request that changes 100-499 lines. and removed size/M Denotes a PR that changes 30-99 lines. labels May 9, 2022

rsarwad force-pushed the rsarwad_lte_guti_hashtable_conversion branch from 9b89ba4 to 26044c2 Compare May 9, 2022 12:43

rsarwad force-pushed the rsarwad_lte_guti_hashtable_conversion branch from 26044c2 to 971cc36 Compare May 10, 2022 06:33

ssanadhya approved these changes May 19, 2022

View reviewed changes

rsarwad force-pushed the rsarwad_lte_guti_hashtable_conversion branch from 971cc36 to 9ea686e Compare May 27, 2022 10:35

pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines. and removed size/L Denotes a Pull Request that changes 100-499 lines. labels May 27, 2022

magma deleted a comment from github-actions bot May 27, 2022

rsarwad force-pushed the rsarwad_lte_guti_hashtable_conversion branch from 9ea686e to 369e46e Compare May 27, 2022 14:59

pull-request-size bot added size/L Denotes a Pull Request that changes 100-499 lines. and removed size/XS Denotes a PR that changes 0-9 lines. labels May 27, 2022

Modified code to use guti in string format

369e46e

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

github-actions bot reviewed May 27, 2022

View reviewed changes

rsarwad added 2 commits June 1, 2022 05:37

Merge remote-tracking branch 'upstream/master' into rsarwad_lte_guti_…

a67260c

…hashtable_conversion Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

Fixed OAI build failure

7a6e558

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

rsarwad merged commit 2fda7a8 into magma:master Jun 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(agw): Replaced the key for guti hashtable, currently the key is GUTI in string format #12653

fix(agw): Replaced the key for guti hashtable, currently the key is GUTI in string format #12653

rsarwad commented May 9, 2022

github-actions bot commented May 9, 2022

github-actions bot May 9, 2022

github-actions bot May 9, 2022

github-actions bot May 9, 2022

github-actions bot May 9, 2022

github-actions bot commented May 9, 2022 •

edited

github-actions bot commented May 9, 2022 •

edited

ssanadhya left a comment

ssanadhya May 19, 2022

rsarwad May 27, 2022

ssanadhya May 19, 2022

ssanadhya May 19, 2022

github-actions bot commented May 27, 2022 •

edited

github-actions bot commented May 27, 2022 •

edited

github-actions bot May 27, 2022

fix(agw): Replaced the key for guti hashtable, currently the key is GUTI in string format #12653

fix(agw): Replaced the key for guti hashtable, currently the key is GUTI in string format #12653

Conversation

rsarwad commented May 9, 2022

Summary

Test Plan

github-actions bot commented May 9, 2022

Howto

More info

github-actions bot May 9, 2022

Choose a reason for hiding this comment

github-actions bot May 9, 2022

Choose a reason for hiding this comment

github-actions bot May 9, 2022

Choose a reason for hiding this comment

github-actions bot May 9, 2022

Choose a reason for hiding this comment

github-actions bot commented May 9, 2022 • edited

feg-workflow

github-actions bot commented May 9, 2022 • edited

agw-workflow

ssanadhya left a comment

Choose a reason for hiding this comment

ssanadhya May 19, 2022

Choose a reason for hiding this comment

rsarwad May 27, 2022

Choose a reason for hiding this comment

ssanadhya May 19, 2022

Choose a reason for hiding this comment

ssanadhya May 19, 2022

Choose a reason for hiding this comment

github-actions bot commented May 27, 2022 • edited

Howto

github-actions bot commented May 27, 2022 • edited

dp-workflow

github-actions bot May 27, 2022

Choose a reason for hiding this comment

github-actions bot commented May 9, 2022 •

edited

github-actions bot commented May 9, 2022 •

edited

github-actions bot commented May 27, 2022 •

edited

github-actions bot commented May 27, 2022 •

edited