Update stubRenderer

[transportpce.git] / tests / SH_stubs.diff

diff --git a/tests/SH_stubs.diff b/tests/SH_stubs.diff
index bb26d8af2967ebed315ac92c78b70aea7c229b84..ca863a3c22e0e181521544c1e19595d86e247c0c 100644 (file)
--- a/tests/SH_stubs.diff
+++ b/tests/SH_stubs.diff
@@ -1,8 +1,8 @@
 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 ccd0f14..8219393 100644
+index 3a07abb..f79862d 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
-@@ -22,6 +22,7 @@ import org.opendaylight.transportpce.servicehandler.ModelMappingUtils;
+@@ -26,6 +26,7 @@ import org.opendaylight.transportpce.servicehandler.ServiceInput;
  import org.opendaylight.transportpce.servicehandler.service.PCEServiceWrapper;
  import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
  import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl;
@@ -10,62 +10,21 @@ index ccd0f14..8219393 100644
  import org.opendaylight.transportpce.servicehandler.validation.ServiceCreateValidation;
  import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult;
  import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerCompliancyCheck;
-@@ -84,6 +85,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
+@@ -87,7 +88,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
+ 
      private DataBroker db;
      private ServiceDataStoreOperations serviceDataStoreOperations;
-     private RendererServiceOperations rendererServiceOperations;
-+    private StubRendererServiceOperations stubRendererServiceOperations;
+-    private RendererServiceOperations rendererServiceOperations;
++    private StubRendererServiceOperations rendererServiceOperations;
      private PCEServiceWrapper pceServiceWrapper;
  
      //TODO: remove private request fields as they are in global scope
-@@ -92,6 +94,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
-                               RendererServiceOperations rendererServiceOperations) {
+@@ -96,7 +97,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
+             RendererServiceOperations rendererServiceOperations,
+             NetworkModelWavelengthService networkModelWavelengthService) {
          this.db = databroker;
-         this.rendererServiceOperations = rendererServiceOperations;
-+        this.stubRendererServiceOperations = new StubRendererServiceOperations();
+-        this.rendererServiceOperations = rendererServiceOperations;
++        this.rendererServiceOperations = new StubRendererServiceOperations(networkModelWavelengthService, db);
          this.serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(this.db);
          this.serviceDataStoreOperations.initialize();
          this.pceServiceWrapper = new PCEServiceWrapper(pathComputationService);
-@@ -141,8 +144,8 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
- 
-         ServiceImplementationRequestInput serviceImplementationRequest =
-                 ModelMappingUtils.createServiceImplementationRequest(input, pceResponse);
--        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
--            .serviceImplementation(serviceImplementationRequest);
-+        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubRendererServiceOperations
-+                .serviceImplementation(serviceImplementationRequest);
-         if (ResponseCodes.RESPONSE_OK
-                 .equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {
-             String message = "Service rendered successfully !";
-@@ -216,8 +219,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
-         org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017
-             .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(input);
-         org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017
--            .ServiceDeleteOutput output = this.rendererServiceOperations.serviceDelete(serviceDeleteInput);
--
-+            .ServiceDeleteOutput output = this.stubRendererServiceOperations.serviceDelete(serviceDeleteInput);
-         if (!ResponseCodes.RESPONSE_OK
-                 .equals(output.getConfigurationResponseCommon().getResponseCode())) {
-             message = "Service delete failed!";
-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
-index 630fb67..2cc2bdf 100644
---- 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,6 +51,8 @@ public final class StubrendererImpl {
-             LOG.error("deleting service failed !", e);
-             responseCode = "500";
-         }
-+        responseCode = "200";
-+        message = "Service deleted";
-         ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder()
-                 .setAckFinalIndicator("yes")
-                 .setRequestId(input.getServiceHandlerHeader().getRequestId())
-@@ -75,6 +77,8 @@ public final class StubrendererImpl {
-             LOG.error(message);
-             responseCode = "500";
-         }
-+        responseCode = "200";
-+        message = "Service implemented";
-         ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder()
-                 .setAckFinalIndicator("yes")
-                 .setRequestId(input.getServiceHandlerHeader().getRequestId())