Skip to content

server: clean network offerings for domain on remove#7775

Merged
DaanHoogland merged 3 commits intoapache:4.18from
shapeblue:cleanDomainWithCleanup
Aug 7, 2023
Merged

server: clean network offerings for domain on remove#7775
DaanHoogland merged 3 commits intoapache:4.18from
shapeblue:cleanDomainWithCleanup

Conversation

@DaanHoogland
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland commented Jul 26, 2023

Description

This PR...

Fixes: #7773

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Copy link
Copy Markdown
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

checked the SQL in https://github.com/apache/cloudstack/blob/4.18.0.0/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql, this PR looks ok
there are some other solutions, but seem not better than this.

@weizhouapache weizhouapache changed the title clean network offerings for domain on remove server: clean network offerings for domain on remove Aug 2, 2023
@weizhouapache
Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@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
Copy link
Copy Markdown

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

@weizhouapache
Copy link
Copy Markdown
Member

@DaanHoogland
can you fix the unit test failures ? thanks

[INFO] Results:
[INFO] 
Error:  Failures: 
Error:    DomainManagerImplTest.deleteDomain:273
Error:    DomainManagerImplTest.deleteDomainCleanup:306
[INFO] 
Error:  Tests run: 1450, Failures: 2, Errors: 0, Skipped: 9

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@DaanHoogland can you fix the unit test failures ? thanks

[INFO] Results:
[INFO] 
Error:  Failures: 
Error:    DomainManagerImplTest.deleteDomain:273
Error:    DomainManagerImplTest.deleteDomainCleanup:306
[INFO] 
Error:  Tests run: 1450, Failures: 2, Errors: 0, Skipped: 9

yes will do. Also need to ad ee cleanup method for vpc offerings yet.

@DaanHoogland DaanHoogland force-pushed the cleanDomainWithCleanup branch from b3035b1 to b55365b Compare August 2, 2023 11:26
@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland 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
Copy link
Copy Markdown

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

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 2, 2023

Codecov Report

Merging #7775 (b55365b) into 4.18 (c86684f) will increase coverage by 0.00%.
The diff coverage is 37.50%.

❗ Current head b55365b differs from pull request most recent head d20d2ef. Consider uploading reports for the commit d20d2ef to get more accurate results

@@            Coverage Diff            @@
##               4.18    #7775   +/-   ##
=========================================
  Coverage     13.02%   13.02%           
- Complexity     9031     9036    +5     
=========================================
  Files          2720     2720           
  Lines        257010   257038   +28     
  Branches      40083    40089    +6     
=========================================
+ Hits          33472    33486   +14     
- Misses       219336   219345    +9     
- Partials       4202     4207    +5     
Files Changed Coverage Δ
...ain/java/com/cloud/api/query/QueryManagerImpl.java 2.99% <0.00%> (ø)
...rc/main/java/com/cloud/user/DomainManagerImpl.java 32.50% <39.47%> (+0.77%) ⬆️

... and 1 file with indirect coverage changes

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

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian Build Failed (tid-7240)

@weizhouapache
Copy link
Copy Markdown
Member

@blueorangutan test rocky8 kvm-rocky8

@weizhouapache
Copy link
Copy Markdown
Member

@DaanHoogland
is it ready for review ? do we need QA to test it ?

Copy link
Copy Markdown
Member

@harikrishna-patnala harikrishna-patnala 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
Copy link
Copy Markdown
Contributor Author

@DaanHoogland is it ready for review ? do we need QA to test it ?

yes it is, I was waiting for smoke tests, but there is a backend issue. will need to investigate that

@DaanHoogland DaanHoogland force-pushed the cleanDomainWithCleanup branch from b55365b to d20d2ef Compare August 3, 2023 06:34
@DaanHoogland DaanHoogland marked this pull request as ready for review August 3, 2023 06:35
@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland 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
Copy link
Copy Markdown

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

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

DaanHoogland commented Aug 3, 2023

@blueorangutan test rocky8 kvm-rocky8

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7244)
Environment: kvm-rocky8 (x2), Advanced Networking with Mgmt server r8
Total time taken: 45953 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7775-t7244-kvm-rocky8.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

Copy link
Copy Markdown
Member

@kiranchavala kiranchavala left a comment

Choose a reason for hiding this comment

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

LGTM, tested manually

Created domain
Created network offering or vpc offering assoicated with the domain
Deleted the domain
The network and vpc offerings were also cleaned up

@DaanHoogland DaanHoogland merged commit dea1373 into apache:4.18 Aug 7, 2023
@DaanHoogland DaanHoogland deleted the cleanDomainWithCleanup branch August 7, 2023 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Delete domain with clean up doesn't delete the network and vpc offerings associated with the domain

5 participants