diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java index 2c1a2c2aa8a..8b5e64646a8 100755 --- a/api/src/com/cloud/api/ApiConstants.java +++ b/api/src/com/cloud/api/ApiConstants.java @@ -212,7 +212,6 @@ public class ApiConstants { public static final String PRIVATE_MAC_ADDRESS = "privatemacaddress"; public static final String PRIVATE_NETMASK = "privatenetmask"; public static final String PRIVATE_NETWORK_ID = "privatenetworkid"; - public static final String USE_EXTERNAL_DHCP = "useexternaldhcp"; public static final String PING_STORAGE_SERVER_IP = "pingstorageserverip"; public static final String PING_DIR = "pingdir"; public static final String TFTP_DIR = "tftpdir"; diff --git a/api/src/com/cloud/api/commands/CreatePodCmd.java b/api/src/com/cloud/api/commands/CreatePodCmd.java index ec3716cdd35..1d8e787603e 100644 --- a/api/src/com/cloud/api/commands/CreatePodCmd.java +++ b/api/src/com/cloud/api/commands/CreatePodCmd.java @@ -57,9 +57,6 @@ public class CreatePodCmd extends BaseCmd { @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the Zone ID in which the Pod will be created ") private Long zoneId; - @Parameter(name=ApiConstants.USE_EXTERNAL_DHCP, type=CommandType.BOOLEAN, description="whether use external dhcp server, true/false, default is false ") - private Boolean useExternalDhcp; - ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -87,12 +84,7 @@ public class CreatePodCmd extends BaseCmd { public Long getZoneId() { return zoneId; - } - - public Boolean getUseExternalDhcp() { - return useExternalDhcp; - } - + } ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java index 5e53c3a9e81..194526cfd6d 100644 --- a/server/src/com/cloud/configuration/ConfigurationManager.java +++ b/server/src/com/cloud/configuration/ConfigurationManager.java @@ -93,10 +93,9 @@ public interface ConfigurationManager extends ConfigurationService, Manager { * @param cidr * @param startIp * @param endIp - * @param useExternalDhcp * @return Pod */ - HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, Boolean useExternalDhcp); + HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp); /** diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 64fe16b823e..2980955896f 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -684,14 +684,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura Long zoneId = cmd.getZoneId(); String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask); Long userId = UserContext.current().getCallerUserId(); - Boolean useExternalDhcp = cmd.getUseExternalDhcp(); - useExternalDhcp = (useExternalDhcp == null ? false : useExternalDhcp); - return createPod(userId.longValue(), name, zoneId, gateway, cidr, startIp, endIp, useExternalDhcp); + return createPod(userId.longValue(), name, zoneId, gateway, cidr, startIp, endIp); } @Override @DB - public HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, Boolean useExternalDhcp) { + public HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp) { // Check if the zone is valid if (!validZone(zoneId)) { @@ -719,7 +717,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura throw new InvalidParameterValueException("Start ip is required parameter"); } - HostPodVO pod = new HostPodVO(podName, zoneId, gateway, cidrAddress, cidrSize, ipRange, useExternalDhcp); + HostPodVO pod = new HostPodVO(podName, zoneId, gateway, cidrAddress, cidrSize, ipRange); Transaction txn = Transaction.currentTxn(); txn.start(); diff --git a/server/src/com/cloud/dc/HostPodVO.java b/server/src/com/cloud/dc/HostPodVO.java index dc358278a0e..dfd67b65e25 100644 --- a/server/src/com/cloud/dc/HostPodVO.java +++ b/server/src/com/cloud/dc/HostPodVO.java @@ -55,14 +55,14 @@ public class HostPodVO implements Pod { @Column(name = "external_dhcp") private Boolean externalDhcp; - public HostPodVO(String name, long dcId, String gateway, String cidrAddress, int cidrSize, String description, Boolean externalDhcp) { + public HostPodVO(String name, long dcId, String gateway, String cidrAddress, int cidrSize, String description) { this.name = name; this.dataCenterId = dcId; this.gateway = gateway; this.cidrAddress = cidrAddress; this.cidrSize = cidrSize; this.description = description; - this.externalDhcp = externalDhcp; + this.externalDhcp = false; } /* diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 092ba7057f6..d3834b57e98 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -633,7 +633,7 @@ public class ConfigurationServerImpl implements ConfigurationServer { ipRange = ""; } - HostPodVO pod = new HostPodVO(podName, zoneId, gateway, cidrAddress, cidrSize, ipRange, false); + HostPodVO pod = new HostPodVO(podName, zoneId, gateway, cidrAddress, cidrSize, ipRange); Transaction txn = Transaction.currentTxn(); try { txn.start();