Skip to content

server: set network rate for additional public IPs#5670

Merged
yadvr merged 1 commit intoapache:4.16from
shapeblue:4.16-fix-vmware-portgroup-vr-migration
Nov 18, 2021
Merged

server: set network rate for additional public IPs#5670
yadvr merged 1 commit intoapache:4.16from
shapeblue:4.16-fix-vmware-portgroup-vr-migration

Conversation

@weizhouapache
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache commented Nov 8, 2021

Description

This PR fixes #5669

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?

@weizhouapache
Copy link
Copy Markdown
Member Author

weizhouapache commented Nov 8, 2021

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 8, 2021

@weizhouapache a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

GutoVeronezi
GutoVeronezi approved these changes Nov 8, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Code LGTM, I didn't test it though.

@weizhouapache
Copy link
Copy Markdown
Member Author

weizhouapache commented Nov 8, 2021

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 8, 2021

@weizhouapache a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 8, 2021

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

@weizhouapache
Copy link
Copy Markdown
Member Author

weizhouapache commented Nov 9, 2021

@blueorangutan test centos7 vmware-70u1 keepEnv

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 9, 2021

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

DaanHoogland
DaanHoogland reviewed Nov 9, 2021
View reviewed changes
...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
profile.setSecurityGroupEnabled(_networkModel.isSecurityGroupSupportedInNetwork(network));
profile.setName(_networkModel.getNetworkTag(vm.getHypervisorType(), network));
profile.setNetworId(network.getId());
profile.setNetworkRate(_networkModel.getNetworkRate(network.getId(), vm.getId()));
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Nov 9, 2021

Choose a reason for hiding this comment

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

will the network id not be needed anymore?

Copy link
Copy Markdown
Member Author

@weizhouapache weizhouapache Nov 9, 2021

Choose a reason for hiding this comment

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

@DaanHoogland
it is still needed. see line 2072
I changed setNetworId to setNetworkId

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 9, 2021

Trillian test result (tid-2548)
Environment: vmware-70u1 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33630 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5670-t2548-vmware-70u1.zip
Smoke tests completed. 91 look OK, 0 have errors
Only failed tests results shown below:

Test Result Time (s) Test File

@weizhouapache weizhouapache changed the base branch from main to 4.16 November 11, 2021 08:46
@weizhouapache
Copy link
Copy Markdown
Member Author

weizhouapache commented Nov 12, 2021

workaround for #5669 : create port group manually on destination host

for example

[root@ref-trl-2125-v-M7-wei-zhou-esxi1:~] esxcli network vswitch standard portgroup add -p clo
ud.public.668.200.1-vSwitch1 -v vSwitch1

[root@ref-trl-2125-v-M7-wei-zhou-esxi1:~] esxcli network vswitch standard portgroup set -p clo
ud.public.668.200.1-vSwitch1 --vlan-id 668

DaanHoogland
DaanHoogland approved these changes Nov 17, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

@yadvr yadvr merged commit c95f8e2 into apache:4.16 Nov 18, 2021
@yadvr yadvr added this to the 4.16.1.0 milestone Nov 18, 2021
@yadvr yadvr mentioned this pull request Nov 18, 2021
Closed
DaanHoogland pushed a commit to shapeblue/cloudstack that referenced this pull request May 20, 2022
@weizhouapache
server: set network rate for additional public IPs (apache#5670)
18867c6 
This PR fixes apache#5669
@weizhouapache weizhouapache deleted the 4.16-fix-vmware-portgroup-vr-migration branch December 9, 2022 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@GutoVeronezi GutoVeronezi GutoVeronezi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

No open projects
Apache CloudStack 4.16.1
Status: Done

Milestone

4.16.1.0

Development

Successfully merging this pull request may close these issues.

VMware: Migrate VR with additional Public IPs failed

5 participants

@weizhouapache @blueorangutan @DaanHoogland @GutoVeronezi @yadvr