diff --git a/api/src/com/cloud/network/router/VirtualRouter.java b/api/src/com/cloud/network/router/VirtualRouter.java index 14cbf4e0cad..152611f3bdb 100755 --- a/api/src/com/cloud/network/router/VirtualRouter.java +++ b/api/src/com/cloud/network/router/VirtualRouter.java @@ -39,8 +39,6 @@ public interface VirtualRouter extends VirtualMachine { public String getPublicNetmask(); - public String getGuestZoneMacAddress(); - /** * @return the ram size for this machine. */ @@ -56,11 +54,6 @@ public interface VirtualRouter extends VirtualMachine { String getDomain(); Role getRole(); - - /** - * @return the range of dhcp addresses served (start and end) - */ - String[] getDhcpRange(); void setRamSize(int ramSize); } diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java index fd6cd8a2d0c..241410e11b4 100755 --- a/core/src/com/cloud/vm/DomainRouterVO.java +++ b/core/src/com/cloud/vm/DomainRouterVO.java @@ -28,7 +28,6 @@ import javax.persistence.Table; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.router.VirtualRouter; -import com.cloud.utils.net.NetUtils; /** * VirtualMachineRouterVO implements all the fields stored for a domain router. @@ -62,9 +61,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { @Column(name="domain", nullable=false) private String domain; - @Column(name="guest_dc_mac_address") - private String guestZoneMacAddress; - @Column(name="network_id") long networkId; @@ -179,24 +175,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { this.role = role; } - @Override - public String[] getDhcpRange() { - if (guestIpAddress != null && guestNetmask != null) { - long cidrSize = NetUtils.getCidrSize(guestNetmask); - return NetUtils.getIpRangeFromCidr(guestIpAddress, cidrSize); - } - return new String[2]; - } - - public void setGuestZoneMacAddress(String guestZoneMacAddress) { - this.guestZoneMacAddress = guestZoneMacAddress; - } - - @Override - public String getGuestZoneMacAddress() { - return guestZoneMacAddress; - } - public void setServiceOfferingId(long serviceOfferingId) { this.serviceOfferingId = serviceOfferingId; }