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 44ef53a..810f093 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 @@ -25,6 +25,7 @@ import org.opendaylight.transportpce.servicehandler.ServiceInput;
   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 @@ -87,6 +88,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 @@ -95,6 +97,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 @@ -145,7 +148,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  30
  31          ServiceImplementationRequestInput serviceImplementationRequest =
  32                  ModelMappingUtils.createServiceImplementationRequest(new ServiceInput(input), pceResponse);
  33 -        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
  34 +        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubRendererServiceOperations
  35              .serviceImplementation(serviceImplementationRequest);
  36          if (ResponseCodes.RESPONSE_OK
  37                  .equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {
  38 @@ -221,7 +224,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  39              .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(
  40                      new ServiceInput(input));
  41          org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017
  42 -            .ServiceDeleteOutput output = this.rendererServiceOperations.serviceDelete(serviceDeleteInput);
  43 +            .ServiceDeleteOutput output = this.stubRendererServiceOperations.serviceDelete(serviceDeleteInput);
  44
  45          if (!ResponseCodes.RESPONSE_OK
  46                  .equals(output.getConfigurationResponseCommon().getResponseCode())) {
  47 @@ -406,7 +409,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  48              .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(
  49                      new ServiceInput(input));
  50          org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017
  51 -            .ServiceDeleteOutput output = this.rendererServiceOperations.serviceDelete(serviceDeleteInput);
  52 +            .ServiceDeleteOutput output = this.stubRendererServiceOperations.serviceDelete(serviceDeleteInput);
  53
  54          if (!ResponseCodes.RESPONSE_OK
  55                  .equals(output.getConfigurationResponseCommon().getResponseCode())) {
  56 @@ -476,7 +479,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
  57
  58          ServiceImplementationRequestInput serviceImplementationRequest =
  59                  ModelMappingUtils.createServiceImplementationRequest(new ServiceInput(input), pceResponse);
  60 -        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
  61 +        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubRendererServiceOperations
  62              .serviceImplementation(serviceImplementationRequest);
  63          if (ResponseCodes.RESPONSE_OK
  64                  .equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {