Added vlan_range support #396

Alopalao · 2023-11-06T23:11:23Z

Closes #18
Closes #309

Summary

This PR needs kytos PR
Added support for vlan_range epic. Currently only when both UNIs have the same list of tags

Local Tests

Created, updated and deleted circuit.
Restarted kytos to check consistency work. Partial updates for list of tags also tested. For example if both UNI have [[20, 30]] and they are being updated to [[25, 30]].
Added and updated tests.

End-To-End Tests

============================= test session starts ==============================
platform linux -- Python 3.9.2, pytest-7.2.0, pluggy-1.3.0
rootdir: /tests
plugins: timeout-2.1.0, rerunfailures-10.2, anyio-3.6.2
collected 244 items

tests/test_e2e_01_kytos_startup.py ..                                    [  0%]
tests/test_e2e_05_topology.py ..................                         [  8%]
tests/test_e2e_10_mef_eline.py ..........ss.....x.....x................  [ 24%]
tests/test_e2e_11_mef_eline.py ......                                    [ 27%]
tests/test_e2e_12_mef_eline.py .....Xx.                                  [ 30%]
tests/test_e2e_13_mef_eline.py ....Xs.s.....Xs.s.XXxX.xxxx..X........... [ 47%]
.                                                                        [ 47%]
tests/test_e2e_14_mef_eline.py x                                         [ 47%]
tests/test_e2e_15_mef_eline.py ....                                      [ 49%]
tests/test_e2e_20_flow_manager.py .....................                  [ 58%]
tests/test_e2e_21_flow_manager.py ...                                    [ 59%]
tests/test_e2e_22_flow_manager.py ...............                        [ 65%]
tests/test_e2e_23_flow_manager.py ..............                         [ 71%]
tests/test_e2e_30_of_lldp.py ....                                        [ 72%]
tests/test_e2e_31_of_lldp.py ...                                         [ 74%]
tests/test_e2e_32_of_lldp.py ...                                         [ 75%]
tests/test_e2e_40_sdntrace.py .............                              [ 80%]
tests/test_e2e_41_kytos_auth.py ........                                 [ 84%]
tests/test_e2e_42_sdntrace.py ..                                         [ 84%]
tests/test_e2e_50_maintenance.py ........................                [ 94%]
tests/test_e2e_60_of_multi_table.py .....                                [ 96%]
tests/test_e2e_70_kytos_stats.py ........                                [100%]

Alopalao · 2023-11-06T23:58:15Z

models/evc.py

@@ -1480,6 +1623,7 @@ def handle_topology_update(self, switches: dict):
        # All intra-switch EVCs do not have current_path.
        # In case of inter-switch EVC and not current_path,
        # link_down should take care of deactivation.
+        return


This return is here to avoid early activations so consistency checks can be tested.

OK. you can add a TODO as well to remove it later.

Btw, this part is also being changed on #383

@Alopalao as we spoke in the meeting, if you could git rebase with this branch fix/handle_switch_changes of #383, that'd be great. That way the linter error would also be gone. It was great how you managed to progress in the meantime.

Rebased it and tested it, both are working well.

Great. Certain master originated commits here that haven't been merged into #383 is making the review slightly more difficult, if you could talk to @Ktmi to merge master into his branch, that'd be great.

@Alopalao, I was checking David's PR commits history he's already got the correct commits there:

commit c9d91ed51799ce56e76e937d92bcb9cae6e1a9fb Author: Vinicius Arcanjo Date: Tue Oct 31 17:50:48 2023 -0300 feat: add set_vlan only if in_vlan_a != in_vlan_z when pushing UNI flow related to issue 389

and on master same sha1:

commit c9d91ed51799ce56e76e937d92bcb9cae6e1a9fb Author: Vinicius Arcanjo Date: Tue Oct 31 17:50:48 2023 -0300 feat: add set_vlan only if in_vlan_a != in_vlan_z when pushing UNI flow related to issue 389

So you'll need to sort out why these commits got rewritten, if you need help with this let me know.

utils.py

viniarck

@Alopalao, functionality-wise it's getting there. Excellent to this it working for the first time. I've hit an exception though, and also raised a few points.

Regarding the all 1's mask I've also opened an issue to look into it, and then we can make a final decision about whether or not to send with all 1s mask.

db/models.py

main.py

models/evc.py

viniarck · 2023-11-07T14:51:20Z

models/evc.py

@@ -1480,6 +1623,7 @@ def handle_topology_update(self, switches: dict):
        # All intra-switch EVCs do not have current_path.
        # In case of inter-switch EVC and not current_path,
        # link_down should take care of deactivation.
+        return


OK. you can add a TODO as well to remove it later.

Btw, this part is also being changed on #383

models/evc.py

utils.py

Alopalao · 2023-11-09T08:23:23Z

