Reorganise dependency injection in ServiceHandler

- solve the ServiceHandler instance duplication issue when installing
  T-API feature
- remove manuel instanciations from ServicehandlerProvider to let
  blueprint manage object instantiation as a singleton
- remove ServiceHandlerOperations interface and its implementation that
  was duplicating OrgOpenroadmServiceService interface, and chose that
  latter in T-API module
- adapt constructors of service handler UT accordingly
- reorganise dependency injection in lighty to be aligned with blueprint
  files

JIRA: TRNSPRTPCE-391
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I99d93bef801e24fe9972c277abbcdf5d28f8e781

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
index 02bf1a50b31d4644f99ce0b784b415b0079275b2..fa368050309d9ba629b32025c5a614cd357ff197 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
@@ -60,18 +60,18 @@ import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererS
 import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
 import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl;
 import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;
+import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl;
 import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider;
 import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
 import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
 import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl;
-import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations;
-import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperationsImpl;
 import org.opendaylight.transportpce.tapi.impl.TapiProvider;
 import org.opendaylight.transportpce.tapi.utils.TapiListener;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,10 +154,22 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
         RendererServiceOperations rendererServiceOperations = new RendererServiceOperationsImpl(deviceRendererService,
                 otnDeviceRendererService, olmPowerServiceRpc, lightyServices.getBindingDataBroker(),
                 lightyServices.getBindingNotificationPublishService());
+        ServiceDataStoreOperations serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(
+                lightyServices.getBindingDataBroker());
+        RendererListenerImpl rendererListenerImpl = new RendererListenerImpl(pathComputationService,
+            lightyServices.getBindingNotificationPublishService());
+        PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService,
+            lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations);
+        NetworkModelListenerImpl networkModelListenerImpl = new NetworkModelListenerImpl(
+                lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations);
+        ServicehandlerImpl servicehandler = new ServicehandlerImpl(lightyServices.getBindingDataBroker(),
+            pathComputationService, rendererServiceOperations, lightyServices.getBindingNotificationPublishService(),
+            pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations);
         servicehandlerProvider = new ServicehandlerProvider(lightyServices.getBindingDataBroker(),
-                lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), pathComputationService,
-                rendererServiceOperations, lightyServices.getBindingNotificationPublishService());
-        tapiProvider = initTapi(lightyServices, rendererServiceOperations, pathComputationService);
+                lightyServices.getRpcProviderService(), lightyServices.getNotificationService(),
+                serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl,
+                servicehandler);
+        tapiProvider = initTapi(lightyServices, servicehandler);
     }
 
     @Override
@@ -205,23 +217,9 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
      * @param rendererServiceOperations RendererServiceOperations
      * @return TapiProvider instance
      */
