tests/SH_stubs.diff

   1 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
   2 index ccd0f14..8219393 100644
   3 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java
   4 +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java
   5 @@ -22,6 +22,7 @@ import org.opendaylight.transportpce.servicehandler.ModelMappingUtils;
   6  import org.opendaylight.transportpce.servicehandler.service.PCEServiceWrapper;
   7  import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
   8  import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl;
   9 +import org.opendaylight.transportpce.servicehandler.stub.StubRendererServiceOperations;
  10  import org.opendaylight.transportpce.servicehandler.validation.ServiceCreateValidation;
  11  import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult;
  12  import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerCompliancyCheck;
  13 @@ -84,6 +85,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  14      private DataBroker db;
  15      private ServiceDataStoreOperations serviceDataStoreOperations;
  16      private RendererServiceOperations rendererServiceOperations;
  17 +    private StubRendererServiceOperations stubRendererServiceOperations;
  18      private PCEServiceWrapper pceServiceWrapper;
  19
  20      //TODO: remove private request fields as they are in global scope
  21 @@ -92,6 +94,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  22                                RendererServiceOperations rendererServiceOperations) {
  23          this.db = databroker;
  24          this.rendererServiceOperations = rendererServiceOperations;
  25 +        this.stubRendererServiceOperations = new StubRendererServiceOperations();
  26          this.serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(this.db);
  27          this.serviceDataStoreOperations.initialize();
  28          this.pceServiceWrapper = new PCEServiceWrapper(pathComputationService);
  29 @@ -141,8 +144,8 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  30
  31          ServiceImplementationRequestInput serviceImplementationRequest =
  32                  ModelMappingUtils.createServiceImplementationRequest(input, pceResponse);
  33 -        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
  34 -            .serviceImplementation(serviceImplementationRequest);
  35 +        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubRendererServiceOperations
  36 +                .serviceImplementation(serviceImplementationRequest);
  37          if (ResponseCodes.RESPONSE_OK
  38                  .equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {
  39              String message = "Service rendered successfully !";
  40 @@ -216,8 +219,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  41          org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017
  42              .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(input);
  43          org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017
  44 -            .ServiceDeleteOutput output = this.rendererServiceOperations.serviceDelete(serviceDeleteInput);
  45 -
  46 +            .ServiceDeleteOutput output = this.stubRendererServiceOperations.serviceDelete(serviceDeleteInput);
  47          if (!ResponseCodes.RESPONSE_OK
  48                  .equals(output.getConfigurationResponseCommon().getResponseCode())) {
  49              message = "Service delete failed!";
  50 diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubrendererImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubrendererImpl.java
  51 index 630fb67..2cc2bdf 100644
  52 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubrendererImpl.java
  53 +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubrendererImpl.java
  54 @@ -51,6 +51,8 @@ public final class StubrendererImpl {
  55              LOG.error("deleting service failed !", e);
  56              responseCode = "500";
  57          }
  58 +        responseCode = "200";
  59 +        message = "Service deleted";
  60          ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder()
  61                  .setAckFinalIndicator("yes")
  62                  .setRequestId(input.getServiceHandlerHeader().getRequestId())
  63 @@ -75,6 +77,8 @@ public final class StubrendererImpl {
  64              LOG.error(message);
  65              responseCode = "500";
  66          }
  67 +        responseCode = "200";
  68 +        message = "Service implemented";
  69          ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder()
  70                  .setAckFinalIndicator("yes")
  71                  .setRequestId(input.getServiceHandlerHeader().getRequestId())