Last commit is more stable. Tested with this script. This script works with the last update from kytos, topology and of_lldp PRs.

First change the vlan used by of_lldp, code, to None.
Runs script as python3 create_evcs.py 3. 3 is the number of circuits to be created. The script manages the number of ranges for tag_ranges.
Setting tag_range for "01:1" and "02:1" switches with the next values:

tag_ranges = []
for (i, j) in zip(range(1, 4096, 10), range(6, 4096, 10)):
    tag_ranges.append([i, j])

This tag_ranges goes from [[1, 6], [11, 16], [21, 26], ... to ..., [4061, 4066], [4071, 4076], [4081, 4086]]

The evcs created are from "01:1" and "02:1" interfaces. The VLANs values are calculated as follows:

for i in range(1, 6, 2):
    vlans = []
    for q in range(i, 4086, 10):
        vlans.append([q, q+1])
    t = create_evc(vlans_a=vlans, vlans_z=vlans)

The vlans for circuits are created as:

vlans_circuit_1 = [[1, 2], [11, 12], [21, 22], ..., [4061, 4062], [4071, 4072], [4081, 4082]]
vlans_circuit_2 = [[3, 4], [13, 14], [23, 24], ..., [4063, 4064], [4073, 4074], [4083, 4084]]
vlans_circuit_3 = [[5, 6], [15, 16], [25, 26], ..., [4065, 4066], [4075, 4076], [4085, 4086]]

It takes time to create all the circuit, but it is successful and with no warnings and errors. The final result should be an empty list for available_tags from "01:1" and "02:1" interfaces.

Alopalao · 2023-11-09T08:48:48Z

requirements/dev.in

@@ -5,5 +5,5 @@
 #    pip-compile --output-file requirements/dev.txt requirements/dev.in
 #
 -e git+https://github.com/kytos-ng/python-openflow.git#egg=python-openflow
-e git+https://github.com/kytos-ng/kytos.git#egg=kytos[dev]
+-e git+https://github.com/kytos-ng/kytos.git@epic/vlan_range#egg=kytos[dev]


Reverting this when PR lands

viniarck

@Alopalao, great PR.

I've just done another pass closing the threads had I had opened. Fantastic to also see how you explored locally, and the new e2e that you're shipping. I'll do a final review once you also rebase with PR #383, let me know when you need a final review.

viniarck · 2023-11-14T18:32:52Z

Changelog also hasn't been updated

related to issue 389

- Deleted unnecessary raises

- Fixed partial vlan list update

- Updated changelog

- Reverted RANGE_SB_PRIORITY adittion

Alopalao · 2023-11-17T01:03:54Z

Bypassing checking of tags for use_tags() and make_tags_available() since these tags are not managed by the user.
Commit a29489619e26a6ebea63ad69ce6c386992644dfc

utils.py

models/path.py

models/evc.py

main.py

models/evc.py

CHANGELOG.rst

models/evc.py

- Deleted unnecessary raises

- Fixed partial vlan list update

- Updated changelog

- Reverted RANGE_SB_PRIORITY adittion

… into epic/vlan_range

Alopalao · 2023-11-21T18:10:11Z

Migrating to another branch epic/vlan_range_copy. This one have unnecessary commits. Changing it to draft so issues are not closed. New PR

viniarck · 2023-11-22T13:37:42Z

Closing this since Aldo's PR #407 has landed. Nicely done, Aldo.

Alopalao requested a review from a team as a code owner November 6, 2023 23:11

Alopalao commented Nov 6, 2023

View reviewed changes

Alopalao mentioned this pull request Nov 7, 2023

feature: Added support to list[list[int]] input kytos-ng/kytos#428

Merged

viniarck requested changes Nov 7, 2023

View reviewed changes

viniarck requested review from italovalcy and a team November 7, 2023 15:21

Alopalao commented Nov 9, 2023

View reviewed changes

viniarck self-requested a review November 14, 2023 17:31

viniarck reviewed Nov 14, 2023

View reviewed changes

Alopalao and others added 17 commits November 15, 2023 11:05

Modified get_vlan_tags_and_masks to support list of ranges

000ddb7

Updated get_vlan_tags_and_masks and test

9132610

Fixed lint

b1f3afb

feat: add set_vlan only if in_vlan_a != in_vlan_z when pushing UNI flow

812177a

related to issue 389

tests: covered with unit test accordingly

110d91e

docs: updated CHANGELOG.rst

8b0d694

feat: added scripts/redeploy_evpls_same_vlans.py

4325eb0

docs: updated scripts/README.md with redeploy_evpls_same_vlans.py

5c41728

docs: updated CHANGELOG.rst

35bc81d

docs: fixed typos

f150a79

docs: augmented scripts/README.md

4f04069

docs: added extra phrase on scripts/README.md

6d53522

Added vlan_range support

f88fb44

Fixed trace

4cd70e2

