Skip to content

Commit dbb5ad2

Browse files
added unit tests for unordered and overlapping vlans
1 parent f56b966 commit dbb5ad2

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,26 @@ public void testComposeCloudNetworkNameVlanNumbersAndRangeGuestTrafficDvSwitch()
612612
assertEquals("cloud.guest.3001,3004-3018,3020.512.1-dvSwitch0", cloudNetworkName);
613613
}
614614

615+
@Test
616+
public void testComposeCloudNetworkNameUnorderedVlanNumbersAndRangeGuestTrafficDvSwitch() {
617+
vlanId = "3018,3020,3011,3012,3004-3006,3007,3001,3008,3009,3010,3013,3014,3015,3016,3017";
618+
networkRateMbps = 512;
619+
prefix = "cloud.guest";
620+
vSwitchName = "dvSwitch0";
621+
String cloudNetworkName = HypervisorHostHelper.composeCloudNetworkName(prefix, vlanId, null, networkRateMbps, vSwitchName, VirtualSwitchType.VMwareDistributedVirtualSwitch);
622+
assertEquals("cloud.guest.3001,3004-3018,3020.512.1-dvSwitch0", cloudNetworkName);
623+
}
624+
625+
@Test
626+
public void testComposeCloudNetworkNameOverlappingVlanNumbersAndRangeGuestTrafficDvSwitch() {
627+
vlanId = "3018,3020,3011,3012,3004-3006,3007,3001,3008,3009,3010,3013,3014,3015,3016,3017,3005-3008";
628+
networkRateMbps = 512;
629+
prefix = "cloud.guest";
630+
vSwitchName = "dvSwitch0";
631+
String cloudNetworkName = HypervisorHostHelper.composeCloudNetworkName(prefix, vlanId, null, networkRateMbps, vSwitchName, VirtualSwitchType.VMwareDistributedVirtualSwitch);
632+
assertEquals("cloud.guest.3001,3004-3018,3020.512.1-dvSwitch0", cloudNetworkName);
633+
}
634+
615635
@Test
616636
public void testOvfDomRewriter() {
617637
final String ovfString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +

0 commit comments

Comments
 (0)