Skip to content

Commit acd4fc9

Browse files
committed
NE; remove set-dhcp-options
1 parent 4a486f9 commit acd4fc9

1 file changed

Lines changed: 1 addition & 32 deletions

File tree

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ public class NetworkExtensionElement extends AdapterBase implements
226226
public static final String CMD_ADD_DHCP_ENTRY = "add-dhcp-entry";
227227
public static final String CMD_CONFIG_DHCP_SUBNET = "config-dhcp-subnet";
228228
public static final String CMD_REMOVE_DHCP_SUBNET = "remove-dhcp-subnet";
229-
public static final String CMD_SET_DHCP_OPTIONS = "set-dhcp-options";
230229
public static final String CMD_REMOVE_DHCP_ENTRY = "remove-dhcp-entry";
231230
public static final String CMD_ADD_DNS_ENTRY = "add-dns-entry";
232231
public static final String CMD_CONFIG_DNS_SUBNET = "config-dns-subnet";
@@ -1437,37 +1436,7 @@ public boolean removeDhcpSupportForSubnet(Network network) throws ResourceUnavai
14371436

14381437
@Override
14391438
public boolean setExtraDhcpOptions(Network network, long nicId, Map<Integer, String> dhcpOptions) {
1440-
if (!canHandle(network, Service.Dhcp)) {
1441-
return false;
1442-
}
1443-
if (MapUtils.isEmpty(dhcpOptions)) {
1444-
return true;
1445-
}
1446-
logger.debug("setExtraDhcpOptions: network={} nicId={} options={}", network, nicId, dhcpOptions.size());
1447-
// Serialise options as a compact JSON object: {"<code>":"<value>", ...}
1448-
StringBuilder json = new StringBuilder("{");
1449-
boolean first = true;
1450-
for (Map.Entry<Integer, String> e : dhcpOptions.entrySet()) {
1451-
if (!first) json.append(",");
1452-
json.append("\"").append(e.getKey()).append("\":\"")
1453-
.append(e.getValue() != null ? e.getValue().replace("\"", "\\\"") : "")
1454-
.append("\"");
1455-
first = false;
1456-
}
1457-
json.append("}");
1458-
String extensionIp = ensureExtensionIp(network);
1459-
JsonObject payload = new JsonObject();
1460-
payload.addProperty("network_id", String.valueOf(network.getId()));
1461-
payload.addProperty("nic_id", String.valueOf(nicId));
1462-
payload.addProperty("options", json.toString());
1463-
payload.addProperty("extension_ip", safeStr(extensionIp));
1464-
addVpcIdToPayload(payload, network);
1465-
try {
1466-
return executeScript(network, CMD_SET_DHCP_OPTIONS, payload);
1467-
} catch (Exception e) {
1468-
logger.warn("setExtraDhcpOptions failed for network {}: {}", network, e.getMessage());
1469-
return false;
1470-
}
1439+
return false;
14711440
}
14721441

14731442
@Override

0 commit comments

Comments
 (0)