Already merged into master

This commit is contained in:
Chiradeep Vittal 2011-05-03 10:32:27 -07:00
parent cf05527ba8
commit 8609e72e89
1 changed files with 108 additions and 108 deletions

View File

@ -16,8 +16,8 @@
*
*/
package com.cloud.dc;
package com.cloud.dc;
import java.util.Map;
import javax.persistence.Column;
@ -34,38 +34,38 @@ import javax.persistence.Transient;
import com.cloud.network.Network.Provider;
import com.cloud.org.Grouping;
import com.cloud.utils.NumbersUtil;
@Entity
@Table(name="data_center")
public class DataCenterVO implements DataCenter {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
private long id;
@Column(name="name")
private String name = null;
@Column(name="description")
private String description = null;
@Column(name="dns1")
private String dns1 = null;
@Column(name="dns2")
private String dns2 = null;
@Column(name="internal_dns1")
private String internalDns1 = null;
@Column(name="internal_dns2")
private String internalDns2 = null;
@Column(name="router_mac_address", updatable = false, nullable=false)
private String routerMacAddress = "02:00:00:00:00:01";
@Column(name="vnet")
@Entity
@Table(name="data_center")
public class DataCenterVO implements DataCenter {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
private long id;
@Column(name="name")
private String name = null;
@Column(name="description")
private String description = null;
@Column(name="dns1")
private String dns1 = null;
@Column(name="dns2")
private String dns2 = null;
@Column(name="internal_dns1")
private String internalDns1 = null;
@Column(name="internal_dns2")
private String internalDns2 = null;
@Column(name="router_mac_address", updatable = false, nullable=false)
private String routerMacAddress = "02:00:00:00:00:01";
@Column(name="vnet")
private String vnet = null;
@Column(name="guest_network_cidr")
@ -168,12 +168,12 @@ public class DataCenterVO implements DataCenter {
}
public DataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String vnet, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken) {
this(name, description, dns1, dns2, dns3, dns4, vnet, guestCidr, domain, domainId, zoneType, false, zoneToken);
this(name, description, dns1, dns2, dns3, dns4, vnet, guestCidr, domain, domainId, zoneType, false, zoneToken);
this.id = id;
this.allocationState = Grouping.AllocationState.Enabled;
}
public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String vnet, String guestCidr, String domain, Long domainId, NetworkType zoneType, boolean securityGroupEnabled, String zoneToken) {
this.allocationState = Grouping.AllocationState.Enabled;
}
public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String vnet, String guestCidr, String domain, Long domainId, NetworkType zoneType, boolean securityGroupEnabled, String zoneToken) {
this.name = name;
this.description = description;
this.dns1 = dns1;
@ -231,81 +231,81 @@ public class DataCenterVO implements DataCenter {
public void setDomainId(Long domainId) {
this.domainId = domainId;
}
}
@Override
public String getDescription() {
return description;
}
public String getRouterMacAddress() {
return routerMacAddress;
}
public void setVnet(String vnet) {
this.vnet = vnet;
}
public String getDescription() {
return description;
}
public String getRouterMacAddress() {
return routerMacAddress;
}
public void setVnet(String vnet) {
this.vnet = vnet;
}
@Override
public String getDns1() {
return dns1;
}
public String getDns1() {
return dns1;
}
@Override
public String getVnet() {
return vnet;
}
public String getVnet() {
return vnet;
}
@Override
public String getDns2() {
return dns2;
}
public String getDns2() {
return dns2;
}
@Override
public String getInternalDns1() {
return internalDns1;
}
public String getInternalDns1() {
return internalDns1;
}
@Override
public String getInternalDns2() {
return internalDns2;
}
protected DataCenterVO() {
}
public String getInternalDns2() {
return internalDns2;
}
protected DataCenterVO() {
}
@Override
public long getId() {
return id;
}
public long getId() {
return id;
}
@Override
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public void setDns1(String dns1) {
this.dns1 = dns1;
}
public void setDns2(String dns2) {
this.dns2 = dns2;
}
public void setInternalDns1(String dns3) {
this.internalDns1 = dns3;
}
public void setInternalDns2(String dns4) {
this.internalDns2 = dns4;
}
public void setRouterMacAddress(String routerMacAddress) {
this.routerMacAddress = routerMacAddress;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public void setDns1(String dns1) {
this.dns1 = dns1;
}
public void setDns2(String dns2) {
this.dns2 = dns2;
}
public void setInternalDns1(String dns3) {
this.internalDns1 = dns3;
}
public void setInternalDns2(String dns4) {
this.internalDns2 = dns4;
}
public void setRouterMacAddress(String routerMacAddress) {
this.routerMacAddress = routerMacAddress;
}
@Override
@ -397,5 +397,5 @@ public class DataCenterVO implements DataCenter {
public void setZoneToken(String zoneToken) {
this.zoneToken = zoneToken;
}
}
}
}