diff --git a/rackshift-server/src/main/java/io/rackshift/job/SyncNetworkJob.java b/rackshift-server/src/main/java/io/rackshift/job/SyncNetworkJob.java index 09d93e86..6c4ed4a8 100644 --- a/rackshift-server/src/main/java/io/rackshift/job/SyncNetworkJob.java +++ b/rackshift-server/src/main/java/io/rackshift/job/SyncNetworkJob.java @@ -57,6 +57,7 @@ private Collection convert(JSONArray dhcpconfigs, Endpoint en dhcpconfigs.forEach(c -> { DHCPConfig c1 = JSONObject.parseObject(c.toString(), DHCPConfig.class); Network network = new Network(); + network.setInterFace(c1.getinterFace()); network.setStartIp(c1.getStartIp()); network.setEndIp(c1.getEndIp()); network.setNetmask(c1.getNetmask()); diff --git a/rackshift-server/src/main/java/io/rackshift/job/model/DHCPConfig.java b/rackshift-server/src/main/java/io/rackshift/job/model/DHCPConfig.java index 7160239e..48a37a11 100644 --- a/rackshift-server/src/main/java/io/rackshift/job/model/DHCPConfig.java +++ b/rackshift-server/src/main/java/io/rackshift/job/model/DHCPConfig.java @@ -5,6 +5,7 @@ import java.util.Objects; public class DHCPConfig { + private String interFace; private String startIp; private String endIp; private String netmask; @@ -26,7 +27,13 @@ public String getNetSegment() { public String getStartIp() { return startIp; } + public String getinterFace() { + return interFace; + } + public void setinterFace(String interFace) { + this.interFace = interFace; + } public void setStartIp(String startIp) { this.startIp = startIp; } @@ -69,6 +76,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; DHCPConfig config = (DHCPConfig) o; return pxeEnabled == config.pxeEnabled && + Objects.equals(interFace,config.interFace) && Objects.equals(startIp, config.startIp) && Objects.equals(endIp, config.endIp) && Objects.equals(netmask, config.netmask) && @@ -77,6 +85,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(startIp, endIp, netmask, gateway, pxeEnabled); + return Objects.hash(interFace,startIp, endIp, netmask, gateway, pxeEnabled); } } diff --git a/rackshift-server/src/main/java/io/rackshift/mybatis/domain/Network.java b/rackshift-server/src/main/java/io/rackshift/mybatis/domain/Network.java index 49dcbbca..5db058c2 100644 --- a/rackshift-server/src/main/java/io/rackshift/mybatis/domain/Network.java +++ b/rackshift-server/src/main/java/io/rackshift/mybatis/domain/Network.java @@ -13,6 +13,8 @@ public class Network implements Serializable { private String name; private String vlanId; + + private String interFace; private String startIp; diff --git a/rackshift-server/src/main/java/io/rackshift/mybatis/mapper/NetworkMapper.xml b/rackshift-server/src/main/java/io/rackshift/mybatis/mapper/NetworkMapper.xml index d862f4d2..247956f3 100644 --- a/rackshift-server/src/main/java/io/rackshift/mybatis/mapper/NetworkMapper.xml +++ b/rackshift-server/src/main/java/io/rackshift/mybatis/mapper/NetworkMapper.xml @@ -6,6 +6,7 @@ + @@ -72,7 +73,7 @@ - id, endpoint_id, name, vlan_id, start_ip, end_ip, netmask, dhcp_enable, pxe_enable, + id, endpoint_id, name, vlan_id,interFace,start_ip, end_ip, netmask, dhcp_enable, pxe_enable, create_time