X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyang%2Fgen%2Fv1%2Furn%2Fopendaylight%2Fparams%2Fxml%2Fns%2Fyang%2Fopenflow%2F_switch%2Fconnection%2Fprovider%2Fimpl%2Frev140328%2FSwitchConnectionProviderModule.java;h=68edb2a3e9ed2529002c1550625d48595688d20d;hb=07de1ed897da9d7dc70c6d550f38c59339ed751e;hp=04d16aab53596387bdbbb59120c154129a592bcd;hpb=87150bd287f792c118e906ffb8e9593a83f50c9e;p=openflowjava.git diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java index 04d16aab..68edb2a3 100644 --- a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java +++ b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java @@ -13,10 +13,12 @@ import java.net.InetAddress; import java.net.UnknownHostException; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionConfiguration; +import org.opendaylight.openflowjava.protocol.api.connection.ThreadConfiguration; import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration; -import org.opendaylight.openflowjava.protocol.impl.connection.SwitchConnectionProviderImpl; +import org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderImpl; 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; @@ -27,7 +29,7 @@ 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); @@ -70,14 +72,16 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang. /** * @return instance configuration object - * @throws UnknownHostException + * @throws UnknownHostException */ private ConnectionConfiguration createConnectionConfiguration() throws UnknownHostException { final InetAddress address = extractIpAddressBin(getAddress()); final Integer port = getPort(); final long switchIdleTimeout = getSwitchIdleTimeout(); final Tls tlsConfig = getTls(); - + final Threads threads = getThreads(); + final TransportProtocol transportProtocol = getTransportProtocol(); + return new ConnectionConfiguration() { @Override public InetAddress getAddress() { @@ -89,12 +93,11 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang. } @Override public Object getTransferProtocol() { - // TODO Auto-generated method stub - return null; + return transportProtocol; } @Override public TlsConfiguration getTlsConfiguration() { - if (tlsConfig == null) { + if (tlsConfig == null || !(TransportProtocol.TLS.equals(transportProtocol))) { return null; } return new TlsConfiguration() { @@ -145,13 +148,31 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang. // TODO Auto-generated method stub return null; } + @Override + public ThreadConfiguration getThreadConfiguration() { + if (threads == null) { + return null; + } + return new ThreadConfiguration() { + + @Override + public int getWorkerThreadCount() { + return threads.getWorkerThreads(); + } + + @Override + public int getBossThreadCount() { + return threads.getBossThreads(); + } + }; + } }; } /** * @param address * @return - * @throws UnknownHostException + * @throws UnknownHostException */ private static InetAddress extractIpAddressBin(IpAddress address) throws UnknownHostException { byte[] addressBin = null; @@ -162,7 +183,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang. addressBin = address2bin(address.getIpv6Address().getValue()); } } - + if (addressBin == null) { return null; } else {