Prepend VPC name to VPC network tier name by abh1sar · Pull Request #9780 · apache/cloudstack

abh1sar · 2024-10-08T11:02:30Z

Description

Network tiers which belong to a VPC have their own individual names, in the networks tab they are listed with all other networks, in order to make it easier to identify those networks and correlate them with the VPCs. their names should be prepended with the name of the VPC they belong to.

This PR prepends VPC name to the network tier name using a delimiter.
This feature can be enabled using a global setting which is disabled by default.
The delimiter can also be changed using a global setting. " " by default.

Doc PR : apache/cloudstack-documentation#445

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?

… than English (apache#9766) * Fix updateTemplatePermission UI in non-english language * Improve fix --------- Co-authored-by: Lucas Martins <lucas.martins@scclouds.com.br>

codecov · 2024-10-08T11:10:03Z

Codecov Report

Attention: Patch coverage is 58.82353% with 7 lines in your changes missing coverage. Please review.

Project coverage is 15.78%. Comparing base (019f2c6) to head (27b393a).
Report is 532 commits behind head on main.

Files with missing lines	Patch %	Lines
...ain/java/com/cloud/network/vpc/VpcManagerImpl.java	14.28%	6 Missing ⚠️
...ain/java/com/cloud/network/NetworkServiceImpl.java	87.50%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #9780 +/- ##
===========================================
Coverage 15.78% 15.78% - Complexity 12564 12568 +4 
===========================================
Files 5627 5628 +1 Lines 492250 492266 +16 Branches 61405 63361 +1956 ===========================================
+ Hits 77710 77719 +9 - Misses 406066 406072 +6 - Partials 8474 8475 +1

Flag	Coverage Δ
uitests	`4.04% <ø> (ø)`
unittests	`16.60% <58.82%> (+<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.

sureshanaparti

clgtm

sureshanaparti · 2024-10-08T12:53:42Z

@blueorangutan package

blueorangutan · 2024-10-08T12:56:04Z

@sureshanaparti 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 · 2024-10-08T13:57:25Z

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

DaanHoogland · 2024-10-08T14:34:36Z

+ if (vpcId != null && VpcManager.VpcTierNamePrepend.value()) {
+ final String delimiter = VpcManager.VpcTierNamePrependDelimiter.value();
+ Vpc vpc = _vpcDao.findById(vpcId);
+ if (vpc != null) {
+ name = vpc.getName() + delimiter + name;
+ }
+ }


can this be a method called at the moment name is being set?

Done. please check.

abh1sar · 2024-10-09T08:42:12Z

@blueorangutan package

blueorangutan · 2024-10-09T08:44:03Z

@abh1sar 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 · 2024-10-09T09:44:15Z

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

abh1sar · 2024-10-09T09:47:18Z

@blueorangutan test

blueorangutan · 2024-10-09T09:48:04Z

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

blueorangutan · 2024-10-10T01:04:59Z

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

Test	Result	Time (s)	Test File

alexandremattioli · 2024-10-10T12:45:14Z

@abh1sar are there any documentation changes?

abh1sar · 2024-10-10T16:05:13Z

@abh1sar are there any documentation changes?

@alexandremattioli yes. apache/cloudstack-documentation#445

kiranchavala

LGTM

Test Case Execution	Result
Verify the functionality of global setting (vpc.tier.name.prepend.delimiter)	Pass
Test the global settings at account and project level	Pass
Verify the functionality of global setting (vpc.tier.name.prepend)	Pass

* Fix `updateTemplatePermission` when the UI is set to a language other than English (apache#9766) * Fix updateTemplatePermission UI in non-english language * Improve fix --------- Co-authored-by: Lucas Martins <lucas.martins@scclouds.com.br> * Prepend vpc name to vpc tier network name based on global setting * Added UT for createVpcGuestNetwork * rename connector to delimiter and add configKey.Category.Network * Move setting the name to a new method --------- Co-authored-by: Daan Hoogland <daan@onecht.net> Co-authored-by: Lucas Martins <56271185+lucas-a-martins@users.noreply.github.com> Co-authored-by: Lucas Martins <lucas.martins@scclouds.com.br>

DaanHooglandand others added 4 commits October 2, 2024 16:50

Merge branch '4.19'
c087de4

Fix updateTemplatePermission when the UI is set to a language other…
d6181d5
… than English (apache#9766) * Fix updateTemplatePermission UI in non-english language * Improve fix --------- Co-authored-by: Lucas Martins <lucas.martins@scclouds.com.br>

Prepend vpc name to vpc tier network name based on global setting
1b63881

Added UT for createVpcGuestNetwork
0960ca0

boring-cyborgBot added component:networking component:vpc labels Oct 8, 2024

abh1sar requested a review from sureshanaparti October 8, 2024 11:55

sureshanaparti reviewed Oct 8, 2024
View reviewed changes

Comment threadengine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java Outdated

sureshanaparti reviewed Oct 8, 2024
View reviewed changes

Comment threadengine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java Outdated

sureshanaparti reviewed Oct 8, 2024
View reviewed changes

Comment threadserver/src/main/java/com/cloud/network/NetworkServiceImpl.java Outdated

rename connector to delimiter and add configKey.Category.Network
a73d4d0

abh1sar requested a review from sureshanaparti October 8, 2024 12:44

sureshanaparti approved these changes Oct 8, 2024
View reviewed changes

sureshanaparti added this to the 4.20.1.0 milestone Oct 8, 2024

sureshanaparti added the status:needs-testing label Oct 8, 2024

DaanHoogland approved these changes Oct 8, 2024
View reviewed changes

kiranchavala mentioned this pull request Oct 9, 2024
Option to restrict duplicate instance names in same network domain, VPC etc #9775
Closed

Move setting the name to a new method
4857703

abh1sar mentioned this pull request Oct 9, 2024
Global settings to prepend VPC name to Tier name apache/cloudstack-documentation#445
Merged

alexandremattioli approved these changes Oct 10, 2024
View reviewed changes

DaanHoogland force-pushed the main branch from e5bd83e to 046870eCompare October 11, 2024 15:08

kiranchavala approved these changes Oct 14, 2024
View reviewed changes

kiranchavala removed the status:needs-testing label Oct 14, 2024

Merge branch 'main' into vpc-prepend
27b393a

abh1sar marked this pull request as ready for review October 21, 2024 07:04

yadvr modified the milestones: 4.20.1, 4.21.0 Dec 3, 2024

yadvr merged commit ef6c0c4 into apache:mainDec 3, 2024

sureshanaparti added the type:improvement label Jun 4, 2025

sureshanaparti added this to Apache CloudStack 4.21.0 Jun 5, 2025

sureshanaparti moved this to Done in Apache CloudStack 4.21.0 Jul 14, 2025

abh1sar deleted the vpc-prepend branch April 18, 2026 01:02

Uh oh!

Conversation

abh1sar commented Oct 8, 2024• 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!

codecovBot commented Oct 8, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

sureshanaparti commented Oct 8, 2024

Uh oh!

blueorangutan commented Oct 8, 2024

Uh oh!

blueorangutan commented Oct 8, 2024

Uh oh!

DaanHooglandOct 8, 2024

Choose a reason for hiding this comment

Uh oh!

abh1sarOct 9, 2024

Choose a reason for hiding this comment

Uh oh!

abh1sar commented Oct 9, 2024

Uh oh!

blueorangutan commented Oct 9, 2024

Uh oh!

blueorangutan commented Oct 9, 2024

Uh oh!

abh1sar commented Oct 9, 2024

Uh oh!

blueorangutan commented Oct 9, 2024

Uh oh!

blueorangutan commented Oct 10, 2024

Uh oh!

alexandremattioli commented Oct 10, 2024

Uh oh!

abh1sar commented Oct 10, 2024

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

abh1sar commented Oct 8, 2024•
edited
Loading

codecovBot commented Oct 8, 2024•
edited
Loading