-    private TapiProvider initTapi(LightyServices lightyServices, RendererServiceOperations rendererServiceOperations,
-            PathComputationService pathComputationService) {
-        RendererListenerImpl rendererListenerImpl = new RendererListenerImpl(pathComputationService,
-                lightyServices.getBindingNotificationPublishService());
-        ServiceDataStoreOperations serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(
-                lightyServices.getBindingDataBroker());
-        PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService,
-                lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations);
-        NetworkModelListenerImpl networkModelListenerImpl =
-                new NetworkModelListenerImpl(lightyServices.getBindingNotificationPublishService(),
-                        serviceDataStoreOperations);
-        ServiceHandlerOperations serviceHandlerOperations = new ServiceHandlerOperationsImpl(
-                lightyServices.getBindingDataBroker(), pathComputationService, rendererServiceOperations,
-                lightyServices.getBindingNotificationPublishService(), pceListenerImpl, rendererListenerImpl,
-                networkModelListenerImpl);
+    private TapiProvider initTapi(LightyServices lightyServices, OrgOpenroadmServiceService servicehandler) {
         return new TapiProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(),
-                serviceHandlerOperations, new TapiListener());
+                servicehandler, new TapiListener());
     }
 
     /**

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
index 672f8517f675f5f323d433197d13a6f610a97dba..c5da973eb8860c29a77e6730486ff48f1babb269 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
@@ -9,11 +9,8 @@
 package org.opendaylight.transportpce.servicehandler.impl;
 
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
 import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
 import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
 import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
@@ -40,28 +37,30 @@ public class ServicehandlerProvider {
     private final DataBroker dataBroker;
     private final RpcProviderService rpcService;
     private final NotificationService notificationService;
-    private final NotificationPublishService notificationPublishService;
     private ListenerRegistration<TransportpcePceListener> pcelistenerRegistration;
     private ListenerRegistration<TransportpceRendererListener> rendererlistenerRegistration;
     private ListenerRegistration<TransportpceNetworkmodelListener> networkmodellistenerRegistration;
     private ObjectRegistration<OrgOpenroadmServiceService> rpcRegistration;
-    private PathComputationService pathComputationService;
-    private RendererServiceOperations rendererServiceOperations;
     private ServiceDataStoreOperations serviceDataStoreOperations;
+    private PceListenerImpl pceListenerImpl;
+    private RendererListenerImpl rendererListenerImpl;
+    private NetworkModelListenerImpl networkModelListenerImpl;
+    private ServicehandlerImpl servicehandler;
+
 
     public ServicehandlerProvider(final DataBroker dataBroker, RpcProviderService rpcProviderService,
-            NotificationService notificationService, PathComputationService pathComputationService,
-            RendererServiceOperations rendererServiceOperations,
-            NotificationPublishService notificationPublishService,
-            ServiceDataStoreOperations serviceDataStoreOperations) {
+            NotificationService notificationService, ServiceDataStoreOperations serviceDataStoreOperations,
+            PceListenerImpl pceListenerImpl, RendererListenerImpl rendererListenerImpl,
+            NetworkModelListenerImpl networkModelListenerImpl, ServicehandlerImpl servicehandler) {
         this.dataBroker = dataBroker;
         this.rpcService = rpcProviderService;
         this.notificationService = notificationService;
-        this.pathComputationService = pathComputationService;
-        this.rendererServiceOperations = rendererServiceOperations;
-        this.notificationPublishService = notificationPublishService;
         this.serviceDataStoreOperations = serviceDataStoreOperations;
         this.serviceDataStoreOperations.initialize();
+        this.pceListenerImpl = pceListenerImpl;
+        this.rendererListenerImpl = rendererListenerImpl;
+        this.networkModelListenerImpl = networkModelListenerImpl;
+        this.servicehandler = servicehandler;
     }
 
     /**
@@ -69,20 +68,10 @@ public class ServicehandlerProvider {
      */
     public void init() {
         LOG.info("ServicehandlerProvider Session Initiated");
-        final PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations,
-                pathComputationService, notificationPublishService, serviceDataStoreOperations);
-        final RendererListenerImpl rendererListenerImpl =
-                new RendererListenerImpl(pathComputationService, notificationPublishService);
-        final NetworkModelListenerImpl networkModelListenerImpl =
-                new NetworkModelListenerImpl(notificationPublishService, serviceDataStoreOperations);
         pcelistenerRegistration = notificationService.registerNotificationListener(pceListenerImpl);
         rendererlistenerRegistration = notificationService.registerNotificationListener(rendererListenerImpl);
         networkmodellistenerRegistration = notificationService.registerNotificationListener(networkModelListenerImpl);
