Skip to content

server: fix error when dedicatingguestvlanrange for physical nw without vlan range#6655

Merged
shwstppr merged 4 commits into
apache:4.17from
shapeblue:fix-dedicateguestvlan-err
Aug 25, 2022
Merged

server: fix error when dedicatingguestvlanrange for physical nw without vlan range#6655
shwstppr merged 4 commits into
apache:4.17from
shapeblue:fix-dedicateguestvlan-err

Conversation

@shwstppr

@shwstppr shwstppr commented Aug 18, 2022

Copy link
Copy Markdown
Contributor

Description

Fixes #6648
If any of the VLAN from the given range is not found in the database (cloud.op_dc_vnet_alloc) then an InvalidParameterValueException will be thrown.
Also, refactors and fixes account check.

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?

…ut vlan range

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@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.

@blueorangutan

Copy link
Copy Markdown

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

Comment thread server/src/main/java/com/cloud/network/NetworkServiceImpl.java Outdated
Comment thread server/src/main/java/com/cloud/network/NetworkServiceImpl.java Outdated
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@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.

@blueorangutan

Copy link
Copy Markdown

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

@shwstppr shwstppr added this to the 4.17.1.0 milestone Aug 18, 2022
Comment thread server/src/main/java/com/cloud/network/NetworkServiceImpl.java Outdated
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@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.

@blueorangutan

Copy link
Copy Markdown

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

@shwstppr shwstppr closed this Aug 22, 2022
@shwstppr shwstppr reopened this Aug 22, 2022
@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@shwstppr 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 4034

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@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.

@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

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

@sonarqubecloud

Copy link
Copy Markdown

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@blueorangutan

Copy link
Copy Markdown

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

@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@codecov

codecov Bot commented Aug 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #6655 (8e19aa4) into 4.17 (ef2997c) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               4.17    #6655      +/-   ##
============================================
- Coverage      5.86%    5.86%   -0.01%     
  Complexity     3918     3918              
============================================
  Files          2451     2451              
  Lines        242263   242279      +16     
  Branches      37909    37910       +1     
============================================
  Hits          14207    14207              
- Misses       226486   226502      +16     
  Partials       1570     1570              
Impacted Files Coverage Δ
...ain/java/com/cloud/network/NetworkServiceImpl.java 0.00% <0.00%> (ø)
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java 0.00% <0.00%> (ø)
...java/com/cloud/tags/TaggedResourceManagerImpl.java 0.00% <0.00%> (ø)
...ava/com/cloud/upgrade/dao/Upgrade41610to41700.java 4.44% <0.00%> (ø)

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

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-4747)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46181 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6655-t4747-kvm-centos7.zip
Smoke tests completed. 100 look OK, 1 have errors
Only failed tests results shown below:

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

@shwstppr
shwstppr requested a review from weizhouapache August 23, 2022 12:17

@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

@shwstppr
shwstppr merged commit 7ddebd3 into apache:4.17 Aug 25, 2022
neogismm pushed a commit to neogismm/cloudstack that referenced this pull request Sep 5, 2022
…thout vlan range (apache#6655)

Fixes apache#6648
If any of the VLAN from the given range is not found in the database (cloud.op_dc_vnet_alloc) then an InvalidParameterValueException will be thrown.
Also, refactors and fixes account check.
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.

6 participants