*/
package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.impl.rev140328;
+import com.google.common.base.MoreObjects;
import java.net.InetAddress;
import java.net.UnknownHostException;
-
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionConfiguration;
-import org.opendaylight.openflowjava.protocol.api.connection.StatisticsConfiguration;
import org.opendaylight.openflowjava.protocol.api.connection.ThreadConfiguration;
import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
import org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderImpl;
-import org.opendaylight.openflowjava.statistics.StatisticsCounters;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.KeystoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.TransportProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
-
/**
*
*/
public final class SwitchConnectionProviderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.impl.rev140328.AbstractSwitchConnectionProviderModule
{
-
+
private static Logger LOG = LoggerFactory
.getLogger(SwitchConnectionProviderModule.class);
* @param identifier
* @param dependencyResolver
*/
- public SwitchConnectionProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+ public SwitchConnectionProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
super(identifier, dependencyResolver);
}
* @param oldModule
* @param oldInstance
*/
- public SwitchConnectionProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
- SwitchConnectionProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+ public SwitchConnectionProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+ final SwitchConnectionProviderModule oldModule, final java.lang.AutoCloseable oldInstance) {
super(identifier, dependencyResolver, oldModule, oldInstance);
}
@Override
public java.lang.AutoCloseable createInstance() {
LOG.info("SwitchConnectionProvider started.");
- SwitchConnectionProviderImpl switchConnectionProviderImpl = new SwitchConnectionProviderImpl();
- StatisticsCounters sc = StatisticsCounters.getInstance();
+ final SwitchConnectionProviderImpl switchConnectionProviderImpl = new SwitchConnectionProviderImpl();
try {
- ConnectionConfiguration connConfiguration = createConnectionConfiguration();
+ final ConnectionConfiguration connConfiguration = createConnectionConfiguration();
switchConnectionProviderImpl.setConfiguration(connConfiguration);
- startStatistics(sc, connConfiguration.getStatisticsConfiguration());
- } catch (UnknownHostException e) {
+ } catch (final UnknownHostException e) {
throw new IllegalArgumentException(e.getMessage(), e);
}
return switchConnectionProviderImpl;
}
-
/**
* @return instance configuration object
- * @throws UnknownHostException
+ * @throws UnknownHostException
*/
private ConnectionConfiguration createConnectionConfiguration() throws UnknownHostException {
final InetAddress address = extractIpAddressBin(getAddress());
final long switchIdleTimeout = getSwitchIdleTimeout();
final Tls tlsConfig = getTls();
final Threads threads = getThreads();
+ final Boolean useBarrier = getUseBarrier();
final TransportProtocol transportProtocol = getTransportProtocol();
- final Statistics statistics = getStatistics();
-
+
return new ConnectionConfiguration() {
@Override
public InetAddress getAddress() {
return new TlsConfiguration() {
@Override
public KeystoreType getTlsTruststoreType() {
- return Objects.firstNonNull(tlsConfig.getTruststoreType(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getTruststoreType(), null);
}
@Override
public String getTlsTruststore() {
- return Objects.firstNonNull(tlsConfig.getTruststore(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getTruststore(), null);
}
@Override
public KeystoreType getTlsKeystoreType() {
- return Objects.firstNonNull(tlsConfig.getKeystoreType(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getKeystoreType(), null);
}
@Override
public String getTlsKeystore() {
- return Objects.firstNonNull(tlsConfig.getKeystore(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getKeystore(), null);
}
@Override
public org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType getTlsKeystorePathType() {
- return Objects.firstNonNull(tlsConfig.getKeystorePathType(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getKeystorePathType(), null);
}
@Override
public org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType getTlsTruststorePathType() {
- return Objects.firstNonNull(tlsConfig.getTruststorePathType(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getTruststorePathType(), null);
}
@Override
public String getKeystorePassword() {
- return Objects.firstNonNull(tlsConfig.getKeystorePassword(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getKeystorePassword(), null);
}
@Override
public String getCertificatePassword() {
- return Objects.firstNonNull(tlsConfig.getCertificatePassword(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getCertificatePassword(), null);
}
@Override
public String getTruststorePassword() {
- return Objects.firstNonNull(tlsConfig.getTruststorePassword(), null);
+ return MoreObjects.firstNonNull(tlsConfig.getTruststorePassword(), null);
}
};
}
return null;
}
return new ThreadConfiguration() {
-
+
@Override
public int getWorkerThreadCount() {
return threads.getWorkerThreads();
}
-
+
@Override
public int getBossThreadCount() {
return threads.getBossThreads();
}
};
}
+
@Override
- public StatisticsConfiguration getStatisticsConfiguration(){
- return new StatisticsConfiguration() {
- @Override
- public Boolean getStatisticsCollect() {
- if(statistics == null){
- return false;
- }
- if (statistics.getStatisticsCollect() == null){
- return false;
- }
- return statistics.getStatisticsCollect();
- }
- @Override
- public Integer getLogReportDelay() {
- if(statistics == null){
- return -1;
- }
- if(statistics.getLogReportDelay() == null){
- return -1;
- };
- return statistics.getLogReportDelay();
- }
- };
+ public boolean useBarrier() {
+ return useBarrier;
}
};
}
/**
* @param address
* @return
- * @throws UnknownHostException
+ * @throws UnknownHostException
*/
- private static InetAddress extractIpAddressBin(IpAddress address) throws UnknownHostException {
+ private static InetAddress extractIpAddressBin(final IpAddress address) throws UnknownHostException {
byte[] addressBin = null;
if (address != null) {
if (address.getIpv4Address() != null) {
addressBin = address2bin(address.getIpv6Address().getValue());
}
}
-
+
if (addressBin == null) {
return null;
} else {
}
}
- /**
- * Configure and start Statistics Counters by configuration parameters.
- * No operations is performed if:
- * - statisticsConfig is null
- * - sc is null
- * - sc is not null and if counting is running
- * @param sc - statistic counter to configure and start
- * @param statisticsConfig - configuration parameters
- */
- private static void startStatistics(StatisticsCounters sc, StatisticsConfiguration statisticsConfig){
- if(statisticsConfig == null){
- return;
- }
- if(sc == null || sc.isRunCounting()){
- return;
- }
- Boolean toCollectStats = statisticsConfig.getStatisticsCollect();
- Integer logDelay = statisticsConfig.getLogReportDelay();
- if(toCollectStats != null && toCollectStats.booleanValue()){
- int logPeriod = -1;
- if(logDelay != null){
- logPeriod = logDelay.intValue();
- }
- if(logPeriod >0){
- sc.startCounting(true, logPeriod);
- } else {
- sc.startCounting(false, 0);
- }
- }
- }
-
/**
* @param value
* @return
*/
- private static byte[] address2bin(String value) {
+ private static byte[] address2bin(final String value) {
//TODO: translate ipv4 or ipv6 into byte[]
return null;
}
Code Review / openflowjava.git / blobdiff