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

removed unused dns

This commit is contained in:
Alex Huang 2011-01-24 17:33:30 -08:00
parent c59e576a51
commit 68464d6f66
5 changed files with 1 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,12 +39,6 @@ public interface VirtualRouter extends VirtualMachine {
public String getPublicNetmask();
public String getVnet();
public String getVlanId();
public String getZoneVlan();
public String getGuestZoneMacAddress();
/**
@ -64,8 +58,6 @@ public interface VirtualRouter extends VirtualMachine {
*/
String getPublicIpAddress();
String getDns1();
String getDns2();
String getDomain();
/**

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

@ -53,12 +53,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
@Column(name="public_netmask")
private String publicNetmask;
@Column(name="vlan_db_id")
private Long vlanDbId;
@Column(name="vlan_id")
private String vlanId;
@Column(name="guest_mac_address")
private String guestMacAddress;
@ -68,21 +62,9 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
@Column(name="guest_netmask")
private String guestNetmask;
@Column(name="dns1")
private String dns1;
@Column(name="dns2")
private String dns2;
@Column(name="domain", nullable=false)
private String domain;
@Column(name="vnet")
private String vnet;
@Column(name="dc_vlan")
private String zoneVlan;
@Column(name="guest_dc_mac_address")
private String guestZoneMacAddress;
@ -142,27 +124,10 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
this.guestIpAddress = routerIpAddress;
}
public void setDns1(String dns1) {
this.dns1 = dns1;
}
public void setDns2(String dns2) {
this.dns2 = dns2;
}
public void setDomain(String domain) {
this.domain = domain;
}
public void setVnet(String vnet) {
this.vnet = vnet;
}
@Override
public String getVnet() {
return vnet;
}
@Override
public long getDataCenterId() {
return dataCenterId;
@ -187,16 +152,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
super();
}
@Override
public String getDns1() {
return dns1;
}
@Override
public String getDns2() {
return dns2;
}
@Override
public String getDomain() {
return domain;
@ -222,24 +177,11 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
return publicIpAddress;
}
@Override
public String getVlanId() {
return vlanId;
}
@Override
public String getGuestMacAddress() {
return guestMacAddress;
}
public void setVlanDbId(Long vlanDbId) {
this.vlanDbId = vlanDbId;
}
public Long getVlanDbId() {
return vlanDbId;
}
@Override
public Role getRole() {
return role;
@ -258,15 +200,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
return new String[2];
}
public void setZoneVlan(String zoneVlan) {
this.zoneVlan = zoneVlan;
}
@Override
public String getZoneVlan() {
return zoneVlan;
}
public void setGuestZoneMacAddress(String guestZoneMacAddress) {
this.guestZoneMacAddress = guestZoneMacAddress;
}

2
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -643,7 +643,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
return new StopCommand(vm, vmName, VirtualMachineName.getVnet(vmName));
} else if (vm != null) {
final DomainRouterVO vo = vm;
return new StopCommand(vo, vo.getVnet());
return new StopCommand(vo, null);
} else {
throw new CloudRuntimeException("Shouldn't even be here!");
}

10
server/src/com/cloud/vm/dao/DomainRouterDao.java
View File

@ -32,9 +32,6 @@ import com.cloud.vm.VirtualMachine.State;
* DomainRouterDao implements
*/
public interface DomainRouterDao extends GenericDao<DomainRouterVO, Long>, StateDao<State, VirtualMachine.Event, VMInstanceVO> {
//@Deprecated
//public boolean updateIf(DomainRouterVO router, State state, State... ifStates);
/**
* gets the DomainRouterVO by user id and data center
* @Param dcId data center Id.
@ -106,13 +103,6 @@ public interface DomainRouterDao extends GenericDao<DomainRouterVO, Long>, State
* @return
*/
public List<DomainRouterVO> listByDomain(Long id);
/**
* Find the list of domain routers on a vlan
* @param id the id of the vlan record in the vlan table
* @return
*/
public List<DomainRouterVO> listByVlanDbId(Long vlanId);
DomainRouterVO findBy(long accountId, long dcId, Role role);

12
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
View File

@ -59,7 +59,6 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
protected final SearchBuilder<DomainRouterVO> LastHostSearch;
protected final SearchBuilder<DomainRouterVO> HostUpSearch;
protected final SearchBuilder<DomainRouterVO> DomainIdSearch;
protected final SearchBuilder<DomainRouterVO> VlanDbIdSearch;
protected final SearchBuilder<DomainRouterVO> StateChangeSearch;
protected final SearchBuilder<DomainRouterVO> NetworkConfigSearch;
protected final Attribute _updateTimeAttr;
@ -111,10 +110,6 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
DomainIdSearch.and("domainId", DomainIdSearch.entity().getDomainId(), SearchCriteria.Op.EQ);
DomainIdSearch.done();
VlanDbIdSearch = createSearchBuilder();
VlanDbIdSearch.and("vlanDbId", VlanDbIdSearch.entity().getVlanDbId(), SearchCriteria.Op.EQ);
VlanDbIdSearch.done();
StateChangeSearch = createSearchBuilder();
StateChangeSearch.and("id", StateChangeSearch.entity().getId(), SearchCriteria.Op.EQ);
StateChangeSearch.and("states", StateChangeSearch.entity().getState(), SearchCriteria.Op.EQ);
@ -284,13 +279,6 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
return listBy(sc);
}
@Override
public List<DomainRouterVO> listByVlanDbId(Long vlanDbId) {
SearchCriteria<DomainRouterVO> sc = VlanDbIdSearch.create();
sc.setParameters("vlanDbId", vlanDbId);
return listBy(sc);
}
@Override
public DomainRouterVO findByNetworkConfiguration(long networkConfigurationId) {
SearchCriteria<DomainRouterVO> sc = NetworkConfigSearch.create();