From 225f15899d627337769eb9ddd76b68e791ae173a Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 30 Dec 2010 10:45:46 -0800 Subject: [PATCH] bug 7776: Fixed setting netmask for guest domR network status 7776: resolved fixed --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 759dd9bd91b..94b78187786 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1342,7 +1342,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian gatewayNic.setBroadcastType(guestNetwork.getBroadcastDomainType()); gatewayNic.setIsolationUri(guestNetwork.getBroadcastUri()); gatewayNic.setMode(guestNetwork.getMode()); - gatewayNic.setNetmask(NetUtils.getCidrSubNet(guestNetwork.getCidr())); + + String gatewayCidr = guestNetwork.getCidr(); + String[] cidrPair = gatewayCidr.split("\\/"); + long guestCidrSize = Long.parseLong(cidrPair[1]); + gatewayNic.setNetmask(NetUtils.getCidrNetmask(guestCidrSize)); networks.add(new Pair((NetworkVO) guestNetwork, gatewayNic)); networks.add(new Pair(controlConfig, null));