From f4f51f04517cfcfdb463d49a889a817dc9c07e06 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 1 Aug 2011 13:00:53 -0700 Subject: [PATCH] Revert "bug 10812: modifying dhcp option 119 on domR as per zone config" This reverts commit 606ec843475911680adb743d7975bf7d584ab240. --- api/src/com/cloud/api/ApiConstants.java | 1 - api/src/com/cloud/api/commands/UpdateZoneCmd.java | 12 ++---------- patches/systemvm/debian/config/etc/dnsmasq.conf | 3 --- .../debian/config/etc/init.d/cloud-early-config | 4 ---- .../configuration/ConfigurationManagerImpl.java | 9 +-------- .../router/VirtualNetworkApplianceManagerImpl.java | 7 ------- 6 files changed, 3 insertions(+), 33 deletions(-) diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java index 05ba3a78fa1..3bb70717903 100755 --- a/api/src/com/cloud/api/ApiConstants.java +++ b/api/src/com/cloud/api/ApiConstants.java @@ -33,7 +33,6 @@ public class ApiConstants { public static final String CERTIFICATE = "certificate"; public static final String PRIVATE_KEY = "privatekey"; public static final String DOMAIN_SUFFIX = "domainsuffix"; - public static final String DOMAIN_SUFFIX_LIST = "domainsuffixlist"; public static final String CIDR = "cidr"; public static final String CIDR_LIST = "cidrlist"; public static final String CLEANUP = "cleanup"; diff --git a/api/src/com/cloud/api/commands/UpdateZoneCmd.java b/api/src/com/cloud/api/commands/UpdateZoneCmd.java index a4182851088..0c40b0cb583 100644 --- a/api/src/com/cloud/api/commands/UpdateZoneCmd.java +++ b/api/src/com/cloud/api/commands/UpdateZoneCmd.java @@ -18,7 +18,6 @@ package com.cloud.api.commands; -import java.util.List; import java.util.Map; import org.apache.log4j.Logger; @@ -77,10 +76,7 @@ public class UpdateZoneCmd extends BaseCmd { private Map details; @Parameter(name=ApiConstants.DHCP_PROVIDER, type=CommandType.STRING, description="the dhcp Provider for the Zone") - private String dhcpProvider; - - @Parameter(name=ApiConstants.DOMAIN_SUFFIX_LIST, type=CommandType.LIST, collectionType = CommandType.STRING, description="the list of domain suffixes for dns") - private List domainSuffixList; + private String dhcpProvider; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -132,11 +128,7 @@ public class UpdateZoneCmd extends BaseCmd { public String getDhcpProvider() { return dhcpProvider; - } - - public List getDomainSuffixList() { - return domainSuffixList; - } + } ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/patches/systemvm/debian/config/etc/dnsmasq.conf b/patches/systemvm/debian/config/etc/dnsmasq.conf index 86e49e902fc..8f999a75cb1 100644 --- a/patches/systemvm/debian/config/etc/dnsmasq.conf +++ b/patches/systemvm/debian/config/etc/dnsmasq.conf @@ -252,9 +252,6 @@ dhcp-hostsfile=/etc/dhcphosts.txt # Set the domain dhcp-option=15,"2.vmops-test.vmops.com" -# Send RFC-3397 DNS domain search DHCP option. -#dhcp-option=119,"vmops.com" - # Send the etherboot magic flag and then etherboot options (a string). #dhcp-option=128,e4:45:74:68:00:00 #dhcp-option=129,NIC=eepro100 diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 1d9633aafb2..80704f848cc 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -255,7 +255,6 @@ setup_dnsmasq() { fi sed -i -e "s/^dhcp-range=.*$/dhcp-range=$DHCP_RANGE,static/" /etc/dnsmasq.conf sed -i -e "s/^[#]*listen-address=.*$/listen-address=$ETH0_IP/" /etc/dnsmasq.conf - sed -i s/[#]*dhcp-option=119.*$/dhcp-option=119,\"$DOMAIN_SUFFIX\"/ /etc/dnsmasq.conf } @@ -491,9 +490,6 @@ for i in $CMDLINE domain) DOMAIN=$VALUE ;; - domainsuffix) - DOMAIN_SUFFIX=$VALUE - ;; mgmtcidr) MGMTNET=$VALUE ;; diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 86f68c54299..e98dbc8c16a 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -120,7 +120,6 @@ import com.cloud.user.UserContext; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.utils.NumbersUtil; -import com.cloud.utils.StringUtils; import com.cloud.utils.component.Adapters; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.Inject; @@ -1088,7 +1087,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura String internalDns2 = cmd.getInternalDns2(); String vnetRange = cmd.getVlan(); String guestCidr = cmd.getGuestCidrAddress(); - List domainSuffixList = cmd.getDomainSuffixList(); Long userId = UserContext.current().getCallerUserId(); int startVnetRange = 0; int stopVnetRange = 0; @@ -1114,12 +1112,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura }*/ newDetails.put(key, value); } - } - - // add the domain prefix list to details if not null - if (domainSuffixList != null){ - newDetails.put("dns.suffixes", StringUtils.join(domainSuffixList, ",")); - } + } if (userId == null) { userId = Long.valueOf(User.UID_SYSTEM); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ed61c0f5177..db8fb068ed4 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -70,7 +70,6 @@ import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; import com.cloud.dc.dao.AccountVlanMapDao; import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.DcDetailsDaoImpl; import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; import com.cloud.deploy.DataCenterDeployment; @@ -935,8 +934,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian String dhcpRange = null; DataCenter dc = dest.getDataCenter(); - DataCenterVO dcVO = _dcDao.findById(dc.getId()); - _dcDao.loadDetails(dcVO); if (dc.getNetworkType() == NetworkType.Advanced) { String cidr = network.getCidr(); @@ -1015,10 +1012,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian String domain = network.getNetworkDomain(); if (domain != null) { buf.append(" domain=" + domain); - } - String domain_suffix = dcVO.getDetail("dns.suffixes"); - if (domain != null) { - buf.append(" domainsuffix=" + domain_suffix); } if (!network.isDefault() && network.getGuestType() == GuestIpType.Direct) {