Bump to Neon SR1 dependencies

[transportpce.git] / tests / SH_stubs.diff

diff --git a/tests/SH_stubs.diff b/tests/SH_stubs.diff
index 4a19db109840b90434c1f3f0d7fcecd043c9cbb3..9d423a20cf94f7a5223c2d5b3e53fd6f99c1e2fc 100644 (file)
--- a/tests/SH_stubs.diff
+++ b/tests/SH_stubs.diff
@@ -1,64 +1,22 @@
-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 44ef53a..810f093 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
-@@ -25,6 +25,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;
+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 1c8ddfe..b83b8cc 100644
+--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
++++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
+@@ -18,6 +18,7 @@ import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService;
+ import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
+ import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
+ import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
 +import org.opendaylight.transportpce.servicehandler.stub.StubRendererServiceOperations;
- import org.opendaylight.transportpce.servicehandler.validation.ServiceCreateValidation;
- import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult;
- import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerCompliancyCheck;
-@@ -87,6 +88,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
-     private DataBroker db;
-     private ServiceDataStoreOperations serviceDataStoreOperations;
-     private RendererServiceOperations rendererServiceOperations;
-+    private StubRendererServiceOperations stubRendererServiceOperations;
-     private PCEServiceWrapper pceServiceWrapper;
- 
-     //TODO: remove private request fields as they are in global scope
-@@ -95,6 +97,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
-                               RendererServiceOperations rendererServiceOperations) {
-         this.db = databroker;
-         this.rendererServiceOperations = rendererServiceOperations;
-+        this.stubRendererServiceOperations = new StubRendererServiceOperations();
-         this.serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(this.db);
-         this.serviceDataStoreOperations.initialize();
-         this.pceServiceWrapper = new PCEServiceWrapper(pathComputationService);
-@@ -145,7 +148,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
- 
-         ServiceImplementationRequestInput serviceImplementationRequest =
-                 ModelMappingUtils.createServiceImplementationRequest(new ServiceInput(input), pceResponse);
--        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
-+        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubRendererServiceOperations
-             .serviceImplementation(serviceImplementationRequest);
-         if (ResponseCodes.RESPONSE_OK
-                 .equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {
-@@ -221,7 +224,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
-             .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(
-                     new ServiceInput(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())) {
-@@ -406,7 +409,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
-             .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(
-                     new ServiceInput(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())) {
-@@ -476,7 +479,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService {
- 
-         ServiceImplementationRequestInput serviceImplementationRequest =
-                 ModelMappingUtils.createServiceImplementationRequest(new ServiceInput(input), pceResponse);
--        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.rendererServiceOperations
-+        ServiceImplementationRequestOutput serviceImplementationRequestOutput = this.stubRendererServiceOperations
-             .serviceImplementation(serviceImplementationRequest);
-         if (ResponseCodes.RESPONSE_OK
-                 .equals(serviceImplementationRequestOutput.getConfigurationResponseCommon().getResponseCode())) {
+ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.TransportpcePceListener;
+ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.TransportpceRendererListener;
+ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.OrgOpenroadmServiceService;
+@@ -55,7 +56,8 @@ public class ServicehandlerProvider {
+         this.rpcRegistry = rpcProviderRegistry;
+         this.notificationService = notificationService;
+         this.pathComputationService = pathComputationService;
+-        this.rendererServiceOperations = rendererServiceOperations;
++        this.rendererServiceOperations = new StubRendererServiceOperations(networkModelWavelengthService, dataBroker,
++                notificationPublishService);
+         this.networkModelWavelengthService = networkModelWavelengthService;
+         this.notificationPublishService = notificationPublishService;
+     }