VPC: check only ssh services if VPC VR does not have any guest network by weizhouapache · Pull Request #11190 · apache/cloudstack

weizhouapache · 2025-07-14T06:43:45Z

Description

This PR fixes #10088

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

Screenshots (if appropriate):

How Has This Been Tested?

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

codecov · 2025-07-14T06:52:00Z

Codecov Report

❌ Patch coverage is 0% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 15.18%. Comparing base (48648d4) to head (56f5ae9).
⚠️ Report is 618 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
.../resource/virtualnetwork/model/MonitorService.java	0.00%	3 Missing ⚠️
...ork/router/VirtualNetworkApplianceManagerImpl.java	0.00%	3 Missing ⚠️
...ualnetwork/facade/SetMonitorServiceConfigItem.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #11190   +/-   ##
=========================================
  Coverage     15.18%   15.18%           
- Complexity    11370    11375    +5     
=========================================
  Files          5415     5415           
  Lines        476073   476079    +6     
  Branches      58125    58126    +1     
=========================================
+ Hits          72290    72307   +17     
+ Misses       395695   395681   -14     
- Partials       8088     8091    +3

Flag	Coverage Δ
uitests	`4.28% <ø> (ø)`
unittests	`15.91% <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.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

weizhouapache · 2025-07-14T10:44:10Z

@blueorangutan package

blueorangutan · 2025-07-14T10:46:04Z

@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 · 2025-07-14T15:00:56Z

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

Copilot

Pull Request Overview

This PR fixes issue #10088 by modifying the VPC router monitoring behavior to only check SSH services when the VPC Virtual Router has no guest networks configured.

Adds an included_services parameter to control which services are monitored in the monitoring script
Implements logic to set SSH as the only included service for VPC routers without guest networks
Optimizes health check data retrieval by moving it earlier in the execution flow

Reviewed Changes

Copilot reviewed 5 out of 7 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
systemvm/debian/root/monitorServices.py	Updates the monitoring script to support filtering services and optimizes health check data retrieval
server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java	Adds logic to set SSH as the only included service for VPC routers without guest networks
core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java	Adds includedServices field to the MonitorService model
core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java	Updates configuration to handle the new included services parameter
core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java	Adds constant for the included services configuration key

DaanHoogland

clgtm

blueorangutan · 2025-08-25T23:30:43Z

[SF] Trillian test result (tid-14105)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 47082 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11190-t14105-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_isolate_network_password_server	`Failure`	15.45	test_password_server.py
test_01_secure_vm_migration	`Error`	135.47	test_vm_life_cycle.py
test_01_secure_vm_migration	`Error`	135.48	test_vm_life_cycle.py

weizhouapache · 2025-08-27T09:27:35Z

moved to draft
let's wait for #10710

weizhouapache · 2025-09-02T09:48:39Z

since #10710 is targeted to main/4.22, open this PR for 4.19/4.20

cc @DaanHoogland

weizhouapache · 2025-09-03T13:51:49Z

@blueorangutan package

blueorangutan · 2025-09-03T13:54:08Z

@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 · 2025-09-03T15:09:00Z

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

weizhouapache · 2025-09-15T15:07:03Z

moving to 4.20.3 due to inactivity

DaanHoogland · 2025-09-16T08:39:51Z

@blueorangutan test keepEnv

blueorangutan · 2025-09-16T08:42:03Z

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

blueorangutan · 2025-09-17T00:49:13Z

[SF] Trillian test result (tid-14355)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 54732 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11190-t14355-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

DaanHoogland · 2025-09-17T11:41:45Z

verified in a lab env : no errors on a new VPC

weizhouapache · 2025-09-18T18:20:47Z

Thanks @DaanHoogland

Can we merge ? does it have conflicts with your PR #10710 ?

verified in a lab env : no errors on a new VPC

DaanHoogland · 2025-09-19T12:49:46Z

Thanks @DaanHoogland

Can we merge ? does it have conflicts with your PR #10710 ?

verified in a lab env : no errors on a new VPC

Yes it will have and we’ll have to deal after merging (either)

github-actions · 2025-09-22T11:31:56Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

weizhouapache · 2025-09-24T07:14:48Z

closing it in favor of #10710

VPC: check only ssh services if VPC VR does not have any guest network

c8be834

boring-cyborg Bot added component:api component:networking component:virtual-router Python Warning... Python code Ahead! labels Jul 14, 2025

weizhouapache linked an issue Jul 14, 2025 that may be closed by this pull request

VR Healthcheck Fails when a VPC is created, but there are no VMs created in the VPC yet. #10088

Closed

sureshanaparti requested a review from Copilot July 23, 2025 17:48

Copilot AI reviewed Jul 23, 2025

View reviewed changes

Comment thread systemvm/debian/root/monitorServices.py

Comment thread core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java

DaanHoogland approved these changes Aug 25, 2025

View reviewed changes

DaanHoogland self-assigned this Aug 25, 2025

DaanHoogland added the status:needs-testing label Aug 25, 2025

weizhouapache marked this pull request as ready for review August 25, 2025 11:21

weizhouapache marked this pull request as draft August 27, 2025 09:26

Merge branch '4.19' into 4.19-fix-vpc-vr-health-check-no-tier

56f5ae9

weizhouapache marked this pull request as ready for review September 2, 2025 09:48

weizhouapache added this to the 4.20.2 milestone Sep 3, 2025

weizhouapache modified the milestones: 4.20.2, 4.20.3 Sep 15, 2025

weizhouapache modified the milestones: 4.20.3, 4.20.2 Sep 18, 2025

DaanHoogland removed the status:needs-testing label Sep 19, 2025

weizhouapache changed the base branch from 4.19 to main September 22, 2025 10:37

weizhouapache changed the base branch from main to 4.20 September 22, 2025 10:39

github-actions Bot added the status:has-conflicts label Sep 22, 2025

weizhouapache closed this Sep 24, 2025

DaanHoogland removed their assignment Dec 24, 2025

weizhouapache mentioned this pull request Feb 19, 2026

VR HealthCheck fails when there are no VMs deployed #12643

Open

weizhouapache mentioned this pull request May 22, 2026

server: exclude webserver/apache2 check in VPC VR without tiers #13219

Draft

14 tasks

Conversation

weizhouapache commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

codecov Bot commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Aug 25, 2025

Uh oh!

weizhouapache commented Aug 27, 2025

Uh oh!

weizhouapache commented Sep 2, 2025

Uh oh!

weizhouapache commented Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

weizhouapache commented Sep 15, 2025

Uh oh!

DaanHoogland commented Sep 16, 2025

Uh oh!

blueorangutan commented Sep 16, 2025

Uh oh!

blueorangutan commented Sep 17, 2025

Uh oh!

DaanHoogland commented Sep 17, 2025

Uh oh!

weizhouapache commented Sep 18, 2025

Uh oh!

DaanHoogland commented Sep 19, 2025

Uh oh!

github-actions Bot commented Sep 22, 2025

Uh oh!

weizhouapache commented Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

weizhouapache commented Jul 14, 2025 •

edited

Loading

codecov Bot commented Jul 14, 2025 •

edited

Loading