From e4cfdbca5e4037198968a030bdd1861680512195 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 9 Sep 2022 16:03:33 +0530 Subject: [PATCH] server: fix netowork upgrade for IPv6 Signed-off-by: Abhishek Kumar --- .../main/java/com/cloud/network/Ipv6ServiceImpl.java | 2 +- .../java/com/cloud/network/Ipv6ServiceImplTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java b/server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java index dd0f6c49e37f..0ddae74daa6b 100644 --- a/server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java +++ b/server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java @@ -501,7 +501,7 @@ public void checkNetworkIpv6Upgrade(Network network) throws InsufficientAddressC ipAddressDao.listByAssociatedVpc(network.getVpcId(), true); for (IPAddressVO address : addresses) { VlanVO vlan = vlanDao.findById(address.getVlanId()); - final List ranges = vlanDao.listIpv6RangeByZoneIdAndVlanId(network.getPhysicalNetworkId(), vlan.getVlanTag()); + final List ranges = vlanDao.listIpv6RangeByZoneIdAndVlanId(network.getDataCenterId(), vlan.getVlanTag()); if (CollectionUtils.isEmpty(ranges)) { s_logger.error(String.format("Unable to find IPv6 address for zone ID: %d, physical network ID: %d, VLAN: %s", network.getDataCenterId(), network.getPhysicalNetworkId(), vlan.getVlanTag())); InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", DataCenter.class, network.getDataCenterId()); diff --git a/server/src/test/java/com/cloud/network/Ipv6ServiceImplTest.java b/server/src/test/java/com/cloud/network/Ipv6ServiceImplTest.java index 1b0592abcb2b..cebe54288ec0 100644 --- a/server/src/test/java/com/cloud/network/Ipv6ServiceImplTest.java +++ b/server/src/test/java/com/cloud/network/Ipv6ServiceImplTest.java @@ -592,10 +592,10 @@ public void testCheckNetworkIpv6UpgradeForNoPrefixes() { @Test public void testCheckNetworkIpv6UpgradeForNoIpv6Vlan() { - final long physicalNetworkId = 1L; + final long zoneId = 1L; Mockito.when(dataCenterGuestIpv6PrefixDao.listByDataCenterId(Mockito.anyLong())).thenReturn(List.of(Mockito.mock(DataCenterGuestIpv6PrefixVO.class))); Network network = Mockito.mock(Network.class); - Mockito.when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId); + Mockito.when(network.getDataCenterId()).thenReturn(zoneId); Mockito.when(network.getVpcId()).thenReturn(null); Mockito.when(ipAddressDao.listByAssociatedNetwork(Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(List.of(Mockito.mock(IPAddressVO.class))); VlanVO vlanVO = Mockito.mock(VlanVO.class); @@ -610,16 +610,16 @@ public void testCheckNetworkIpv6UpgradeForNoIpv6Vlan() { @Test public void testCheckNetworkIpv6UpgradeForNetwork() { - final long physicalNetworkId = 1L; + final long zoneId = 1L; Mockito.when(dataCenterGuestIpv6PrefixDao.listByDataCenterId(Mockito.anyLong())).thenReturn(List.of(Mockito.mock(DataCenterGuestIpv6PrefixVO.class))); Network network = Mockito.mock(Network.class); - Mockito.when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId); + Mockito.when(network.getDataCenterId()).thenReturn(zoneId); Mockito.when(network.getVpcId()).thenReturn(null); Mockito.when(ipAddressDao.listByAssociatedNetwork(Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(List.of(Mockito.mock(IPAddressVO.class))); VlanVO vlanVO = Mockito.mock(VlanVO.class); Mockito.when(vlanVO.getVlanTag()).thenReturn(vlan); Mockito.when(vlanDao.findById(Mockito.anyLong())).thenReturn(vlanVO); - Mockito.when(vlanDao.listIpv6RangeByZoneIdAndVlanId(physicalNetworkId, vlan)).thenReturn(List.of(vlanVO)); + Mockito.when(vlanDao.listIpv6RangeByZoneIdAndVlanId(zoneId, vlan)).thenReturn(List.of(vlanVO)); try { ipv6Service.checkNetworkIpv6Upgrade(network); } catch (InsufficientAddressCapacityException | ResourceAllocationException e) {