Skip to content
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

Enable multiple services on configdrive network service provider #10372

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Enable multiple services on configdrive network service provider #10372

merged 1 commit into from
Feb 14, 2025

Conversation

Pearl1594
Copy link
Contributor

Description

This PR fixes: #10296
Historically, Configdrive only allowed a single service to be provided - namely, userdata. However, it can be used to provide DHCP and dns service as well.

after fix:

(localcloud) 🐱 > update networkserviceprovider id=1f32db86-e7a8-4b38-af32-387049438db9 servicelist=userdata,dns,dhcp
{
  "networkserviceprovider": {
    "canenableindividualservice": true,
    "id": "1f32db86-e7a8-4b38-af32-387049438db9",
    "name": "ConfigDrive",
    "physicalnetworkid": "5e575189-779f-416b-843a-625e813119b6",
    "servicelist": [
      "Dhcp",
      "Dns",
      "UserData"
    ],
    "state": "Enabled"
  }
}



(localcloud) 🐱 > list networkserviceproviders name=Configdrive
{
  "count": 2,
  "networkserviceprovider": [
    {
      "canenableindividualservice": true,
      "id": "1f32db86-e7a8-4b38-af32-387049438db9",
      "name": "ConfigDrive",
      "physicalnetworkid": "5e575189-779f-416b-843a-625e813119b6",
      "servicelist": [
        "Dhcp",
        "Dns",
        "UserData"
      ],
      "state": "Enabled"
    },
    {
      "canenableindividualservice": true,
      "id": "2150b514-4b83-45d5-9ac9-a8feafe10b8e",
      "name": "ConfigDrive",
      "physicalnetworkid": "aad89f31-82ad-4ec3-86c8-bd4abc823605",
      "servicelist": [
        "UserData"
      ],
      "state": "Enabled"
    }
  ]
}

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?

@Pearl1594 Pearl1594 linked an issue Feb 11, 2025 that may be closed by this pull request
Unable to add services to ConfigDrive network service provider #10296
Open
@codecov Codecov
Copy link

codecov bot commented Feb 11, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 15.99%. Comparing base (5aa79a6) to head (c385454).

Files with missing lines Patch % Lines
...oud/network/element/ConfigDriveNetworkElement.java 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff            @@
##               4.20   #10372   +/-   ##
=========================================
  Coverage     15.99%   15.99%           
- Complexity    13060    13063    +3     
=========================================
  Files          5644     5644           
  Lines        494915   494915           
  Branches      59960    59960           
=========================================
+ Hits          79173    79186   +13     
+ Misses       406910   406892   -18     
- Partials       8832     8837    +5
Flag Coverage Δ
uitests 4.01% <ø> (ø)
unittests 16.83% <0.00%> (+<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 approved these changes Feb 11, 2025
View reviewed changes
Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

code lgtm

@DaanHoogland
does 4.19 need this ?

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@DaanHoogland
Copy link
Contributor

code lgtm

@DaanHoogland does 4.19 need this ?

it could, but I do not want to block the release for it.

@rohityadavcloud rohityadavcloud added this to the 4.20.1 milestone Feb 13, 2025
@weizhouapache
Copy link
Member

@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.

@blueorangutan
Copy link

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

@Pearl1594
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

@Pearl1594 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-12392)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 56278 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10372-t12392-kvm-ol8.zip
Smoke tests completed. 139 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_11_isolated_network_with_dynamic_routed_mode Error 2.32 test_ipv4_routing.py
test_12_vpc_and_tier_with_dynamic_routed_mode Error 2.37 test_ipv4_routing.py
test_12_vpc_and_tier_with_dynamic_routed_mode Error 2.37 test_ipv4_routing.py
test_06_purge_expunged_vm_background_task Failure 395.36 test_purge_expunged_vms.py

@weizhouapache
Copy link
Member

verified ok

@weizhouapache weizhouapache merged commit 07564b7 into 4.20 Feb 14, 2025
47 of 49 checks passed
@DaanHoogland DaanHoogland deleted the enable-multiple-svc-configdrive branch February 14, 2025 07:55
@JoaoJandre JoaoJandre mentioned this pull request Feb 14, 2025
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoaoJandre JoaoJandre JoaoJandre approved these changes

@weizhouapache weizhouapache weizhouapache approved these changes

@NuxRo NuxRo Awaiting requested review from NuxRo

@DaanHoogland DaanHoogland Awaiting requested review from DaanHoogland

Assignees
No one assigned
Labels
component:networking
Projects
None yet
Milestone
4.20.1
Development

Successfully merging this pull request may close these issues.

Unable to add services to ConfigDrive network service provider
6 participants
@Pearl1594 @DaanHoogland @weizhouapache @blueorangutan @JoaoJandre @rohityadavcloud