X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=apps%2Fcallhome-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftopology%2Fcallhome%2FNetconfCallHomeTlsService.java;fp=apps%2Fcallhome-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftopology%2Fcallhome%2FNetconfCallHomeTlsService.java;h=e9d3a36bd875ee32d1e4156865cda0d05aa87466;hb=4860983af522e305d8f41e6b337ca682f830459d;hp=ae23d84e35931b3c0b855c7a1ad73270605134b8;hpb=200f93512f61f7730c724f430fd90a7118a9fe04;p=netconf.git

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java
index ae23d84e35..e9d3a36bd8 100644
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java
@@ -18,32 +18,12 @@ import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.metatype.annotations.AttributeDefinition;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Component(service = { }, configurationPid = "org.opendaylight.netconf.callhome.mount.tls.server")
-@Designate(ocd = NetconfCallHomeTlsService.Configuration.class)
+@Component(service = { }, configurationPid = "org.opendaylight.netconf.topology.callhome")
 @Singleton
 public class NetconfCallHomeTlsService implements AutoCloseable {
-
-    @ObjectClassDefinition
-    public @interface Configuration {
-        @AttributeDefinition
-        String host() default "0.0.0.0";
-
-        @AttributeDefinition(min = "1", max = "65535")
-        int port() default 4335;
-
-        @AttributeDefinition
-        int timeoutMillis() default 10_000;
-
-        @AttributeDefinition
-        int maxConnections() default 64;
-    }
-
     private static final Logger LOG = LoggerFactory.getLogger(NetconfCallHomeTlsService.class);
 
     private final CallHomeTlsServer server;
@@ -55,21 +35,22 @@ public class NetconfCallHomeTlsService implements AutoCloseable {
             final @Reference CallHomeMountService mountService,
             final @Reference CallHomeTlsAuthProvider authProvider,
             final @Reference CallHomeStatusRecorder statusRecorder,
-            final Configuration configuration) {
+            final CallHomeMountService.Configuration configuration) {
 
-        LOG.info("Starting Call-Home TLS server at {}:{}", configuration.host(), configuration.port());
+        LOG.info("Starting Call-Home TLS server at {}:{}", configuration.host(), configuration.tls$_$port());
         try {
             server = CallHomeTlsServer.builder()
                 .withAddress(InetAddress.getByName(configuration.host()))
-                .withPort(configuration.port())
-                .withTimeout(configuration.timeoutMillis())
-                .withMaxConnections(configuration.maxConnections())
+                .withPort(configuration.tls$_$port())
+                .withTimeout(configuration.connection$_$timeout$_$millis())
+                .withMaxConnections(configuration.max$_$connections())
                 .withAuthProvider(authProvider)
                 .withStatusRecorder(statusRecorder)
                 .withSessionContextManager(
                     mountService.createTlsSessionContextManager(authProvider, statusRecorder))
                 .withNegotiationFactory(new NetconfClientSessionNegotiatorFactory(timer, Optional.empty(),
-                    configuration.timeoutMillis(), NetconfClientSessionNegotiatorFactory.DEFAULT_CLIENT_CAPABILITIES))
+                    configuration.connection$_$timeout$_$millis(),
+                    NetconfClientSessionNegotiatorFactory.DEFAULT_CLIENT_CAPABILITIES))
                 .build();
         } catch (UnknownHostException e) {
             throw new IllegalArgumentException("invalid host", e);