diff --git a/pom.xml b/pom.xml index f47414f..1a44dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.loafle.overflow commons-java jar - 1.0.45-SNAPSHOT + 1.0.46-SNAPSHOT com.loafle.overflow.commons-java diff --git a/src/main/java/com/loafle/overflow/model/infra/InfraHostIP.java b/src/main/java/com/loafle/overflow/model/infra/InfraHostIP.java index 0dfb02e..48f90d0 100644 --- a/src/main/java/com/loafle/overflow/model/infra/InfraHostIP.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraHostIP.java @@ -17,6 +17,8 @@ public class InfraHostIP { private MetaIPType metaIPType; private String address; private String mac; + private String iface; + private String gateway; private Date createDate; @Id @@ -69,6 +71,26 @@ public class InfraHostIP { 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) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) public Date getCreateDate() { diff --git a/src/main/java/com/loafle/overflow/model/infra/InfraZone.java b/src/main/java/com/loafle/overflow/model/infra/InfraZone.java index 1d8158a..8be8634 100644 --- a/src/main/java/com/loafle/overflow/model/infra/InfraZone.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraZone.java @@ -14,12 +14,8 @@ import com.loafle.overflow.model.meta.MetaTargetZoneType; public class InfraZone extends Infra { private MetaTargetZoneType metaTargetZoneType; - private String network; - private String iface; private MetaIPType metaIPType; - private String address; - private String mac; - private String gateway; + private String network; @ManyToOne @JoinColumn(name = "META_TARGET_ZONE_TYPE_ID", nullable = true) @@ -31,7 +27,6 @@ public class InfraZone extends Infra { this.metaTargetZoneType = metaTargetZoneType; } - @Basic @Column(name = "NETWORK", nullable = true) public String getNetwork() { @@ -42,16 +37,6 @@ public class InfraZone extends Infra { this.network = network; } - @Basic - @Column(name = "IFACE", nullable = true) - public String getIface() { - return iface; - } - - public void setIface(String iface) { - this.iface = iface; - } - @ManyToOne @JoinColumn(name = "META_IP_TYPE_ID", nullable = true) public MetaIPType getMetaIPType() { @@ -61,35 +46,4 @@ public class InfraZone extends Infra { public void setMetaIPType(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; - } - }