-diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
-index 43085f6..8a9699a 100644
---- a/servicehandler/pom.xml
-+++ b/servicehandler/pom.xml
-@@ -67,6 +67,11 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
- <artifactId>transportpce-pce</artifactId>
- <version>${project.version}</version>
- </dependency>
-+ <dependency>
-+ <groupId>${project.groupId}</groupId>
-+ <artifactId>transportpce-stubrenderer</artifactId>
-+ <version>${project.version}</version>
-+ </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
-index 2b0ee83..2899617 100644
+index e5b44c4..a063b9e 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
-@@ -7,8 +7,6 @@
- */
+@@ -8,8 +8,6 @@
package org.opendaylight.transportpce.servicehandler;
+ import com.google.common.util.concurrent.ListenableFuture;
-import java.util.ArrayList;
-import java.util.List;
- import java.util.concurrent.Future;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PathComputationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.path.computation.request.input.ServiceAEnd;
+ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.path.computation.request.input.ServiceAEndBuilder;
@@ -18,8 +16,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev17
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommonBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.routing.constraints.sp.HardConstraintsBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.routing.constraints.sp.SoftConstraintsBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.endpoint.sp.RxDirection;
-@@ -237,42 +227,6 @@ public final class ModelMappingUtils {
+@@ -238,42 +228,6 @@ public final class ModelMappingUtils {
.setSoftConstraints(serviceReconfigureInput.getSoftConstraints())
.setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend);
}
- for (org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426
- .path.description.atoz.direction.AToZ tmp : pathDescription.getAToZDirection().getAToZ()) {
-
-- AToZKey key = new AToZKey(tmp.getKey().getId());
-- AToZ atoz = new AToZBuilder().setId(tmp.getId()).setKey(key)
+- AToZKey key = new AToZKey(tmp.key().getId());
+- AToZ atoz = new AToZBuilder().setId(tmp.getId()).withKey(key)
- // .setResource(tmp.getResource())
- .build();
- atozList.add(atoz);
- for (org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426
- .path.description.ztoa.direction.ZToA
- tmp : pathDescription.getZToADirection().getZToA()) {
-- ZToAKey key = new ZToAKey(tmp.getKey().getId());
-- ZToA ztoa = new ZToABuilder().setId(tmp.getId()).setKey(key)
+- ZToAKey key = new ZToAKey(tmp.key().getId());
+- ZToA ztoa = new ZToABuilder().setId(tmp.getId()).withKey(key)
- // .setResource(tmp.getResource())
- .build();
- ztoaList.add(ztoa);
}
diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java
-index 5dc24b3..714e2b3 100644
+index b81e9b4..c5b5045 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java
-@@ -12,7 +12,6 @@ import java.time.format.DateTimeFormatter;
- import java.util.Optional;
- import java.util.concurrent.ExecutionException;
- import java.util.concurrent.Future;
--
- import org.opendaylight.controller.md.sal.binding.api.DataBroker;
- import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
- import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-@@ -27,6 +26,7 @@ import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOper
+@@ -27,6 +27,7 @@ import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOper
import org.opendaylight.transportpce.servicehandler.validation.ServiceCreateValidation;
import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult;
import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerCompliancyCheck;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PathComputationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.RpcActions;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.sdnc.request.header.SdncRequestHeaderBuilder;
-@@ -89,6 +89,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
+@@ -89,6 +90,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
private ServiceDataStoreOperations serviceDataStoreOperations;
private RendererServiceOperations rendererServiceOperations;
private PCEServiceWrapper pceServiceWrapper;
//TODO: remove private request fields as they are in global scope
-@@ -145,8 +146,12 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
+@@ -145,8 +147,9 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
ServiceImplementationRequestInput serviceImplementationRequest =
ModelMappingUtils.createServiceImplementationRequest(input, pceResponse);
-+// org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426
-+// .ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
-+// .serviceImplementation(serviceImplementationRequest);
+ this.stubrendererService = new SendingRendererRPCs();
org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426
- .ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
-+ .ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubrendererService
++ .ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubrendererService
.serviceImplementation(serviceImplementationRequest);
if (ResponseCodes.RESPONSE_OK
.equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {
-@@ -215,9 +220,11 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
+@@ -215,8 +218,9 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
LOG.debug("Service '{}' present in datastore !", serviceName);
org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteInput
serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(input);
-+// org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426
-+// .ServiceDeleteOutput output = this.rendererServiceOperations.serviceDelete(serviceDeleteInput);
+ this.stubrendererService = new SendingRendererRPCs();
org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426
- .ServiceDeleteOutput output = this.rendererServiceOperations.serviceDelete(serviceDeleteInput);
--
+ .ServiceDeleteOutput output = this.stubrendererService.serviceDelete(serviceDeleteInput);
+
if (!ResponseCodes.RESPONSE_OK
.equals(output.getConfigurationResponseCommon().getResponseCode())) {
- message = "Service delete failed!";
diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java
index 6db468c..76e4a26 100644
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java
LOG.error("RPC serviceDelete failed !",e);
} catch (ExecutionException e) {
diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java
-index cdcdc0e..7c7a825 100644
+index cdcdc0e..b43535f 100644
--- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java
+++ b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java
@@ -8,16 +8,18 @@
- });
+ LOG.info("Wait for 10s til beginning the Renderer serviceDelete request");
+ try {
-+ Thread.sleep(1000); //sleep for 10s
++ Thread.sleep(1000); //sleep for 1s
+ } catch (InterruptedException e) {
+ message = "deleting service failed !";
+ LOG.error(message);
- });
+ LOG.info("Wait for 10s til beginning the Renderer serviceDelete request");
+ try {
-+ Thread.sleep(2000); //sleep for 1s
++ Thread.sleep(1000); //sleep for 1s
+ } catch (InterruptedException e) {
+ message = "implementing service failed !";
+ LOG.error(message);
public void setError(String error) {
diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java
-index 23ae976..4187f96 100644
+index 6e197d5..e3e1984 100644
--- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java
+++ b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java
-@@ -9,33 +9,21 @@
+@@ -9,30 +9,21 @@
package org.opendaylight.transportpce.stubrenderer.impl;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
--import com.google.common.util.concurrent.ListenableFuture;
+ import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
--
-import java.util.concurrent.Executors;
- import java.util.concurrent.Future;
--
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
import org.opendaylight.transportpce.stubrenderer.SendingRendererRPCs;
import org.opendaylight.transportpce.stubrenderer.StubrendererCompliancyCheck;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
-@@ -48,21 +36,12 @@ import org.slf4j.LoggerFactory;
+@@ -45,21 +36,12 @@ import org.slf4j.LoggerFactory;
* @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange
*
*/
- }
-
@Override
- public Future<RpcResult<ServiceImplementationRequestOutput>> serviceImplementationRequest(
+ public ListenableFuture<RpcResult<ServiceImplementationRequestOutput>> serviceImplementationRequest(
ServiceImplementationRequestInput input) {
-@@ -71,121 +50,37 @@ public class StubrendererImpl implements StubrendererService {
- String message = "";
- ConfigurationResponseCommonBuilder configurationResponseCommon = null;
-
-- compliancyCheck = new StubrendererCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader());
-- if (compliancyCheck.check(false, true)) {
-+ this.compliancyCheck = new StubrendererCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader());
-+ if (this.compliancyCheck.check(false, true)) {
- LOG.info("Service compliant !");
- /**
- * If compliant, service-request parameters are verified in order to
- * check if there is no missing parameter that prevents calculating
+@@ -77,102 +59,20 @@ public class StubrendererImpl implements StubrendererService {
* a path and implement a service.
*/
--
-- notification = new ServiceRpcResultSpBuilder()
+
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
- .setServiceName(input.getServiceName())
- .setStatus(RpcStatusEx.Pending)
- .setStatusMessage("Service compliant, submitting serviceImplementation Request ...")
- .build();
- try {
-- notificationPublishService.putNotification(notification);
+- this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
+ SendingRendererRPCs sendingRenderer = new SendingRendererRPCs();
+ responseCode = "500";
}
-
-- SendingRendererRPCs sendingRenderer = new SendingRendererRPCs(executor);
+- SendingRendererRPCs sendingRenderer = new SendingRendererRPCs(this.executor);
- FutureCallback<Boolean> rendererCallback =
- new FutureCallback<Boolean>() {
- String message = "";
- public void onFailure(Throwable arg0) {
- LOG.error("Failure message : {}", arg0.toString());
- LOG.error("Service implementation failed !");
-- notification = new ServiceRpcResultSpBuilder()
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
- .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed)
- .setStatusMessage("PCR Request failed : {}" + arg0.getMessage()).build();
- try {
-- notificationPublishService.putNotification(notification);
+- StubrendererImpl.this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
- }
- public void onSuccess(Boolean response) {
- LOG.info("response : {}", response);
- if (response) {
-- message = "Service implemented !";
+- this.message = "Service implemented !";
- TopologyBuilder topo = sendingRenderer.getTopology();
- ServiceRpcResultSpBuilder tmp = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
- .setServiceName(input.getServiceName())
- .setStatus(RpcStatusEx.Successful)
-- .setStatusMessage(message);
+- .setStatusMessage(this.message);
- if (topo != null) {
- PathTopology value = new PathTopologyBuilder()
- .setAToZ(topo.getAToZ())
- .build();
- tmp.setPathTopology(value);
- }
-- notification = tmp.build();
+- this.notification = tmp.build();
- } else {
-- message = "Service implementation failed : " + sendingRenderer.getError();
-- notification = new ServiceRpcResultSpBuilder()
+- this.message = "Service implementation failed : " + sendingRenderer.getError();
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
- .setServiceName("")
-- .setStatus(RpcStatusEx.Failed).setStatusMessage(message)
+- .setStatus(RpcStatusEx.Failed).setStatusMessage(this.message)
- .build();
- }
-- LOG.info(notification.toString());
+- LOG.info(this.notification.toString());
- try {
-- notificationPublishService.putNotification(notification);
+- StubrendererImpl.this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
- }
-- LOG.info(message);
+- LOG.info(this.message);
- }
- };
- ListenableFuture<Boolean> renderer = sendingRenderer.serviceImplementation();
-- Futures.addCallback(renderer, rendererCallback, executor);
+- Futures.addCallback(renderer, rendererCallback, this.executor);
- LOG.info("Service implmentation Request in progress ");
- configurationResponseCommon = new ConfigurationResponseCommonBuilder()
- .setAckFinalIndicator("Yes")
- .build();
- return RpcResultBuilder.success(output).buildFuture();
} else {
-- message = compliancyCheck.getMessage();
+- message = this.compliancyCheck.getMessage();
+ message = "Service not compliant";
responseCode = "500";
- LOG.info("Service not compliant caused by : {}", message);
-- notification = new ServiceRpcResultSpBuilder()
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceDelete)
- .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed)
- .setStatusMessage("Service not compliant caused by : " + message)
- .build();
- try {
-- notificationPublishService.putNotification(notification);
+- this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
- }
}
configurationResponseCommon = new ConfigurationResponseCommonBuilder()
-- .setAckFinalIndicator("yes")
-- .setRequestId(input.getServiceHandlerHeader().getRequestId())
-- .setResponseCode(responseCode)
-- .setResponseMessage(message);
-+ .setAckFinalIndicator("yes")
-+ .setRequestId(input.getServiceHandlerHeader().getRequestId())
-+ .setResponseCode(responseCode)
-+ .setResponseMessage(message);
- ServiceImplementationRequestOutput output = new ServiceImplementationRequestOutputBuilder()
-- .setConfigurationResponseCommon(configurationResponseCommon.build())
-- .build();
--
-+ .setConfigurationResponseCommon(configurationResponseCommon.build())
-+ .build();
- return RpcResultBuilder.success(output).buildFuture();
- }
-
-@@ -195,108 +90,55 @@ public class StubrendererImpl implements StubrendererService {
- LOG.info("RPC serviceDelete request received");
- String responseCode = "";
- ConfigurationResponseCommonBuilder configurationResponseCommon = null;
-- compliancyCheck = new StubrendererCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader());
-- if (compliancyCheck.check(false, true)) {
-+ this.compliancyCheck = new StubrendererCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader());
-+ if (this.compliancyCheck.check(false, true)) {
- LOG.info("Service compliant !");
- /**
- * If compliant, service-request parameters are verified in order to
- * check if there is no missing parameter that prevents calculating
+ .setAckFinalIndicator("yes")
+@@ -201,90 +101,20 @@ public class StubrendererImpl implements StubrendererService {
* a path and implement a service.
*/
--
-- notification = new ServiceRpcResultSpBuilder()
+
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceDelete)
- .setServiceName(input.getServiceName())
- .setStatus(RpcStatusEx.Pending)
- .setStatusMessage("Service compliant, submitting serviceDelete Request ...")
- .build();
- try {
-- notificationPublishService.putNotification(notification);
+- this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
+ SendingRendererRPCs sendingRenderer = new SendingRendererRPCs();
+ LOG.error(message);
+ responseCode = "500";
}
-- SendingRendererRPCs sendingRenderer = new SendingRendererRPCs(executor);
+- SendingRendererRPCs sendingRenderer = new SendingRendererRPCs(this.executor);
- FutureCallback<Boolean> rendererCallback = new FutureCallback<Boolean>() {
- String message = "";
- ServiceRpcResultSp notification = null;
- public void onFailure(Throwable arg0) {
- LOG.error("Failure message : {}", arg0.toString());
- LOG.error("Service delete failed !");
-- notification = new ServiceRpcResultSpBuilder()
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceDelete)
- .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed)
- .setStatusMessage("PCR Request failed : " + arg0.getMessage()).build();
- try {
-- notificationPublishService.putNotification(notification);
+- StubrendererImpl.this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
- }
- public void onSuccess(Boolean response) {
- LOG.info("response : {}", response);
- if (response) {
-- message = "Service deleted !";
-- notification = new ServiceRpcResultSpBuilder()
+- this.message = "Service deleted !";
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceDelete)
- .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Successful)
-- .setStatusMessage(message).build();
+- .setStatusMessage(this.message).build();
- } else {
-- message = "Service delete failed : " + sendingRenderer.getError();
-- notification = new ServiceRpcResultSpBuilder()
+- this.message = "Service delete failed : " + sendingRenderer.getError();
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceDelete)
- .setServiceName("")
-- .setStatus(RpcStatusEx.Failed).setStatusMessage(message)
+- .setStatus(RpcStatusEx.Failed).setStatusMessage(this.message)
- .build();
- }
-- LOG.info(notification.toString());
+- LOG.info(this.notification.toString());
- try {
-- notificationPublishService.putNotification(notification);
+- StubrendererImpl.this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
- }
-- LOG.info(message);
+- LOG.info(this.message);
- }
- };
- ListenableFuture<Boolean> renderer = sendingRenderer.serviceDelete();
-- Futures.addCallback(renderer, rendererCallback, executor);
+- Futures.addCallback(renderer, rendererCallback, this.executor);
- message = "Service delete Request in progress ...";
- LOG.info(message);
- configurationResponseCommon = new ConfigurationResponseCommonBuilder()
- .build();
- return RpcResultBuilder.success(output).buildFuture();
} else {
-- message = compliancyCheck.getMessage();
+- message = this.compliancyCheck.getMessage();
- LOG.info("Service not compliant caused by : {}", message);
+ message = "Service not compliant";
responseCode = "500";
-- notification = new ServiceRpcResultSpBuilder()
+- this.notification = new ServiceRpcResultSpBuilder()
- .setNotificationType(ServicePathNotificationTypes.ServiceDelete)
- .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed)
- .setStatusMessage("Service not compliant caused by : " + message)
- .build();
- try {
-- notificationPublishService.putNotification(notification);
+- this.notificationPublishService.putNotification(this.notification);
- } catch (InterruptedException e) {
- LOG.info("notification offer rejected : {}", e);
- }
}
configurationResponseCommon = new ConfigurationResponseCommonBuilder()
-- .setAckFinalIndicator("yes")
-- .setRequestId(input.getServiceHandlerHeader().getRequestId())
-- .setResponseCode(responseCode)
-- .setResponseMessage(message);
-+ .setAckFinalIndicator("yes")
-+ .setRequestId(input.getServiceHandlerHeader().getRequestId())
-+ .setResponseCode(responseCode)
-+ .setResponseMessage(message);
- ServiceDeleteOutput output = new ServiceDeleteOutputBuilder()
-- .setConfigurationResponseCommon(configurationResponseCommon.build())
-- .build();
-+ .setConfigurationResponseCommon(configurationResponseCommon.build())
-+ .build();
+ .setAckFinalIndicator("yes")
+@@ -296,4 +126,24 @@ public class StubrendererImpl implements StubrendererService {
+ .build();
return RpcResultBuilder.success(output).buildFuture();
}
+
+ /* (non-Javadoc)
-+ * @see org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.TransportpceServicepathService#cancelResourceReserve(org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.CancelResourceReserveInput)
++ * @see org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.TransportpceServicepathService#pathComputationRequest(org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.PathComputationRequestInput)
+ */
+ @Override
-+ public Future<RpcResult<CancelResourceReserveOutput>> cancelResourceReserve(CancelResourceReserveInput input) {
++ public ListenableFuture<RpcResult<PathComputationRequestOutput>> pathComputationRequest(
++ PathComputationRequestInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
-+ * @see org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.TransportpceServicepathService#pathComputationRequest(org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.PathComputationRequestInput)
++ * @see org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.TransportpceServicepathService#cancelResourceReserve(org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.CancelResourceReserveInput)
+ */
+ @Override
-+ public Future<RpcResult<PathComputationRequestOutput>> pathComputationRequest(PathComputationRequestInput input) {
++ public ListenableFuture<RpcResult<CancelResourceReserveOutput>> cancelResourceReserve(
++ CancelResourceReserveInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java
-index 6dcdb8e..92b20f5 100644
+index 0beb087..92b20f5 100644
--- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java
+++ b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java
@@ -13,9 +13,7 @@ import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService
*/
public void init() {
LOG.info("StubrendererProvider Session Initiated");
-- final StubrendererImpl consumer = new StubrendererImpl(notificationPublishService);
-- rpcRegistration = rpcRegistry.addRpcImplementation(StubrendererService.class, consumer);
+- final StubrendererImpl consumer = new StubrendererImpl(this.notificationPublishService);
+- this.rpcRegistration = this.rpcRegistry.addRpcImplementation(StubrendererService.class, consumer);
+ final StubrendererImpl consumer = new StubrendererImpl();
+ this.rpcRegistration = this.rpcRegistry.addRpcImplementation(TransportpceServicepathService.class, consumer);
}
/**
-@@ -54,7 +48,6 @@ public class StubrendererProvider {
- */
- public void close() {
- LOG.info("StubrendererProvider Closed");
-- rpcRegistration.close();
-- stubRendererlistenerRegistration.close();
-+ this.rpcRegistration.close();
- }
- }
Code Review / transportpce.git / blobdiff