Skip to content

Conversation

@weizhouapache
Copy link
Member

Description

This PR fixes the issue that s2s vpn cannot be applied if split-connections is enabled

the issue is because count is a build-in method in python3 , len should be used instead.

>>> aa=[]
>>> aa.count
<built-in method count of list object at 0x76e292158b40>
>>> len(aa)
0

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@codecov
Copy link

codecov bot commented Dec 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 15.12%. Comparing base (971a5b2) to head (524e787).
Report is 13 commits behind head on 4.19.

Additional details and impacted files
@@            Coverage Diff            @@
##               4.19   #10067   +/-   ##
=========================================
  Coverage     15.12%   15.12%           
- Complexity    11259    11261    +2     
=========================================
  Files          5408     5408           
  Lines        473842   473842           
  Branches      57771    57771           
=========================================
+ Hits          71677    71687   +10     
+ Misses       394168   394156   -12     
- Partials       7997     7999    +2     
Flag Coverage Δ
uitests 4.30% <ø> (ø)
unittests 15.84% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@weizhouapache weizhouapache added this to the 4.19.2 milestone Dec 9, 2024
Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11760

@DaanHoogland
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian test result (tid-11870)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 46086 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10067-t11870-kvm-ol8.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_04_extract_Iso Failure 16.15 test_iso.py
test_01_secure_vm_migration Error 134.45 test_vm_life_cycle.py
test_01_secure_vm_migration Error 134.45 test_vm_life_cycle.py

@DaanHoogland DaanHoogland linked an issue Dec 10, 2024 that may be closed by this pull request
@andrijapanicsb
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@andrijapanicsb a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11888

@andrijapanicsb
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

@andrijapanicsb a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11972)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11973)

Copy link
Member

@vishesh92 vishesh92 left a comment

Choose a reason for hiding this comment

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

clgtm. didn't test.

@DaanHoogland
Copy link
Contributor

tested in lab env, both active and passive versions get created

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian test result (tid-11988)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 45112 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10067-t11988-kvm-ol8.zip
Smoke tests completed. 133 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File

@blueorangutan
Copy link

[SF] Trillian test result (tid-11995)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 45948 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10067-t11995-kvm-ol8.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_secure_vm_migration Error 134.40 test_vm_life_cycle.py
test_01_secure_vm_migration Error 134.41 test_vm_life_cycle.py

@DaanHoogland DaanHoogland merged commit 5c01cff into apache:4.19 Dec 28, 2024
25 checks passed
@DaanHoogland DaanHoogland deleted the 4.19-fix-s2s-split-connections branch December 28, 2024 11:09
DaanHoogland added a commit that referenced this pull request Dec 30, 2024
* 4.19:
  VR: fix site-2-site VPN if split connections is enabled (#10067)
  UI: fix cannot open 'Edit tags' modal for static routes (#10065)
DaanHoogland added a commit that referenced this pull request Dec 30, 2024
* 4.20:
  VR: fix site-2-site VPN if split connections is enabled (#10067)
  UI: fix cannot open 'Edit tags' modal for static routes (#10065)
  Update ownership selection component to be language independent (#10052)
  Support to enable/disable VM High Availability manager and related alerts (#10118)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jan 10, 2025
@DaanHoogland DaanHoogland linked an issue May 14, 2025 that may be closed by this pull request
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.

Upgrading Broke vpc and kubernetes (4.18 to 4.20) Router S2_VPN script broken

5 participants