- Deleted unnecessary raises

Updated exceptions

8f8bae4

Added unit tests

84ca0c0

- Fixed partial vlan list update

Added RANGE_SB_PRIORITY

2c7b49c

- Updated changelog

Alopalao force-pushed the epic/vlan_range branch from 4431600 to 2c7b49c Compare November 15, 2023 16:06

Alopalao changed the base branch from master to fix/handle_switch_changes November 15, 2023 16:07

Alopalao added 2 commits November 16, 2023 19:45

Using _is_duplicated_evc() when updating

1086884

- Reverted RANGE_SB_PRIORITY adittion

Bypassed tag checking

a294896

viniarck self-requested a review November 20, 2023 14:56

viniarck reviewed Nov 20, 2023

View reviewed changes

utils.py Outdated Show resolved Hide resolved

models/path.py Outdated Show resolved Hide resolved

viniarck reviewed Nov 20, 2023

View reviewed changes

models/evc.py Outdated Show resolved Hide resolved

Alopalao changed the base branch from fix/handle_switch_changes to master November 20, 2023 21:15

Alopalao changed the base branch from master to fix/handle_switch_changes November 20, 2023 21:16

Alopalao added 2 commits November 20, 2023 16:21

Merge branch 'fix/handle_switch_changes' into epic/vlan_range

b4b2cb4

Updated arguments Interface tag functions

7052f3b

viniarck self-requested a review November 21, 2023 14:59

viniarck reviewed Nov 21, 2023

View reviewed changes

main.py Show resolved Hide resolved

viniarck reviewed Nov 21, 2023

View reviewed changes

models/evc.py Show resolved Hide resolved

viniarck reviewed Nov 21, 2023

View reviewed changes

CHANGELOG.rst Show resolved Hide resolved

viniarck reviewed Nov 21, 2023

View reviewed changes

models/evc.py Show resolved Hide resolved

Alopalao added 9 commits November 21, 2023 12:08

Added vlan_range support

7dde156

Fixed trace

2e6f94e

- Deleted unnecessary raises

Updated exceptions

8d45230

Added unit tests

6e71454

- Fixed partial vlan list update

Added RANGE_SB_PRIORITY

f8ac14d

- Updated changelog

Using _is_duplicated_evc() when updating

dcd59b0

- Reverted RANGE_SB_PRIORITY adittion

Bypassed tag checking

f95145e

Updated arguments Interface tag functions

3c02043

Merge branch 'epic/vlan_range' of https://github.com/kytos-ng/mef_eline…

f9e0143

… into epic/vlan_range

Alopalao marked this pull request as draft November 21, 2023 18:10

Base automatically changed from fix/handle_switch_changes to master November 22, 2023 12:43

viniarck closed this Nov 22, 2023

Alopalao deleted the epic/vlan_range branch November 27, 2023 16:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added vlan_range support #396

Added vlan_range support #396

Alopalao commented Nov 6, 2023 •

edited

Loading

Alopalao Nov 6, 2023

viniarck Nov 7, 2023

viniarck Nov 14, 2023

Alopalao Nov 15, 2023

viniarck Nov 20, 2023

viniarck Nov 21, 2023 •

edited

Loading

viniarck left a comment

viniarck Nov 7, 2023

Alopalao commented Nov 9, 2023 •

edited

Loading

Alopalao Nov 9, 2023

viniarck left a comment

viniarck commented Nov 14, 2023

Alopalao commented Nov 17, 2023

Alopalao commented Nov 21, 2023 •

edited

Loading

viniarck commented Nov 22, 2023

Added vlan_range support #396

Added vlan_range support #396

Conversation

Alopalao commented Nov 6, 2023 • edited Loading

Summary

Local Tests

End-To-End Tests

Alopalao Nov 6, 2023

Choose a reason for hiding this comment

viniarck Nov 7, 2023

Choose a reason for hiding this comment

viniarck Nov 14, 2023

Choose a reason for hiding this comment

Alopalao Nov 15, 2023

Choose a reason for hiding this comment

viniarck Nov 20, 2023

Choose a reason for hiding this comment

viniarck Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

viniarck left a comment

Choose a reason for hiding this comment

viniarck Nov 7, 2023

Choose a reason for hiding this comment

Alopalao commented Nov 9, 2023 • edited Loading

Alopalao Nov 9, 2023

Choose a reason for hiding this comment

viniarck left a comment

Choose a reason for hiding this comment

viniarck commented Nov 14, 2023

Alopalao commented Nov 17, 2023

Alopalao commented Nov 21, 2023 • edited Loading

viniarck commented Nov 22, 2023

Alopalao commented Nov 6, 2023 •

edited

Loading

viniarck Nov 21, 2023 •

edited

Loading

Alopalao commented Nov 9, 2023 •

edited

Loading

Alopalao commented Nov 21, 2023 •

edited

Loading