Skip to content

Fixed instance creation failure on dvswitch when using vlan id 4095 #4557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Jan 12, 2021
Merged

Fixed instance creation failure on dvswitch when using vlan id 4095 #4557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e2f9ae
Fixed instance creation failure on dvswitch when using vlan id 4095
Spaceman1984 Dec 22, 2020
1b48ee2
Null pointer
Spaceman1984 Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,10 @@ public static VMwareDVSPvlanConfigSpec createDVPortPvlanConfigSpec(int vlanId, i
}

public static VmwareDistributedVirtualSwitchVlanSpec createDVPortVlanSpec(Integer vlanId, String vlanRange) {
if (vlanId != null && vlanId == 4095){
Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti Jan 7, 2021

Choose a reason for hiding this comment

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

@Spaceman1984 Have you tested this?

this method createDVPortVlanSpec() is called only when vlanId is null, so if check here is always 'false' and the underlying code never executes. Please check and try to fix this in the appropriate top level method in the call stack.

Copy link
Copy Markdown
Contributor Author

@Spaceman1984 Spaceman1984 Jan 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This method is not onlly called when vlanid is null.
If vid is not null, spvlanid would be evaluated and if spvlanid is null, the method will be called.

if (vid == null || spvlanid == null) {
    vlanspec = createDVPortVlanSpec(vid, vlanRange);
    ...
}

I tested this as I stated in the description.

vlanId = null;
vlanRange = "0-4094";
}
Comment thread
Spaceman1984 marked this conversation as resolved.
if (vlanId == null && vlanRange != null && !vlanRange.isEmpty()) {
s_logger.debug("Creating dvSwitch port vlan-trunk spec with range: " + vlanRange);
VmwareDistributedVirtualSwitchTrunkVlanSpec trunkVlanSpec = new VmwareDistributedVirtualSwitchTrunkVlanSpec();
Expand Down