Skip to content

Set network state to implemented when no services#6838

Merged
DaanHoogland merged 3 commits into
apache:mainfrom
shapeblue:setImplementedWhenNoServices
Oct 24, 2022
Merged

Set network state to implemented when no services#6838
DaanHoogland merged 3 commits into
apache:mainfrom
shapeblue:setImplementedWhenNoServices

Conversation

@DaanHoogland

Copy link
Copy Markdown
Contributor

Description

This PR fixes an issue where isolated networks without services created in version before 4.17 and in state 'Setup' could not be used even though they require no further implementation

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?

implemented in an upgraded environment from 4.15 to 4.17 with a network in setup state

before: a new VM could not be started in the network (as it was in state 'Setup'
after a vm could be started in the network

@acs-robot

Copy link
Copy Markdown

Found UI changes, kicking a new UI QA build
@blueorangutan ui

@blueorangutan

Copy link
Copy Markdown

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

@DaanHoogland
DaanHoogland marked this pull request as ready for review October 20, 2022 09:18
@blueorangutan

Copy link
Copy Markdown

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6838 (SL-JID-2535)

@DaanHoogland DaanHoogland self-assigned this Oct 20, 2022
Comment thread engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql Outdated
Comment thread engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql Outdated
@codecov

codecov Bot commented Oct 20, 2022

Copy link
Copy Markdown

Codecov Report

Merging #6838 (a0e0e83) into main (2ca164a) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #6838      +/-   ##
============================================
- Coverage     10.81%   10.80%   -0.01%     
+ Complexity     7083     7082       -1     
============================================
  Files          2485     2485              
  Lines        245346   245355       +9     
  Branches      38313    38314       +1     
============================================
- Hits          26525    26518       -7     
- Misses       215556   215576      +20     
+ Partials       3265     3261       -4     
Impacted Files Coverage Δ
...dstack/network/contrail/model/ModelObjectBase.java 28.84% <0.00%> (-15.39%) ⬇️
...cloudstack/network/contrail/model/ModelObject.java 29.16% <0.00%> (-4.17%) ⬇️
...om/cloud/deploy/DeploymentPlanningManagerImpl.java 27.29% <0.00%> (-0.77%) ⬇️
...om/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 64.15% <0.00%> (ø)
...udstack/api/response/QuotaResponseBuilderImpl.java 33.82% <0.00%> (ø)
...apache/cloudstack/quota/QuotaAlertManagerImpl.java 63.06% <0.00%> (+1.99%) ⬆️

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

Comment thread engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql Outdated
Comment thread engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql Outdated
Co-authored-by: Wei Zhou <weizhou@apache.org>
@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@vladimirpetrov As this is a SQL only change, other than what travis does the only testing on this that makes sense is the actual upgrade of a network in state "Setup" as described in the description ;) Can you do the honours?

PS don´t be fooled by the first commit, it is already on 4.17 and main:
#6824
79e5e7f

@weizhouapache weizhouapache left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

code lgtm

@weizhouapache weizhouapache changed the title Set implemented when no services Set network state to implemented when no services Oct 20, 2022
@vladimirpetrov

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

Copy link
Copy Markdown

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

@vladimirpetrov vladimirpetrov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM based on manual testing - successfully upgraded from 4.14 and 4.15 KVM with isolated network in 'Setup' state and no services.

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@JoaoJandre JoaoJandre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@blueorangutan

Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_02_upgrade_kubernetes_cluster Failure 506.07 test_kubernetes_clusters.py

@DaanHoogland
DaanHoogland merged commit 13d22c2 into apache:main Oct 24, 2022
@DaanHoogland DaanHoogland added this to the 4.18.0.0 milestone Dec 16, 2022
@DaanHoogland DaanHoogland removed their assignment Jun 13, 2023
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.

7 participants