This commit is contained in:
crusader 2018-06-12 13:59:45 +09:00
parent 400325ef7c
commit 447f0b6d1d
3 changed files with 24 additions and 48 deletions

View File

@ -13,7 +13,7 @@
<groupId>com.loafle.overflow</groupId> <groupId>com.loafle.overflow</groupId>
<artifactId>commons-java</artifactId> <artifactId>commons-java</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.45-SNAPSHOT</version> <version>1.0.46-SNAPSHOT</version>
<name>com.loafle.overflow.commons-java</name> <name>com.loafle.overflow.commons-java</name>
<properties> <properties>

View File

@ -17,6 +17,8 @@ public class InfraHostIP {
private MetaIPType metaIPType; private MetaIPType metaIPType;
private String address; private String address;
private String mac; private String mac;
private String iface;
private String gateway;
private Date createDate; private Date createDate;
@Id @Id
@ -69,6 +71,26 @@ public class InfraHostIP {
this.mac = mac; this.mac = mac;
} }
@Basic
@Column(name = "IFACE", nullable = true)
public String getIface() {
return iface;
}
public void setIface(String iface) {
this.iface = iface;
}
@Basic
@Column(name = "GATEWAY", nullable = true)
public String getGateway() {
return gateway;
}
public void setGateway(String gateway) {
this.gateway = gateway;
}
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {

View File

@ -14,12 +14,8 @@ import com.loafle.overflow.model.meta.MetaTargetZoneType;
public class InfraZone extends Infra { public class InfraZone extends Infra {
private MetaTargetZoneType metaTargetZoneType; private MetaTargetZoneType metaTargetZoneType;
private String network;
private String iface;
private MetaIPType metaIPType; private MetaIPType metaIPType;
private String address; private String network;
private String mac;
private String gateway;
@ManyToOne @ManyToOne
@JoinColumn(name = "META_TARGET_ZONE_TYPE_ID", nullable = true) @JoinColumn(name = "META_TARGET_ZONE_TYPE_ID", nullable = true)
@ -31,7 +27,6 @@ public class InfraZone extends Infra {
this.metaTargetZoneType = metaTargetZoneType; this.metaTargetZoneType = metaTargetZoneType;
} }
@Basic @Basic
@Column(name = "NETWORK", nullable = true) @Column(name = "NETWORK", nullable = true)
public String getNetwork() { public String getNetwork() {
@ -42,16 +37,6 @@ public class InfraZone extends Infra {
this.network = network; this.network = network;
} }
@Basic
@Column(name = "IFACE", nullable = true)
public String getIface() {
return iface;
}
public void setIface(String iface) {
this.iface = iface;
}
@ManyToOne @ManyToOne
@JoinColumn(name = "META_IP_TYPE_ID", nullable = true) @JoinColumn(name = "META_IP_TYPE_ID", nullable = true)
public MetaIPType getMetaIPType() { public MetaIPType getMetaIPType() {
@ -61,35 +46,4 @@ public class InfraZone extends Infra {
public void setMetaIPType(MetaIPType metaIPType) { public void setMetaIPType(MetaIPType metaIPType) {
this.metaIPType = metaIPType; this.metaIPType = metaIPType;
} }
@Basic
@Column(name = "ADDRESS", nullable = true)
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Basic
@Column(name = "MAC", nullable = true)
public String getMac() {
return mac;
}
public void setMac(String mac) {
this.mac = mac;
}
@Basic
@Column(name = "GATEWAY", nullable = true)
public String getGateway() {
return gateway;
}
public void setGateway(String gateway) {
this.gateway = gateway;
}
} }