DomainNameRecords.java (eucalyptus-4.4.1) | : | DomainNameRecords.java (eucalyptus-4.4.2) | ||
---|---|---|---|---|
skipping to change at line 68 | skipping to change at line 68 | |||
* REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO | * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO | |||
* IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT | * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT | |||
* NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. | * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. | |||
************************************************************************/ | ************************************************************************/ | |||
package com.eucalyptus.util.dns; | package com.eucalyptus.util.dns; | |||
import java.net.InetAddress; | import java.net.InetAddress; | |||
import java.text.DateFormat; | import java.text.DateFormat; | |||
import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | |||
import java.util.Collection; | ||||
import java.util.Date; | import java.util.Date; | |||
import java.util.List; | import java.util.List; | |||
import java.util.function.Predicate; | ||||
import org.xbill.DNS.ARecord; | import org.xbill.DNS.ARecord; | |||
import org.xbill.DNS.CNAMERecord; | import org.xbill.DNS.CNAMERecord; | |||
import org.xbill.DNS.DClass; | import org.xbill.DNS.DClass; | |||
import org.xbill.DNS.Name; | import org.xbill.DNS.Name; | |||
import org.xbill.DNS.PTRRecord; | import org.xbill.DNS.PTRRecord; | |||
import org.xbill.DNS.Record; | import org.xbill.DNS.Record; | |||
import org.xbill.DNS.ReverseMap; | import org.xbill.DNS.ReverseMap; | |||
import org.xbill.DNS.SOARecord; | import org.xbill.DNS.SOARecord; | |||
import com.eucalyptus.component.ServiceConfiguration; | ||||
import com.eucalyptus.component.Topology; | ||||
import com.eucalyptus.component.id.Dns; | ||||
import com.eucalyptus.configurable.ConfigurableClass; | import com.eucalyptus.configurable.ConfigurableClass; | |||
import com.eucalyptus.configurable.ConfigurableField; | import com.eucalyptus.configurable.ConfigurableField; | |||
import com.google.common.net.InetAddresses; | import com.google.common.net.InetAddresses; | |||
/** | /** | |||
* @author chris grzegorczyk <grze@eucalyptus.com> | * @author chris grzegorczyk <grze@eucalyptus.com> | |||
*/ | */ | |||
@ConfigurableClass( root = "dns", | @ConfigurableClass( root = "dns", | |||
description = "Configuration options controlling the behavio ur of DNS features." ) | description = "Configuration options controlling the behavio ur of DNS features." ) | |||
public class DomainNameRecords { | public class DomainNameRecords { | |||
skipping to change at line 101 | skipping to change at line 106 | |||
private final static long NEGATIVE_TTL = 5L; | private final static long NEGATIVE_TTL = 5L; | |||
public static long ttl( ) { | public static long ttl( ) { | |||
return TTL; | return TTL; | |||
} | } | |||
public static long negativeTtl( ) { | public static long negativeTtl( ) { | |||
return NEGATIVE_TTL; | return NEGATIVE_TTL; | |||
} | } | |||
public static Predicate<ServiceConfiguration> activeNameserverPredicate( ) { | ||||
final Collection<ServiceConfiguration> enabledNsServers = Topology.enabledSe | ||||
rvices( Dns.class ); | ||||
return conf -> enabledNsServers.contains( conf ) || conf.isHostLocal( ); | ||||
} | ||||
public static List<? extends Record> nameservers( Name subdomain ) { | public static List<? extends Record> nameservers( Name subdomain ) { | |||
return DomainNames.nameServerRecords( subdomain ); | return DomainNames.nameServerRecords( subdomain ); | |||
} | } | |||
public static SOARecord sourceOfAuthority( Name name ) { | public static SOARecord sourceOfAuthority( Name name ) { | |||
final Name soa = DomainNames.sourceOfAuthority( name ); | final Name soa = DomainNames.sourceOfAuthority( name ); | |||
final Name ns = DomainNames.nameServerRecords( name ).get( 0 ).getTarget( ); | final Name ns = DomainNames.nameServerRecords( name ).get( 0 ).getTarget( ); | |||
SOARecord soaRecord = new SOARecord( name, DClass.IN, TTL, ns, | SOARecord soaRecord = new SOARecord( name, DClass.IN, TTL, ns, | |||
Name.fromConstantString( "root." + soa ), | Name.fromConstantString( "root." + soa ), | |||
DomainNameRecords.serial( ), 1200L, 180 L, 2419200L, NEGATIVE_TTL ); | DomainNameRecords.serial( ), 1200L, 180 L, 2419200L, NEGATIVE_TTL ); | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 11 lines changed or added |