VPC: update default network offering for vpc tier to conserve_mode=1 #8309

weizhouapache · 2023-12-05T18:02:36Z

Description

This PR updates the conserve mode of default vpc tier offering to conserve_mode=1
so we can create both port forwarding and load balancing rules on a public IP in vpc tiers.

This fixes #8313

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

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?

weizhouapache · 2023-12-05T18:02:48Z

@blueorangutan package

blueorangutan · 2023-12-05T18:04:03Z

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

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

Co-authored-by: Pearl Dsilva <pearl1594@gmail.com>

codecov · 2023-12-05T18:10:51Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (a15b706) 22.25% compared to head (dddd8e7) 20.19%.
Report is 6 commits behind head on main.

Files	Patch %	Lines
...ain/java/com/cloud/network/vpc/VpcManagerImpl.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #8309      +/-   ##
============================================
- Coverage     22.25%   20.19%   -2.06%     
+ Complexity    22439    19978    -2461     
============================================
  Files          5117     5117              
  Lines        346819   346831      +12     
  Branches      49790    49795       +5     
============================================
- Hits          77190    70057    -7133     
- Misses       258466   266482    +8016     
+ Partials      11163    10292     -871

Flag	Coverage Δ
simulator-marvin-tests	`21.59% <0.00%> (-2.24%)`	⬇️
uitests	`4.44% <ø> (-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.

blueorangutan · 2023-12-05T18:58:52Z

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

weizhouapache · 2023-12-05T19:48:15Z

@blueorangutan test

harikrishna-patnala · 2023-12-06T08:07:13Z

@blueorangutan test

blueorangutan · 2023-12-06T08:08:04Z

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

weizhouapache · 2023-12-06T15:56:38Z

@blueorangutan package

blueorangutan · 2023-12-06T15:58:05Z

@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 · 2023-12-06T16:59:12Z

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

weizhouapache · 2023-12-06T17:36:46Z

@blueorangutan test matrix

blueorangutan · 2023-12-06T17:38:03Z

@weizhouapache a [SL] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

alexandremattioli · 2023-12-06T18:16:21Z

@weizhouapache great idea, conserve mode should definitely be true by default

blueorangutan · 2023-12-06T22:08:45Z

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

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	`Failure`	545.81	test_kubernetes_clusters.py
test_08_migrate_vm	`Error`	0.06	test_vm_life_cycle.py

blueorangutan · 2023-12-07T07:10:38Z

[SF] Trillian test result (tid-8491)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47258 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8309-t8491-xenserver-71.zip
Smoke tests completed. 118 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_DeployVmAntiAffinityGroup_in_project	`Error`	101.06	test_affinity_groups_projects.py
test_13_retrieve_vr_default_files	`Error`	1.09	test_diagnostics.py
test_14_retrieve_vr_one_file	`Error`	1.09	test_diagnostics.py
test_15_retrieve_ssvm_default_files	`Error`	1.10	test_diagnostics.py
test_16_retrieve_ssvm_single_file	`Error`	1.10	test_diagnostics.py
test_17_retrieve_cpvm_default_files	`Error`	1.09	test_diagnostics.py
test_18_retrieve_cpvm_single_file	`Error`	1.10	test_diagnostics.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	613.23	test_kubernetes_clusters.py

blueorangutan · 2023-12-07T07:54:37Z

[SF] Trillian test result (tid-8492)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 49776 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8309-t8492-vmware-67u3.zip
Smoke tests completed. 118 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_DeployVmAntiAffinityGroup_in_project	`Error`	103.95	test_affinity_groups_projects.py
test_01_browser_migrate_template	`Failure`	5.39	test_image_store_object_migration.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	621.77	test_kubernetes_clusters.py

weizhouapache · 2023-12-12T11:38:10Z

@blueorangutan package

blueorangutan · 2023-12-12T11:56:07Z

@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 · 2023-12-12T12:57:32Z

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

weizhouapache · 2023-12-12T13:06:29Z

@blueorangutan test matrix

blueorangutan · 2023-12-12T13:08:03Z

@weizhouapache a [SL] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2023-12-13T04:23:21Z

[SF] Trillian test result (tid-8560)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 53360 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8309-t8560-vmware-67u3.zip
Smoke tests completed. 117 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_DeployVmAntiAffinityGroup_in_project	`Error`	116.47	test_affinity_groups_projects.py
test_01_browser_migrate_template	`Failure`	5.44	test_image_store_object_migration.py
test_08_upgrade_kubernetes_ha_cluster	`Error`	4186.50	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	0.06	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	`Failure`	74.69	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	174.54	test_kubernetes_clusters.py
test_01_unmanage_vm_cycle	`Error`	115.46	test_vm_lifecycle_unmanage_import.py

weizhouapache · 2023-12-14T15:34:39Z

this is also a simple PR, users can benefit from it
cc @shwstppr @DaanHoogland

shwstppr · 2023-12-14T17:52:16Z

@blueorangutan package

blueorangutan · 2023-12-14T17:54:04Z

@shwstppr 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 · 2023-12-14T18:57:31Z

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

DaanHoogland

clgtm

shwstppr · 2023-12-16T18:08:20Z

@blueorangutan test

blueorangutan · 2023-12-16T18:10:03Z

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

shwstppr · 2023-12-18T06:38:23Z

Results from the backend,

14:34:24 + MSG='{"body": "<b>[SF] Trillian test result (tid-8613)</b>\nEnvironment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7\nTotal time taken: 52104 seconds\nMarvin logs: [https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8309-t8613-kvm-centos7.zip\nSmoke](https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8309-t8613-kvm-centos7.zip/nSmoke) tests completed. 121 look OK, 0 have errors, 0 did not run\nOnly failed and skipped tests results shown below:\n\n\nTest | Result | Time (s) | Test File\n--- | --- | --- | ---\n"}'

…pache#8309) This PR updates the conserve mode of default vpc tier offering to conserve_mode=1 so we can create both port forwarding and load balancing rules on a public IP in vpc tiers. This fixes apache#8313

…ring for vpc tier to conserve_mode=1

VPC: update default network offering for vpc tier to conserve_mode=1

5e33c4f

boring-cyborg bot added component:networking component:vpc labels Dec 5, 2023

Pearl1594 reviewed Dec 5, 2023

View reviewed changes

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java Outdated Show resolved Hide resolved

Update server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

c2d81af

Co-authored-by: Pearl Dsilva <pearl1594@gmail.com>

weizhouapache marked this pull request as ready for review December 5, 2023 19:48

weizhouapache marked this pull request as draft December 5, 2023 19:48

weizhouapache closed this Dec 5, 2023

weizhouapache reopened this Dec 5, 2023

Merge branch 'main' into 4.19-update-vpctier-offering-conserve-mode

22d0177

weizhouapache mentioned this pull request Dec 6, 2023

VPC: Public IP cannot be used by multiple services #8313

Closed

weizhouapache linked an issue Dec 6, 2023 that may be closed by this pull request

VPC: Public IP cannot be used by multiple services #8313

Closed

shwstppr added this to the 4.19.0.0 milestone Dec 6, 2023

Update: fix smoke test test_vpc_network

dddd8e7

boring-cyborg bot added component:integration-test Python Warning... Python code Ahead! labels Dec 6, 2023

weizhouapache marked this pull request as ready for review December 7, 2023 08:45

shwstppr modified the milestones: 4.19.0.0, 4.19.1.0 Dec 14, 2023

DaanHoogland approved these changes Dec 15, 2023

View reviewed changes

shwstppr requested a review from Pearl1594 December 15, 2023 11:45

Pearl1594 approved these changes Dec 15, 2023

View reviewed changes

shwstppr modified the milestones: 4.19.1.0, 4.19.0.0 Dec 15, 2023

shwstppr merged commit 33e2a4d into apache:main Dec 18, 2023

DaanHoogland deleted the 4.19-update-vpctier-offering-conserve-mode branch December 18, 2023 07:41

weizhouapache mentioned this pull request Feb 16, 2024

conserve-mode for Public IPs in VPCs. #4270

Closed

weizhouapache mentioned this pull request Dec 11, 2024

UI: create VPC network offering with conserve mode #10082

Merged

14 tasks

weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request Apr 17, 2025

engine/schema: Re-apply apache#8309: VPC: update default network offe…

702472b

…ring for vpc tier to conserve_mode=1

weizhouapache mentioned this pull request Apr 17, 2025

engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation #10744

Merged

14 tasks

Uh oh!

VPC: update default network offering for vpc tier to conserve_mode=1 #8309

VPC: update default network offering for vpc tier to conserve_mode=1 #8309

Uh oh!

Conversation

weizhouapache commented Dec 5, 2023 • 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!

weizhouapache commented Dec 5, 2023

Uh oh!

blueorangutan commented Dec 5, 2023

Uh oh!

Uh oh!

codecov bot commented Dec 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Dec 5, 2023

Uh oh!

weizhouapache commented Dec 5, 2023

Uh oh!

harikrishna-patnala commented Dec 6, 2023

Uh oh!

blueorangutan commented Dec 6, 2023

Uh oh!

weizhouapache commented Dec 6, 2023

Uh oh!

blueorangutan commented Dec 6, 2023

Uh oh!

blueorangutan commented Dec 6, 2023

Uh oh!

weizhouapache commented Dec 6, 2023

Uh oh!

blueorangutan commented Dec 6, 2023

Uh oh!

alexandremattioli commented Dec 6, 2023

Uh oh!

blueorangutan commented Dec 6, 2023

Uh oh!

blueorangutan commented Dec 7, 2023

Uh oh!

blueorangutan commented Dec 7, 2023

Uh oh!

weizhouapache commented Dec 12, 2023

Uh oh!

blueorangutan commented Dec 12, 2023

Uh oh!

blueorangutan commented Dec 12, 2023

Uh oh!

weizhouapache commented Dec 12, 2023

Uh oh!

blueorangutan commented Dec 12, 2023

Uh oh!

blueorangutan commented Dec 13, 2023

Uh oh!

weizhouapache commented Dec 14, 2023

Uh oh!

shwstppr commented Dec 14, 2023

Uh oh!

blueorangutan commented Dec 14, 2023

Uh oh!

blueorangutan commented Dec 14, 2023

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

shwstppr commented Dec 16, 2023

Uh oh!

blueorangutan commented Dec 16, 2023

Uh oh!

shwstppr commented Dec 18, 2023

Uh oh!

weizhouapache commented Dec 5, 2023 •

edited

Loading

codecov bot commented Dec 5, 2023 •

edited

Loading