server: fix cannot get systemvm ips in dedicated ranges by weizhouapache · Pull Request #7144 · apache/cloudstack

weizhouapache · 2023-01-30T12:08:03Z

Description

This PR fixes #6698

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

…e 6698)

weizhouapache · 2023-01-30T12:08:28Z

@blueorangutan package

blueorangutan · 2023-01-30T12:09:03Z

@weizhouapache a 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-01-30T13:09:11Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5440

codecov · 2023-01-30T14:06:29Z

Codecov Report

Merging #7144 (43cd1c4) into main (83c2bfa) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main    #7144      +/-   ##
============================================
- Coverage     11.79%   11.79%   -0.01%     
+ Complexity     7692     7689       -3     
============================================
  Files          2511     2511              
  Lines        246578   246582       +4     
  Branches      38446    38449       +3     
============================================
- Hits          29090    29076      -14     
- Misses       213703   213721      +18     
  Partials       3785     3785

Impacted Files	Coverage Δ
...src/main/java/com/cloud/api/ApiResponseHelper.java	`3.87% <0.00%> (ø)`
.../cloud/configuration/ConfigurationManagerImpl.java	`12.47% <0.00%> (-0.05%)`	⬇️
...n/java/com/cloud/network/IpAddressManagerImpl.java	`2.04% <0.00%> (-0.10%)`	⬇️
...dstack/network/contrail/model/ModelObjectBase.java	`28.84% <0.00%> (-19.24%)`	⬇️
...cloudstack/network/contrail/model/ModelObject.java	`29.16% <0.00%> (-4.17%)`	⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

weizhouapache · 2023-01-30T15:11:40Z

@blueorangutan test

blueorangutan · 2023-01-30T15:12:03Z

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

blueorangutan · 2023-01-31T03:11:29Z

Trillian test result (tid-6031)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41789 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7144-t6031-kvm-centos7.zip
Smoke tests completed. 103 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_nic	`Error`	154.56	test_nic.py
test_01_deployVMInSharedNetwork	`Failure`	0.11	test_network.py
test_02_verifyRouterIpAfterNetworkRestart	`Failure`	1.07	test_network.py
test_03_destroySharedNetwork	`Failure`	1.07	test_network.py
test_dedicatePublicIpRange	`Failure`	0.28	test_public_ip_range.py
test_updating_nics_on_two_shared_networks	`Error`	0.27	test_gateway_on_shared_networks.py

weizhouapache · 2023-01-31T07:38:09Z

@blueorangutan package

blueorangutan · 2023-01-31T07:39:04Z

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

sonarqubecloud · 2023-01-31T08:34:48Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

2.0% Coverage
0.0% Duplication

blueorangutan · 2023-01-31T08:43:32Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5452

weizhouapache · 2023-01-31T15:01:36Z

@blueorangutan test

blueorangutan · 2023-01-31T15:02:04Z

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

blueorangutan · 2023-02-01T06:29:12Z

Trillian test result (tid-6052)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43631 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7144-t6052-kvm-centos7.zip
Smoke tests completed. 107 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

yadvr

Code LGTM, didn't test it. This may need manual testing. I'm not sure if the changes in marvin tests are enough?

github-actions · 2023-04-11T09:09:22Z

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

weizhouapache · 2023-08-03T05:30:06Z

@blueorangutan package

blueorangutan · 2023-08-03T05:32:05Z

@weizhouapache a [SF] 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-08-03T06:38:29Z

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

DaanHoogland

clgtm, small remarks

DaanHoogland · 2023-06-26T13:28:51Z