-        final ServicehandlerImpl servicehandler = new ServicehandlerImpl(dataBroker, pathComputationService,
-                rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
-                networkModelListenerImpl, serviceDataStoreOperations);
-        rpcRegistration =
-            rpcService.registerRpcImplementation(OrgOpenroadmServiceService.class, servicehandler);
+        rpcRegistration = rpcService.registerRpcImplementation(OrgOpenroadmServiceService.class, servicehandler);
     }
 
     /**

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java
deleted file mode 100644 (file)
index 6ab4328..0000000
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright © 2018 Orange, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.transportpce.servicehandler.service;
-
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteOutput;
-
-public interface ServiceHandlerOperations {
-    ServiceCreateOutput serviceCreate(ServiceCreateInput input);
-
-    ServiceDeleteOutput serviceDelete(ServiceDeleteInput input);
-
-}

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java
deleted file mode 100644 (file)
index ed8ab32..0000000
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2018 Orange, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.transportpce.servicehandler.service;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import java.util.concurrent.ExecutionException;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
-import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
-import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl;
-import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
-import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
-import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteOutput;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ServiceHandlerOperationsImpl implements ServiceHandlerOperations {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ServiceHandlerOperationsImpl.class);
-
-    private ServicehandlerImpl serviceHandler;
-
-    public ServiceHandlerOperationsImpl(DataBroker databroker, PathComputationService pathComputationService,
-        RendererServiceOperations rendererServiceOperations, NotificationPublishService notificationPublishService,
-        PceListenerImpl pceListenerImpl, RendererListenerImpl rendererListenerImpl,
-        NetworkModelListenerImpl networkModelListenerImpl, ServiceDataStoreOperations serviceDataStoreOperations) {
-        this.serviceHandler = new ServicehandlerImpl(databroker, pathComputationService, rendererServiceOperations,
-            notificationPublishService, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl,
-            serviceDataStoreOperations);
-    }
-
-    @Override
-    public ServiceCreateOutput serviceCreate(ServiceCreateInput input) {
-        ListenableFuture<RpcResult<ServiceCreateOutput>> output = this.serviceHandler.serviceCreate(input);
-        ServiceCreateOutput outputresult = null;
-        try {
-            outputresult = output.get().getResult();
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("Rpc service create failed", e);
-        }
-        return outputresult;
-    }
-
-    @Override
-    public ServiceDeleteOutput serviceDelete(ServiceDeleteInput input) {
-        return null;
-    }
-
-    public void init() {
-        LOG.info("init ServiceHandlerOperationsImpl...");
-    }
-
-    public void close() {
-        LOG.info("close ServiceHandlerOperationsImpl...");
-    }
-
-}

diff --git a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
index 393ad9e3a7240a57781c2952af629e4a9775f172..d3e7a2727c98dc7aa972c7199aa32770a2844676 100644 (file)
--- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
+++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
@@ -52,7 +52,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
         <argument ref="serviceDatastoreOperation" />
     </bean>
 
-    <bean id="serviceHandlerImpl" class="org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperationsImpl">
+    <bean id="serviceHandlerImpl" class="org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl">
         <argument ref="dataBroker"/>
         <argument ref="pathComputationService" />
         <argument ref="notificationPublishService" />
@@ -69,13 +69,14 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
         <argument ref="rpcService" />
         <argument ref="dataBroker" />
         <argument ref="notificationService" />
-        <argument ref="notificationPublishService" />
-        <argument ref="pathComputationService" />
-        <argument ref="rendererServiceOperations" />
         <argument ref="serviceDatastoreOperation" />
+        <argument ref="pceListener" />
+        <argument ref="rendererListener" />
+        <argument ref="networkModelListener" />
+        <argument ref="serviceHandlerImpl" />
     </bean>
 
     <service ref="serviceHandlerImpl"
-        interface="org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations"/>
+        interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService"/>
 
 </blueprint>

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
index f2ec02f199cc068487eded030dec61b11b0a29f0..5c78e67ee5cd0b7327bf202ed7d93f859d080840 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
@@ -15,29 +15,32 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
+import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.test.AbstractTest;
 
 public class ServicehandlerProviderTest  extends AbstractTest {
 
     @Mock
-    private PathComputationService pathComputationService;
+    RpcProviderService rpcProviderRegistry;
 
     @Mock
-    private RendererServiceOperations rendererServiceOperations;
+    ServiceDataStoreOperations serviceDataStoreOperations;
 
     @Mock
-    private NotificationPublishService notificationPublishService;
+    PceListenerImpl pceListenerImpl;
 
     @Mock
-    RpcProviderService rpcProviderRegistry;
+    RendererListenerImpl rendererListenerImpl;
 
     @Mock
-    ServiceDataStoreOperations serviceDataStoreOperations;
+    NetworkModelListenerImpl networkModelListenerImpl;
+
+    @Mock
+    ServicehandlerImpl servicehandler;
 
     @Before
     public void init() {
@@ -49,8 +52,8 @@ public class ServicehandlerProviderTest  extends AbstractTest {
     public void testInitRegisterServiceHandlerToRpcRegistry() {
         ServicehandlerProvider provider =  new ServicehandlerProvider(
                 getDataBroker(), rpcProviderRegistry,
-                getNotificationService() , pathComputationService,
-                rendererServiceOperations, notificationPublishService, serviceDataStoreOperations);
+                getNotificationService() , serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl,
+                networkModelListenerImpl, servicehandler);
 
         provider.init();
 

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java
index 00e98ce486dbdd394f44c267f95bc516fcedb9b6..19af382c5e912b493114429567a1943e0856b609 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java
@@ -12,12 +12,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import org.opendaylight.transportpce.common.OperationResult;
-import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations;
 import org.opendaylight.transportpce.tapi.utils.GenericServiceEndpoint;
 import org.opendaylight.transportpce.tapi.utils.MappingUtils;
 import org.opendaylight.transportpce.tapi.utils.TapiUtils;
 import org.opendaylight.transportpce.tapi.validation.CreateConnectivityServiceValidation;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameBuilder;
@@ -58,9 +59,9 @@ public class TapiImpl implements TapiConnectivityService {
 
     private static final Logger LOG = LoggerFactory.getLogger(TapiImpl.class);
 
-    private ServiceHandlerOperations serviceHandler;
+    private OrgOpenroadmServiceService serviceHandler;
 
-    public TapiImpl(ServiceHandlerOperations serviceHandler) {
+    public TapiImpl(OrgOpenroadmServiceService serviceHandler) {
         LOG.info("inside TapiImpl constructor");
         this.serviceHandler = serviceHandler;
     }
@@ -88,7 +89,10 @@ public class TapiImpl implements TapiConnectivityService {
                     map.get(input.getEndPoint().values().stream().skip(1).findFirst().get()
                         .getServiceInterfacePoint()
                         .getServiceInterfacePointUuid()));
-                this.serviceHandler.serviceCreate(sci);
+                ListenableFuture<RpcResult<ServiceCreateOutput>> output = this.serviceHandler.serviceCreate(sci);
+                if (!output.isDone()) {
+                    return RpcResultBuilder.<CreateConnectivityServiceOutput>failed().buildFuture();
+                }
             } else {
                 LOG.error("Unknown UUID");
             }
@@ -123,7 +127,6 @@ public class TapiImpl implements TapiConnectivityService {
                 .setConnection(Map.of(connection.key(), connection))
                 .build())
             .build();
-
         return RpcResultBuilder.success(output).buildFuture();
     }
 

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java
index 03708beb7d9bf24bc6c319ad3a44978ba3b0d0f8..b6173df6b23e80de826c354f2503305c82d3c953 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java
@@ -12,9 +12,9 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations;
 import org.opendaylight.transportpce.tapi.topology.TapiTopologyImpl;
 import org.opendaylight.transportpce.tapi.utils.TapiListener;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev180928.ServiceInterfacePoints;
@@ -36,14 +36,14 @@ public class TapiProvider {
     private final DataBroker dataBroker;
     private final RpcProviderService rpcProviderService;
     private ObjectRegistration<TapiConnectivityService> rpcRegistration;
-    private final ServiceHandlerOperations serviceHandler;
+    private final OrgOpenroadmServiceService serviceHandler;
     private final TapiListener tapiListener;
 
     public TapiProvider(DataBroker dataBroker, RpcProviderService rpcProviderService,
-            ServiceHandlerOperations serviceHanlder, TapiListener tapiListener) {
+        OrgOpenroadmServiceService serviceHandler, TapiListener tapiListener) {
         this.dataBroker = dataBroker;
         this.rpcProviderService = rpcProviderService;
-        this.serviceHandler = serviceHanlder;
+        this.serviceHandler = serviceHandler;
         this.tapiListener = tapiListener;
     }
 

diff --git a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
index 75aa579324f679821af3cb1edc1c17e911068b3b..6149a54c8ba46ef65bf9d147bbcd8bb4113c3de3 100644 (file)
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -20,7 +20,7 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <reference id="serviceHandlerService"
-          interface="org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations" />
+          interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService" />
 
     <bean id="tapiListener"
           class="org.opendaylight.transportpce.tapi.utils.TapiListener">