Skip to content

Conversation

@rsarwad
Copy link
Owner

@rsarwad rsarwad commented Aug 25, 2022

Summary

Test Plan

Additional Information

  • This change is backwards-breaking

@github-actions
Copy link

Thanks for opening a PR! 💯

A couple initial guidelines

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

If this is your first Magma PR, also consider reading

@github-actions
Copy link

github-actions bot commented Aug 25, 2022

❌ The Semantic PR check ended with status failure. See instructions on formatting your commit and pull request titles.

void* parameterP, void** resultP) {
enb_description_t* new_enb_association = (enb_description_t*)parameterP;
enb_description_t* ht_enb_association = (enb_description_t*)elementP;
EnbDescription* new_enb_association = (EnbDescription*)parameterP;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

enb_description_t* new_enb_association = (enb_description_t*)parameterP;
enb_description_t* ht_enb_association = (enb_description_t*)elementP;
EnbDescription* new_enb_association = (EnbDescription*)parameterP;
EnbDescription* ht_enb_association = (EnbDescription*)elementP;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

for (auto itr = state->enbs.map->begin(); itr != state->enbs.map->end();
itr++) {
enb_ref_p = reinterpret_cast<enb_description_t*>(itr->second);
enb_ref_p = (EnbDescription*)itr->second;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

static int s1ap_paging_compare_plmns(plmn_t* enb_bplmns, uint8_t enb_plmn_count,
const paging_tai_list_t* p_tai_list) {
static int s1ap_paging_compare_plmns(
magma::lte::oai::SupportedTaiItems& enb_tai_item, uint8_t enb_plmn_count,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[cpplint] reported by reviewdog 🐶
Is this a non-const reference? If so, make const or use a pointer: magma::lte::oai::SupportedTaiItems& enb_tai_item [runtime/references] [2]

- tai_matching=1 if both TAC and PLMN matches with list of ENBs
*/
int s1ap_paging_compare_ta_lists(supported_ta_list_t* enb_ta_list,
int s1ap_paging_compare_ta_lists(magma::lte::oai::SupportedTaList& enb_ta_list,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[cpplint] reported by reviewdog 🐶
Is this a non-const reference? If so, make const or use a pointer: magma::lte::oai::SupportedTaList& enb_ta_list [runtime/references] [2]


int s1ap_mme_compare_ta_lists(S1ap_SupportedTAs_t* ta_list);
int s1ap_paging_compare_ta_lists(supported_ta_list_t* enb_ta_list,
int s1ap_paging_compare_ta_lists(magma::lte::oai::SupportedTaList& enb_ta_list,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[cpplint] reported by reviewdog 🐶
Is this a non-const reference? If so, make const or use a pointer: magma::lte::oai::SupportedTaList& enb_ta_list [runtime/references] [2]


bdestroy(ran_cp_ipaddr);
free_wrapper((void**)&enb_ref);
free_enb_description((void**)&enb_ref);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@rsarwad rsarwad force-pushed the 11191_move_enb_context branch from ff84708 to da44948 Compare August 25, 2022 04:14
@rsarwad rsarwad force-pushed the 11191_move_enb_context branch 3 times, most recently from d662118 to 5ab265a Compare August 25, 2022 07:18
@rsarwad rsarwad force-pushed the 11191_move_enb_context branch from 5ab265a to ffc179e Compare August 25, 2022 08:55
@rsarwad rsarwad force-pushed the 11191_move_enb_context branch from 89bf2cf to 75e9e29 Compare September 2, 2022 10:37
@github-actions
Copy link

github-actions bot commented Sep 9, 2022

Oops! Looks like you failed the DCO check. Be sure to sign all your commits.

Howto

♻️ Updated: ❌ The check is still failing the DCO check after the last commit.

@rsarwad rsarwad force-pushed the 11191_move_enb_context branch from e03178a to 26a3465 Compare September 9, 2022 13:51
@rsarwad rsarwad force-pushed the 11191_move_ue_context branch from 9b338d4 to ff523a8 Compare September 13, 2022 04:55
@rsarwad rsarwad force-pushed the 11191_move_ue_context branch from 555307b to 59c836c Compare September 20, 2022 16:34
mpfirrmann and others added 3 commits September 20, 2022 21:20
…otobuf structure UeDescription (magma#13678)

agw(fix): converted C structure of ue context, ue_description_t to protobuf structure, UeDescription in s1ap module
Signed-off-by: Rashmi <[email protected]>
alexzurbonsen and others added 2 commits September 21, 2022 08:55
… scripts (magma#13939)

* refactor tenants sync functions in util file

Signed-off-by: Alexander zur Bonsen <[email protected]>

* adapt scripts that are run by dev_setup.sh to sync with orc8r as well if organization is created or updated

Signed-off-by: Alexander zur Bonsen <[email protected]>

* add modified version of syncTenants to utils, which syncs orc8r tenants with NMS orgs

Signed-off-by: Alexander zur Bonsen <[email protected]>

* add initial sync of orc8r tenants

Signed-off-by: Alexander zur Bonsen <[email protected]>

* Minor changes and fix mock server for e2e test

Signed-off-by: Sebastian Thomas <[email protected]>

* Revert initial tenants-sync when creating organization

Signed-off-by: Sebastian Thomas <[email protected]>

Signed-off-by: Alexander zur Bonsen <[email protected]>
Signed-off-by: Sebastian Thomas <[email protected]>
Co-authored-by: Sebastian Thomas <[email protected]>
* fix(amf): Support for 5GS network feature support

Signed-off-by: priya-wavelabs <[email protected]>

* Addressed review comments (R1)

Signed-off-by: priya-wavelabs <[email protected]>

Signed-off-by: priya-wavelabs <[email protected]>
nstng and others added 10 commits September 23, 2022 09:17
Signed-off-by: Nils Semmelrock <[email protected]>

Signed-off-by: Nils Semmelrock <[email protected]>
Signed-off-by: Marco Pfirrmann <[email protected]>

Signed-off-by: Marco Pfirrmann <[email protected]>
Change the name of the created docker image from `agw_gateway_go`
to `gateway_go`, in accordance with the image requested in the
`docker-compose.yaml` in order to make the agw containers build again on master.
Remove usages of the tarfile module from pydep. This code is not
used any more.

Signed-off-by: Sebastian Thomas <[email protected]>
* chore(agw): functions are reordered for better readability
* chore(agw): s1ap_utils is cleaned up for readability

Signed-off-by: Marco Pfirrmann <[email protected]>
…ontainerized AGW (magma#14009)

Signed-off-by: Marco Pfirrmann <[email protected]>

Signed-off-by: Marco Pfirrmann <[email protected]>
…magma#13980)

Signed-off-by: Nils Semmelrock <[email protected]>

Signed-off-by: Nils Semmelrock <[email protected]>
Co-authored-by: Nils Semmelrock <[email protected]>
Add the docker application and the docker socket to the magmad
container setup.

Document that init_system needs to be set in the config.

Signed-off-by: Sebastian Thomas <[email protected]>
eutran_vector_t* vectors);
status_code_e nas_proc_auth_param_fail(mme_ue_s1ap_id_t ue_id,
nas_cause_t cause);
int nas_proc_signalling_connection_rel_ind(mme_ue_s1ap_id_t ue_id);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[misspell] reported by reviewdog 🐶
"signalling" is a misspelling of "signaling"

@@ -70,7 +70,17 @@
- XDG_CACHE_HOME="{{magma_root}}/.cache"
- SWAGGER_CODEGEN_JAR={{ swagger_codegen_jar }}
- CODEGEN_ROOT={{ codegen_root }}
- ASAN_OPTIONS=abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
- ASAN_OPTIONS=abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[yamllint] reported by reviewdog 🐶
[error] too many spaces after hyphen (hyphens)

@@ -70,7 +70,17 @@
- XDG_CACHE_HOME="{{magma_root}}/.cache"
- SWAGGER_CODEGEN_JAR={{ swagger_codegen_jar }}
- CODEGEN_ROOT={{ codegen_root }}
- ASAN_OPTIONS=abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
- ASAN_OPTIONS=abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
- LSAN_OPTIONS=suppressions=/usr/local/suppressions.txt

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[yamllint] reported by reviewdog 🐶
[error] too many spaces after hyphen (hyphens)

rsarwad and others added 12 commits September 27, 2022 12:19
…n response (magma#13655)

* fix(mme): Handling  qosflowFailedForAddorModify in session modification response.

Signed-off-by: Ajay-Kashyap <[email protected]>

* Session modification corner case handling

Signed-off-by: Ajay-Kashyap <[email protected]>

Signed-off-by: Ajay-Kashyap <[email protected]>
Signed-off-by: Marco Pfirrmann <[email protected]>

Signed-off-by: Marco Pfirrmann <[email protected]>
Co-authored-by: Christian Krämer <[email protected]>
…gma#12870)

Bumps [yajl-ruby](https://github.com/brianmario/yajl-ruby) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/brianmario/yajl-ruby/releases)
- [Changelog](https://github.com/brianmario/yajl-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianmario/yajl-ruby/commits)

---
updated-dependencies:
- dependency-name: yajl-ruby
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
magma#14015)

* fix(agw): sctpd needs explicit restart for docker as it is restarted by systemd autmatically

Signed-off-by: Christian Krämer <[email protected]>
…sudo tests (magma#13984)

Signed-off-by: Krisztián Varga <[email protected]>

Signed-off-by: Krisztián Varga <[email protected]>
Signed-off-by: Nils Semmelrock <[email protected]>

Signed-off-by: Nils Semmelrock <[email protected]>
* feat(agw): sctpd is stopped before a start via magmad service

Signed-off-by: Marco Pfirrmann <[email protected]>

* feat(agw): sctpd is restarted only via restart_services()

Signed-off-by: Marco Pfirrmann <[email protected]>

Signed-off-by: Marco Pfirrmann <[email protected]>
* fix(agw): fix incorrect usage of self.assertTrue

Signed-off-by: Sebastian Wolf <[email protected]>

* chore(agw): change to new pytest assert syntax

This commit changes
* self.assertEqual and self.assertListEqual to assert ... == ...
* self.assertTrue to assert
* self.assertGreater to assert ... > ...
* self.assertGreaterEqual to assert ... >= ...
* self.assertLessEqual to assert ... <= ...
* self.assertIn to assert ... in ...
* self.assertIsNotNone to assert ... is not None

Signed-off-by: Sebastian Wolf <[email protected]>

* chore(agw): cleanup line lengths from previous commits

Signed-off-by: Sebastian Wolf <[email protected]>

Signed-off-by: Sebastian Wolf <[email protected]>
…ma#13862)

* fix(agw): fix certificate issue for containerized AGW deployment

fixes the mount path for the rootCA.pem certificate, so a containerized deployment
outside the dev VM can still access it

Signed-off-by: Sebastian Wolf <[email protected]>

* chore: add option to update rootCA.pem in deployment docs

Signed-off-by: Sebastian Wolf <[email protected]>

Signed-off-by: Sebastian Wolf <[email protected]>
@rsarwad rsarwad force-pushed the 11191_move_enb_context branch from 64b66d8 to 3f72981 Compare September 28, 2022 10:36
MoritzThomasHuebner and others added 2 commits September 29, 2022 10:48
* refactor(orc8r): Minor improvements to sql.go

- Remove proto.Clone calls from sql.go
- Added some missing commas to comments
- Changed empty slice creation using literals to nil slice declaration

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Remove proto.Clone calls from sql_test.go

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Remove proto.Clone calls from client_api.go

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Remove proto.Clone calls from sql_entity_write_helpers.go

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Remove proto.Clone calls from storage.go

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Remove proto.Clone calls from sql_integ_test.go

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Revert changes in sql_integ_test.go

Signed-off-by: Moritz Huebner <[email protected]>

* refactor(orc8r): Revert changes to import order

Signed-off-by: Moritz Huebner <[email protected]>

Signed-off-by: Moritz Huebner <[email protected]>
@rsarwad rsarwad force-pushed the 11191_move_enb_context branch from 3f72981 to 8c09608 Compare September 29, 2022 03:39
self.assertIsNotNone(
uplink_flows[0]["match"]["tunnel_id"],
assert len(uplink_flows) == 1, "Uplink flow missing for UE"
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

self.assertEqual(
downlink_flows[0]["match"]["ipv4_dst"], ue_ip,
assert len(downlink_flows) == 1, "Downlink flow missing for UE"
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

@@ -141,7 +132,7 @@
if action["field"] == "tunnel_id" and
action["type"] == "SET_FIELD"
)
self.assertTrue(
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

"Uplink flow missing tunnel id match",
)
for i in range(len(uplink_flows)):
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

self.assertEqual(
downlink_flows[0]["match"]["ipv4_dst"],
ue_ip,
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

self.assertEqual(
downlink_flows[0]["match"]["ipv4_dst"],
ue_ip,
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

@@ -294,7 +293,7 @@
if action["field"] == "tunnel_id"
and action["type"] == "SET_FIELD"
)
self.assertTrue(
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]


# All UEs should eventually receive Context Release Request
# The first half should get it immediately
# The second half should first get paging
for _ in range(num_ues):
response = self._s1ap_wrapper.s1_util.get_response()
self.assertIn(
response.msg_type,
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

@@ -69,30 +69,27 @@ def test_agw_offload_idle_active_ue(self):
"************************* Offloading UE at state ECM-CONNECTED",
)
# Send offloading request
self.assertTrue(
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]


print("************************* Offloading UE at state ECM-IDLE")
# Send offloading request
self.assertTrue(
assert (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [mypy] reported by reviewdog 🐶
Assertion is always true, perhaps remove parentheses? [misc]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.