Skip to content

Apply 2024.1 backports from 2023.1 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jul 5, 2024
Merged

Apply 2024.1 backports from 2023.1 #91

merged 2 commits into from
Jul 5, 2024

Conversation

@seunghun1ee
Copy link
Member

@seunghun1ee seunghun1ee commented Jul 2, 2024 •
edited
Loading

Applied following commits

Commit | Change-Id | Message
1704f74 None Fix backports
b4a9c39 I46684ae1cdd8207833172e5ee04aa865eb965931 fixup! Dell OS10 trunk port unit tests
e690d06 I5d2f098d7633a23d60ae85d8b1e4cffb43182b4e fixup! Dell OS10 backport without trunk port strip patch
f630c0a Ia8b2e2b8ea90830fbdbc60d8a3b64afe693224db VLAN aware VMs: pep8 fix ups
350949b None fixup! Add vlan aware VMs support
443e65f None fixup! Add vlan aware VMs support
0196f83 If084382f4c17438e5142f51f88d6e436f8b85082 Add vlan aware VMs support

Added Fix-up commit 7a0cec0 to fix test failures

@seunghun1ee seunghun1ee self-assigned this Jul 2, 2024
@seunghun1ee seunghun1ee requested a review from a team as a code owner July 2, 2024 09:32
@markgoddard
Copy link

markgoddard commented Jul 3, 2024

4 unit test failures

@seunghun1ee
Copy link
Member Author

seunghun1ee commented Jul 3, 2024 •
edited
Loading

4 unit tests all failed with same reason: AssertionError: Expected 'plug_port_to_network' to not have been called. Called 2 times (or 1 time)
This id due to the upstream change 0088fde on 4th July 2023.
This changes port binding tests to check if method plug_port_to_network is not actually called and new from 2024.1 release.

The cherry-pick 0196f83 from long time ago is the source I think.
If we see dd504cf#diff-580a3ba08ed54a9d5a4310f6b35bce84c90942b2799809aa8539bc6d5ded0188R525 , there's a case where plug_port_to_network can be called inside bind_port() that stable/2024.1 does not have.

@seunghun1ee
Copy link
Member Author

seunghun1ee commented Jul 4, 2024

@markgoddard Updated tests and port plugging logic. Tests are now passing.

jumpojoy and others added 2 commits July 5, 2024 09:50
@jumpojoy @markgoddard
Add vlan aware VMs support
2feadb0 
With this patch ngs starts supporting attaching of trunk port to
baremetal server. Only VLAN Neutron network is supported.

There are two ways to configure trunk port:

 * C1: When segmentation details for trunk ports are inherited from
   Neutron network. VLAN translation support is not required.
   Added implementation for cisco, arista, OVS on Linux.

 * C2: When user set segmentation details for trunk port explicitly.
   Switch should support VLAN translation for this case.
   Implement only for OVS on Linux, experimental.

NetmikoSwitch.plug_port_to_network() is deprecated. New bind_port()
should be used instead.

New switch config option: vlan_translation_supported was introduced.
This option defines if switch support vlan translation which affect
the way how trunk is configured.

Co-Authored-By: Will Szumski <will@stackhpc.com>
Co-Authored-By: Mark Goddard <mark@stackhpc.com>
Co-Authored-By: Seunghun Lee <seunghun@stackhpc.com>

Change-Id: If084382f4c17438e5142f51f88d6e436f8b85082
(cherry picked from commit 1163a1f)
(cherry picked from commit 7dfe3e2)
(cherry picked from commit c54e9ba)
(cherry picked from commit 701e93f)
(cherry picked from commit 0196f83)
@apdibbo @markgoddard
Cumulus NVUE support
c3868f0 
Add support for managing Cumulus Linux 5 through NVUE

Co-Authored-By: Michal Nasiadka <mnasiadka@gmail.com>

Change-Id: I2fd5ea08eab1125d857f7faeff5c0bbef80ab322
(cherry picked from commit 7d07a7dd39005dc7e980c6ede8f0a23896457822)
@markgoddard
Copy link

markgoddard commented Jul 5, 2024

@markgoddard Updated tests and port plugging logic. Tests are now passing.

Thanks for fixing up the code @seunghun1ee, you did a good job. I've pushed a few changes:

  • Some trivial test renames
  • Squash all trunk port commits into one
  • Apply Cumulus NVUE patch that was merged to antelope after you made this PR

@markgoddard markgoddard merged commit 9f36fd1 into stackhpc/2024.1 Jul 5, 2024
@markgoddard markgoddard deleted the 2024.1-cherrypick branch July 5, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@markgoddard markgoddard markgoddard approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@seunghun1ee seunghun1ee

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@seunghun1ee @markgoddard @jumpojoy @apdibbo