@@ -821,128 +815,99 @@ public PublicIp fetchNewPublicIp(final long dcId, final Long podId, final List<L
    public List<IPAddressVO> listAvailablePublicIps(final long dcId, final Long podId, final List<Long> vlanDbIds, final Account owner, final VlanType vlanUse, final Long guestNetworkId,


this method is more than a hundred lines. I think we must modularize it a bit more.

DaanHoogland · 2023-06-26T13:29:14Z

+        if (assign) {
+            addr = assignAndAllocateIpAddressEntry(owner, vlanUse, guestNetworkId, sourceNat, allocate,
+                    isSystem,vpcId, displayIp, addrs);
+        }


can be extracted

weizhouapache · 2023-08-16T07:07:11Z

@blueorangutan package

blueorangutan · 2023-08-16T07:08:03Z

@weizhouapache a [SF] 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-08-16T08:08:33Z

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

DaanHoogland · 2023-08-16T11:06:12Z

@blueorangutan test

blueorangutan · 2023-08-16T11:08:06Z

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

blueorangutan · 2023-08-17T02:57:15Z

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

Test	Result	Time (s)	Test File
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers	`Failure`	426.62	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Failure`	664.60	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	664.62	test_vpc_redundant.py

blueorangutan · 2023-08-17T20:23:12Z

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

Test	Result	Time (s)	Test File

yadvr · 2023-08-22T09:09:45Z

@weizhouapache @DaanHoogland can this be merged, or need furthet testing/review?

weizhouapache · 2023-08-22T09:13:46Z

@weizhouapache @DaanHoogland can this be merged, or need furthet testing/review?

@rohityadavcloud
yes, this needs reproducing and testing (ongoing...)

DaanHoogland · 2023-08-25T09:15:54Z

verified: after setting system.vm.public.reservation.mode.strictness to true and use.system.public.ips to false on 4.18.0 SVMs won't come up. After upgrading to this PR they do. 👍

weizhouapache · 2023-08-25T09:36:10Z

Thanks @DaanHoogland for verification
merging

weizhouapache added 2 commits January 30, 2023 13:06

server: fix cannot get systemvm ips in dedicated ranges (Issue 6698)

44ef7ec

server: refactoring fetchNewPublicIp and listAvailablePublicIps (issu…

37d28d4

…e 6698)

boring-cyborg Bot added component:networking component:UI labels Jan 30, 2023

Update 7144: fix test_public_ip_range.py

b15b539

weizhouapache added 2 commits January 31, 2023 08:20

Update 7144: fix ip allocation in shared networks

ec58f78

server: dedicated systemvm ip range to ROOT domain should fail

43cd1c4

boring-cyborg Bot added component:integration-test Python Warning... Python code Ahead! labels Jan 31, 2023

weizhouapache marked this pull request as ready for review January 31, 2023 15:35

yadvr requested a review from DaanHoogland February 1, 2023 14:36

yadvr approved these changes Feb 1, 2023

View reviewed changes

DaanHoogland added this to the 4.18.1.0 milestone Feb 7, 2023

DaanHoogland assigned vladimirpetrov Feb 8, 2023

github-actions Bot added the status:has-conflicts label Apr 11, 2023

yadvr requested a review from shwstppr May 8, 2023 07:17

weizhouapache mentioned this pull request May 8, 2023

Dedication of public IP ranges broken after upgrade to 4.17.0.1 #6698

Closed

DaanHoogland changed the base branch from main to 4.18 June 22, 2023 12:42

github-actions Bot removed the status:has-conflicts label Jun 22, 2023

DaanHoogland approved these changes Aug 3, 2023

View reviewed changes

weizhouapache self-assigned this Aug 23, 2023

DaanHoogland mentioned this pull request Aug 25, 2023

server: fix global setting system.vm.public.ip.reservation.mode.strictness is not really dynamic #7909

Merged

12 tasks

weizhouapache merged commit 8dc5fdd into apache:4.18 Aug 25, 2023

DaanHoogland deleted the 4.18-issue-6698 branch August 25, 2023 11:47

		@@ -821,128 +815,99 @@ public PublicIp fetchNewPublicIp(final long dcId, final Long podId, final List<L
		public List<IPAddressVO> listAvailablePublicIps(final long dcId, final Long podId, final List<Long> vlanDbIds, final Account owner, final VlanType vlanUse, final Long guestNetworkId,

Conversation

weizhouapache commented Jan 30, 2023

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

weizhouapache commented Jan 30, 2023

Uh oh!

blueorangutan commented Jan 30, 2023

Uh oh!

blueorangutan commented Jan 30, 2023

Uh oh!

codecov Bot commented Jan 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Jan 30, 2023

Uh oh!

blueorangutan commented Jan 30, 2023

Uh oh!

blueorangutan commented Jan 31, 2023

Uh oh!

weizhouapache commented Jan 31, 2023

Uh oh!

blueorangutan commented Jan 31, 2023

Uh oh!

sonarqubecloud Bot commented Jan 31, 2023

Uh oh!

blueorangutan commented Jan 31, 2023

Uh oh!

weizhouapache commented Jan 31, 2023

Uh oh!

blueorangutan commented Jan 31, 2023

Uh oh!

blueorangutan commented Feb 1, 2023

Uh oh!

yadvr left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 11, 2023

Uh oh!

weizhouapache commented Aug 3, 2023

Uh oh!

blueorangutan commented Aug 3, 2023

Uh oh!

blueorangutan commented Aug 3, 2023

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Jun 26, 2023

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Jun 26, 2023

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Aug 16, 2023

Uh oh!

blueorangutan commented Aug 16, 2023

Uh oh!

blueorangutan commented Aug 16, 2023

Uh oh!

DaanHoogland commented Aug 16, 2023

Uh oh!

blueorangutan commented Aug 16, 2023

Uh oh!

blueorangutan commented Aug 17, 2023

Uh oh!

blueorangutan commented Aug 17, 2023

Uh oh!

yadvr commented Aug 22, 2023

Uh oh!

weizhouapache commented Aug 22, 2023

Uh oh!

DaanHoogland commented Aug 25, 2023

Uh oh!

codecov Bot commented Jan 30, 2023 •

edited

Loading