etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed gateway and guestzonemacaddress from domr

This commit is contained in:
Alex Huang 2011-01-24 17:50:20 -08:00
parent 463835e7d7
commit 9d3eedaf01
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/com/cloud/network/router/VirtualRouter.java
View File

@ -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);
}

22
core/src/com/cloud/vm/DomainRouterVO.java
View File

@ -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;
}