Bug correction in ServiceDatastore Operations

* modify mappingServices from ModelMappingUtils to not add container
topology in service datastore because RPC serviceImplementation not
returned this information. Otherwise Renderer module add this Topology
information in datastore.
* remove some bug in renderer ModelMappingUtils

Change-Id: I0280aabd5c9943030a27ec4cd27698413efc3d0d
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
index 24ec071747370ede785cbfda49bf4c6bc9899f9f..4b5a7b03fedda510ae7f1cec9a617943c0aa48f5 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
@@ -121,7 +121,7 @@ public final class ModelMappingUtils {
         while (iterator.hasNext()) {
             ZToA pathDesObj = iterator.next();
             resourceType = pathDesObj.getResource().getResource().getImplementedInterface().getSimpleName();
-            LOG.info("Inside AtoZ {}", resourceType);
+            LOG.info("Inside ZtoA {}", resourceType);
 
             try {
                 if (TERMINATION_POINT.equals(resourceType)) {

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 1f3ff47f7bf11c04666f8e99d7ff9ee422789fde..08890a70347a0f6f68f9986aec5f060fd6f02be0 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
@@ -8,8 +8,7 @@
 package org.opendaylight.transportpce.servicehandler;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import java.util.ArrayList;
-import java.util.List;
+
 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 +17,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.openroadm.common.service.types.rev161014.response.parameters.ResponseParametersBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.Topology;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.TopologyBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.LifecycleState;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RpcStatus;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.State;
@@ -35,12 +32,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.Service
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRerouteOutputBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.Services;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.AToZ;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.AToZBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.AToZKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.ZToA;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.ZToABuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.ZToAKey;
 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;
@@ -58,80 +49,80 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 
 public final class ModelMappingUtils {
-
     private ModelMappingUtils() {
     }
 
     public static ServiceImplementationRequestInput createServiceImplementationRequest(ServiceCreateInput input,
-         PathComputationRequestOutput pceResponse) {
-
+            PathComputationRequestOutput pceResponse) {
         ServiceImplementationRequestInputBuilder serviceImplementationRequestInputBuilder =
-            new ServiceImplementationRequestInputBuilder();
+                new ServiceImplementationRequestInputBuilder();
         serviceImplementationRequestInputBuilder.setServiceName(input.getServiceName());
-        org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath
-            .rev170426.service.implementation.request.input.ServiceAEndBuilder serviceAEnd =
-                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath
-                    .rev170426.service.implementation.request.input.ServiceAEndBuilder();
+        org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.implementation
+            .request.input.ServiceAEndBuilder serviceAEnd =
+                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service
+                .implementation.request.input.ServiceAEndBuilder();
         serviceAEnd.setServiceFormat(input.getServiceAEnd().getServiceFormat())
-            .setServiceRate(input.getServiceAEnd().getServiceRate()).setClli(input.getServiceAEnd().getClli())
-            .setNodeId(input.getServiceAEnd().getNodeId())
-            .setTxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-            .rev170426.service.endpoint.sp.TxDirectionBuilder()
-            .setPort(input.getServiceAEnd().getTxDirection().getPort()).build())
-            .setRxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-            .rev170426.service.endpoint.sp.RxDirectionBuilder()
-            .setPort(input.getServiceAEnd().getRxDirection().getPort()).build());
-        org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath
-            .rev170426.service.implementation.request.input.ServiceZEndBuilder serviceZEnd =
-                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath
-                    .rev170426.service.implementation.request.input.ServiceZEndBuilder();
+                .setServiceRate(input.getServiceAEnd().getServiceRate()).setClli(input.getServiceAEnd().getClli())
+                .setNodeId(input.getServiceAEnd().getNodeId())
+                .setTxDirection(
+                        new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426
+                        .service.endpoint.sp.TxDirectionBuilder()
+                                .setPort(input.getServiceAEnd().getTxDirection().getPort()).build())
+                .setRxDirection(
+                        new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426
+                        .service.endpoint.sp.RxDirectionBuilder()
+                                .setPort(input.getServiceAEnd().getRxDirection().getPort()).build());
+        org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.implementation
+            .request.input.ServiceZEndBuilder serviceZEnd =
+                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service
+                .implementation.request.input.ServiceZEndBuilder();
         serviceZEnd.setServiceFormat(input.getServiceZEnd().getServiceFormat())
-            .setServiceRate(input.getServiceZEnd().getServiceRate()).setClli(input.getServiceZEnd().getClli())
-            .setNodeId(input.getServiceZEnd().getNodeId())
-            .setTxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-            .rev170426.service.endpoint.sp.TxDirectionBuilder()
-            .setPort(input.getServiceZEnd().getTxDirection().getPort()).build())
-            .setRxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-            .rev170426.service.endpoint.sp.RxDirectionBuilder()
-            .setPort(input.getServiceZEnd().getRxDirection().getPort()).build());
+                .setServiceRate(input.getServiceZEnd().getServiceRate()).setClli(input.getServiceZEnd().getClli())
+                .setNodeId(input.getServiceZEnd().getNodeId())
+                .setTxDirection(
+                        new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426
+                        .service.endpoint.sp.TxDirectionBuilder()
+                                .setPort(input.getServiceZEnd().getTxDirection().getPort()).build())
+                .setRxDirection(
+                        new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426
+                        .service.endpoint.sp.RxDirectionBuilder()
+                                .setPort(input.getServiceZEnd().getRxDirection().getPort()).build());
         serviceImplementationRequestInputBuilder.setServiceAEnd(serviceAEnd.build());
         serviceImplementationRequestInputBuilder.setServiceZEnd(serviceZEnd.build());
         serviceImplementationRequestInputBuilder.setServiceHandlerHeader(
-            new ServiceHandlerHeaderBuilder().setRequestId(input.getSdncRequestHeader().getRequestId()).build());
-        org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath
-            .rev170426.service.implementation.request.input.PathDescriptionBuilder pathDescBuilder =
-                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath
-                    .rev170426.service.implementation.request.input
-                    .PathDescriptionBuilder();
-        pathDescBuilder.setAToZDirection(pceResponse.getResponseParameters()
-                .getPathDescription().getAToZDirection());
-        pathDescBuilder.setZToADirection(pceResponse.getResponseParameters()
-                .getPathDescription().getZToADirection());
+                new ServiceHandlerHeaderBuilder().setRequestId(input.getSdncRequestHeader().getRequestId()).build());
+        org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.implementation
+            .request.input.PathDescriptionBuilder pathDescBuilder = new org.opendaylight.yang.gen.v1.http.org
+            .transportpce.b.c._interface.servicepath.rev170426.service.implementation.request.input
+            .PathDescriptionBuilder();
+        pathDescBuilder.setAToZDirection(pceResponse.getResponseParameters().getPathDescription().getAToZDirection());
+        pathDescBuilder.setZToADirection(pceResponse.getResponseParameters().getPathDescription().getZToADirection());
         serviceImplementationRequestInputBuilder.setPathDescription(pathDescBuilder.build());
         return serviceImplementationRequestInputBuilder.build();
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426
-            .ServiceDeleteInput createServiceDeleteInput(ServiceDeleteInput serviceDeleteInput) {
+    public static
+            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteInput
+            createServiceDeleteInput(ServiceDeleteInput serviceDeleteInput) {
         ServiceDeleteInputBuilder builder = new ServiceDeleteInputBuilder();
         builder.setServiceName(serviceDeleteInput.getServiceDeleteReqInfo().getServiceName());
-        builder.setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId(
-            serviceDeleteInput.getSdncRequestHeader().getRequestId()).build());
+        builder.setServiceHandlerHeader(new ServiceHandlerHeaderBuilder()
+                .setRequestId(serviceDeleteInput.getSdncRequestHeader().getRequestId()).build());
         return builder.build();
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426
-        .ServiceDeleteInput createServiceDeleteInput(ServiceRerouteInput serviceRerouteInput, Services service) {
+    public static
+            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteInput
+            createServiceDeleteInput(ServiceRerouteInput serviceRerouteInput, Services service) {
         ServiceDeleteInputBuilder builder = new ServiceDeleteInputBuilder();
         builder.setServiceName(serviceRerouteInput.getServiceName());
-        builder.setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId(
-                service.getSdncRequestHeader().getRequestId()).build());
+        builder.setServiceHandlerHeader(
+                new ServiceHandlerHeaderBuilder().setRequestId(service.getSdncRequestHeader().getRequestId()).build());
         return builder.build();
     }
 
-    public static ServiceAEnd createServiceAEnd(
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.create.input
-            .ServiceAEnd serviceAEnd) {
+    public static ServiceAEnd createServiceAEnd(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014
+            .service.create.input.ServiceAEnd serviceAEnd) {
         ServiceAEndBuilder serviceAEndBuilder = new ServiceAEndBuilder();
         serviceAEndBuilder.setClli(serviceAEnd.getClli());
         serviceAEndBuilder.setNodeId(serviceAEnd.getNodeId());
@@ -142,9 +133,8 @@ public final class ModelMappingUtils {
         return serviceAEndBuilder.build();
     }
 
-    public static ServiceZEnd createServiceZEnd(
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.create.input.ServiceZEnd
-            serviceZEnd) {
+    public static ServiceZEnd createServiceZEnd(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014
+            .service.create.input.ServiceZEnd serviceZEnd) {
         ServiceZEndBuilder serviceZEndBuilder = new ServiceZEndBuilder();
         serviceZEndBuilder.setClli(serviceZEnd.getClli());
         serviceZEndBuilder.setNodeId(serviceZEnd.getNodeId());
@@ -155,24 +145,22 @@ public final class ModelMappingUtils {
         return serviceZEndBuilder.build();
     }
 
-    public static RxDirection createRxDirection(
-        org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.endpoint.RxDirection
-            rxDirection) {
+    public static RxDirection createRxDirection(org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types
+            .rev161014.service.endpoint.RxDirection rxDirection) {
         RxDirectionBuilder rxDirectionBuilder = new RxDirectionBuilder();
         rxDirectionBuilder.setPort(rxDirection.getPort());
         return rxDirectionBuilder.build();
     }
 
-    public static TxDirection createTxDirection(
-        org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.endpoint.TxDirection
-            txDirection) {
+    public static TxDirection createTxDirection(org.opendaylight.yang.gen.v1.http.org.openroadm.common.service
+            .types.rev161014.service.endpoint.TxDirection txDirection) {
         TxDirectionBuilder txDirectionBuilder = new TxDirectionBuilder();
         txDirectionBuilder.setPort(txDirection.getPort());
         return txDirectionBuilder.build();
     }
 
     public static ListenableFuture<RpcResult<ServiceDeleteOutput>> createDeleteServiceReply(ServiceDeleteInput input,
-        String finalAck, String message, String responseCode) {
+            String finalAck, String message, String responseCode) {
         ConfigurationResponseCommonBuilder builder = new ConfigurationResponseCommonBuilder()
                 .setAckFinalIndicator(finalAck).setResponseMessage(message).setResponseCode(responseCode);
         if (input.getSdncRequestHeader() != null) {
@@ -181,123 +169,79 @@ public final class ModelMappingUtils {
             builder.setRequestId(null);
         }
         ConfigurationResponseCommon configurationResponseCommon = builder.build();
-        ServiceDeleteOutput output = new ServiceDeleteOutputBuilder()
-                .setConfigurationResponseCommon(configurationResponseCommon).build();
+        ServiceDeleteOutput output =
+                new ServiceDeleteOutputBuilder().setConfigurationResponseCommon(configurationResponseCommon).build();
         return RpcResultBuilder.success(output).buildFuture();
     }
 
-
     public static ListenableFuture<RpcResult<ServiceRerouteOutput>> createRerouteServiceReply(ServiceRerouteInput input,
             String finalAck, String message, RpcStatus rpcStatus) {
-        ServiceRerouteOutputBuilder output = new ServiceRerouteOutputBuilder()
-                .setHardConstraints(null)
-                .setSoftConstraints(null)
-                .setStatusMessage(message)
-                .setStatus(rpcStatus);
+        ServiceRerouteOutputBuilder output = new ServiceRerouteOutputBuilder().setHardConstraints(null)
+                .setSoftConstraints(null).setStatusMessage(message).setStatus(rpcStatus);
         return RpcResultBuilder.success(output.build()).buildFuture();
     }
 
     public static ListenableFuture<RpcResult<ServiceCreateOutput>> createCreateServiceReply(ServiceCreateInput input,
-                                                               String finalAck,
-                                                               String message, String responseCode) {
+            String finalAck, String message, String responseCode) {
         ResponseParametersBuilder responseParameters = new ResponseParametersBuilder();
-        ConfigurationResponseCommonBuilder configurationResponseCommon
-                = new ConfigurationResponseCommonBuilder().setAckFinalIndicator(finalAck)
-                .setResponseMessage(message)
-                .setResponseCode(responseCode);
+        ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder()
+                .setAckFinalIndicator(finalAck).setResponseMessage(message).setResponseCode(responseCode);
         if (input.getSdncRequestHeader() != null) {
             configurationResponseCommon.setRequestId(input.getSdncRequestHeader().getRequestId());
         } else {
             configurationResponseCommon.setRequestId(null);
         }
-        ServiceCreateOutputBuilder output = new ServiceCreateOutputBuilder()
-                .setConfigurationResponseCommon(configurationResponseCommon.build())
-                .setResponseParameters(responseParameters.build());
+        ServiceCreateOutputBuilder output =
+                new ServiceCreateOutputBuilder().setConfigurationResponseCommon(configurationResponseCommon.build())
+                        .setResponseParameters(responseParameters.build());
         return RpcResultBuilder.success(output.build()).buildFuture();
     }
 
     /*
      * Map Input (ServiceCreateInmput, ServiceReconfigureInput) & output
      * (PathComputationRequestOutput) to Service.
-     * @param serviceCreateInput
-     *            ServiceCreateInput parameter
-     * @param serviceReconfigureInput
-     *            serviceReconfigureInput parameter
-     * @param output
-     *            PathComputationRequestOutput parameter
+     *
+     * @param serviceCreateInput ServiceCreateInput parameter
+     *
+     * @param serviceReconfigureInput serviceReconfigureInput parameter
+     *
+     * @param output PathComputationRequestOutput parameter
+     *
      * @return Services Service data
      */
     public static Services mappingServices(ServiceCreateInput serviceCreateInput,
-        ServiceReconfigureInput serviceReconfigureInput, PathComputationRequestOutput output) {
+            ServiceReconfigureInput serviceReconfigureInput) {
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.ServiceAEnd aend = null;
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.ServiceZEnd zend = null;
         ServicesBuilder service = new ServicesBuilder();
         if (serviceCreateInput != null) {
             aend = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service
-                .ServiceAEndBuilder(serviceCreateInput.getServiceAEnd()).build();
+                    .ServiceAEndBuilder(serviceCreateInput.getServiceAEnd()).build();
             zend = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service
-                .ServiceZEndBuilder(serviceCreateInput.getServiceZEnd()).build();
+                    .ServiceZEndBuilder(serviceCreateInput.getServiceZEnd()).build();
             service.setServiceName(serviceCreateInput.getServiceName()).setAdministrativeState(State.OutOfService)
-                .setOperationalState(State.OutOfService).setCommonId(serviceCreateInput.getCommonId())
-                .setConnectionType(serviceCreateInput.getConnectionType())
-                .setCustomer(serviceCreateInput.getCustomer())
-                .setCustomerContact(serviceCreateInput.getCustomerContact())
-                .setHardConstraints(serviceCreateInput.getHardConstraints())
-                .setSoftConstraints(serviceCreateInput.getSoftConstraints())
-                .setSdncRequestHeader(serviceCreateInput.getSdncRequestHeader())
-                .setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend);
-
+                    .setOperationalState(State.OutOfService).setCommonId(serviceCreateInput.getCommonId())
+                    .setConnectionType(serviceCreateInput.getConnectionType())
+                    .setCustomer(serviceCreateInput.getCustomer())
+                    .setCustomerContact(serviceCreateInput.getCustomerContact())
+                    .setHardConstraints(serviceCreateInput.getHardConstraints())
+                    .setSoftConstraints(serviceCreateInput.getSoftConstraints())
+                    .setSdncRequestHeader(serviceCreateInput.getSdncRequestHeader())
+                    .setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend);
         } else if (serviceReconfigureInput != null) {
-            aend = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service
-                .ServiceAEndBuilder(serviceReconfigureInput.getServiceAEnd()).build();
+            aend = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014
+                    .service.ServiceAEndBuilder(serviceReconfigureInput.getServiceAEnd()).build();
             zend = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service
-                .ServiceZEndBuilder(serviceReconfigureInput.getServiceZEnd()).build();
+                    .ServiceZEndBuilder(serviceReconfigureInput.getServiceZEnd()).build();
             service.setServiceName(serviceReconfigureInput.getNewServiceName())
-                .setAdministrativeState(State.OutOfService).setOperationalState(State.OutOfService)
-                .setCommonId(serviceReconfigureInput.getCommonId())
-                .setConnectionType(serviceReconfigureInput.getConnectionType())
-                .setCustomer(serviceReconfigureInput.getCustomer())
-                .setCustomerContact(serviceReconfigureInput.getCustomerContact())
-                .setHardConstraints(serviceReconfigureInput.getHardConstraints())
-                .setSoftConstraints(serviceReconfigureInput.getSoftConstraints())
-                .setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend);
-        }
-        if (output != null) {
-            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.response
-                    .parameters.sp.ResponseParameters responseParameters = output.getResponseParameters();
-            if (responseParameters != null) {
-                // service.setPceMetric(responseParameters.getPceMetric());
-                org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426
-                    .response.parameters.sp.response.parameters.PathDescription pathDescription =
-                    responseParameters.getPathDescription();
-                if (pathDescription != null) {
-                    List<AToZ> atozList = new ArrayList<>();
-                    List<ZToA> ztoaList = new ArrayList<>();
-
-                    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.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.key().getId());
-                        ZToA ztoa = new ZToABuilder().setId(tmp.getId()).withKey(key)
-                                // .setResource(tmp.getResource())
-                                .build();
-                        ztoaList.add(ztoa);
-                    }
-
-                    Topology topology = new TopologyBuilder().setAToZ(atozList).setZToA(ztoaList).build();
-                    service.setTopology(topology);
-                }
-            }
+                    .setAdministrativeState(State.OutOfService).setOperationalState(State.OutOfService)
+                    .setCommonId(serviceReconfigureInput.getCommonId())
+                    .setConnectionType(serviceReconfigureInput.getConnectionType())
+                    .setCustomer(serviceReconfigureInput.getCustomer())
+                    .setCustomerContact(serviceReconfigureInput.getCustomerContact())
+                    .setHardConstraints(serviceReconfigureInput.getHardConstraints())
+                    .setSoftConstraints(serviceReconfigureInput.getSoftConstraints())
+                    .setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend);
         }
         return service.build();
     }
@@ -305,71 +249,74 @@ public final class ModelMappingUtils {
     /*
      * Map Input (ServiceCreateInmput, ServiceReconfigureInput) & output
      * (PathComputationRequestOutput) to ServicePath.
-     * @param serviceCreateInput
-     *            ServiceCreateInput parameter
-     * @param serviceReconfigureInput
-     *            serviceReconfigureInput parameter
-     * @param output
-     *            PathComputationRequestOutput parameter
+     *
+     * @param serviceCreateInput ServiceCreateInput parameter
+     *
+     * @param serviceReconfigureInput serviceReconfigureInput parameter
+     *
+     * @param output PathComputationRequestOutput parameter
+     *
      * @return ServicesPaths Service Path data
      */
     public static ServicePaths mappingServicePaths(ServiceCreateInput serviceCreateInput,
-        ServiceReconfigureInput serviceReconfigureInput, PathComputationRequestOutput output) {
+            ServiceReconfigureInput serviceReconfigureInput, PathComputationRequestOutput output) {
         ServicePathsBuilder servicePathBuilder = new ServicePathsBuilder();
         if (serviceCreateInput != null) {
-            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface
-                .service.types.rev170426.service.path.ServiceAEndBuilder serviceAEnd =
-                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface
-                    .service.types.rev170426.service.path.ServiceAEndBuilder();
+            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.path
+                .ServiceAEndBuilder serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface
+                .service.types.rev170426.service.path.ServiceAEndBuilder();
             serviceAEnd.setServiceFormat(serviceCreateInput.getServiceAEnd().getServiceFormat())
-                .setServiceRate(serviceCreateInput.getServiceAEnd().getServiceRate())
-                .setClli(serviceCreateInput.getServiceAEnd().getClli())
-                .setNodeId(serviceCreateInput.getServiceAEnd().getNodeId())
-                .setTxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-                .rev170426.service.endpoint.sp.TxDirectionBuilder()
-                .setPort(serviceCreateInput.getServiceAEnd().getTxDirection().getPort()).build())
-                .setRxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-                .rev170426.service.endpoint.sp.RxDirectionBuilder()
-                .setPort(serviceCreateInput.getServiceAEnd().getRxDirection().getPort()).build());
-            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface
-                .service.types.rev170426.service.path.ServiceZEndBuilder serviceZEnd =
-                new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface
-                    .service.types.rev170426.service.path.ServiceZEndBuilder();
+                    .setServiceRate(serviceCreateInput.getServiceAEnd().getServiceRate())
+                    .setClli(serviceCreateInput.getServiceAEnd().getClli())
+                    .setNodeId(serviceCreateInput.getServiceAEnd().getNodeId())
+                    .setTxDirection(
+                            new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
+                            .rev170426.service.endpoint.sp.TxDirectionBuilder()
+                                    .setPort(serviceCreateInput.getServiceAEnd().getTxDirection().getPort()).build())
+                    .setRxDirection(
+                            new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
+                            .rev170426.service.endpoint.sp.RxDirectionBuilder()
+                                    .setPort(serviceCreateInput.getServiceAEnd().getRxDirection().getPort()).build());
+            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.path
+                .ServiceZEndBuilder serviceZEnd =
+                    new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426
+                        .service.path.ServiceZEndBuilder();
             serviceZEnd.setServiceFormat(serviceCreateInput.getServiceZEnd().getServiceFormat())
-                .setServiceRate(serviceCreateInput.getServiceZEnd().getServiceRate())
-                .setClli(serviceCreateInput.getServiceZEnd().getClli())
-                .setNodeId(serviceCreateInput.getServiceZEnd().getNodeId())
-                .setTxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-                .rev170426.service.endpoint.sp.TxDirectionBuilder()
-                .setPort(serviceCreateInput.getServiceZEnd().getTxDirection().getPort()).build())
-                .setRxDirection(new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-                .rev170426.service.endpoint.sp.RxDirectionBuilder()
-                .setPort(serviceCreateInput.getServiceZEnd().getRxDirection().getPort()).build());
-
+                    .setServiceRate(serviceCreateInput.getServiceZEnd().getServiceRate())
+                    .setClli(serviceCreateInput.getServiceZEnd().getClli())
+                    .setNodeId(serviceCreateInput.getServiceZEnd().getNodeId())
+                    .setTxDirection(
+                            new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
+                                .rev170426.service.endpoint.sp.TxDirectionBuilder()
+                                    .setPort(serviceCreateInput.getServiceZEnd().getTxDirection().getPort()).build())
+                    .setRxDirection(
+                            new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
+                                .rev170426.service.endpoint.sp.RxDirectionBuilder()
+                                    .setPort(serviceCreateInput.getServiceZEnd().getRxDirection().getPort()).build());
             servicePathBuilder.setServiceAEnd(serviceAEnd.build());
             servicePathBuilder.setServiceZEnd(serviceZEnd.build());
             MappingConstraints mapConstraints = new MappingConstraints(serviceCreateInput.getHardConstraints(),
-                serviceCreateInput.getSoftConstraints());
+                    serviceCreateInput.getSoftConstraints());
             mapConstraints.serviceToServicePathConstarints();
             if (mapConstraints.getServicePathHardConstraints() != null) {
                 HardConstraintsBuilder hardConstraintBuilder = new HardConstraintsBuilder();
                 hardConstraintBuilder.setCustomerCode(serviceCreateInput.getHardConstraints().getCustomerCode());
-                hardConstraintBuilder.setCoRoutingOrGeneral(mapConstraints.getServicePathHardConstraints()
-                    .getCoRoutingOrGeneral());
+                hardConstraintBuilder
+                        .setCoRoutingOrGeneral(mapConstraints.getServicePathHardConstraints().getCoRoutingOrGeneral());
                 servicePathBuilder.setHardConstraints(hardConstraintBuilder.build());
             }
             if (mapConstraints.getServicePathSoftConstraints() != null) {
                 SoftConstraintsBuilder softConstraintBuilder = new SoftConstraintsBuilder();
                 softConstraintBuilder.setCustomerCode(mapConstraints.getServicePathSoftConstraints().getCustomerCode());
-                softConstraintBuilder.setCoRoutingOrGeneral(mapConstraints.getServicePathSoftConstraints()
-                     .getCoRoutingOrGeneral());
+                softConstraintBuilder
+                        .setCoRoutingOrGeneral(mapConstraints.getServicePathSoftConstraints().getCoRoutingOrGeneral());
                 servicePathBuilder.setSoftConstraints(softConstraintBuilder.build());
             }
             servicePathBuilder.setServicePathName(serviceCreateInput.getServiceName());
             servicePathBuilder.setServiceHandlerHeader(new ServiceHandlerHeaderBuilder()
-                .setRequestId(serviceCreateInput.getSdncRequestHeader().getRequestId()).build());
-            PathDescriptionBuilder pathDescBuilder = new PathDescriptionBuilder(output.getResponseParameters()
-                .getPathDescription());
+                    .setRequestId(serviceCreateInput.getSdncRequestHeader().getRequestId()).build());
+            PathDescriptionBuilder pathDescBuilder =
+                    new PathDescriptionBuilder(output.getResponseParameters().getPathDescription());
             servicePathBuilder.setPathDescription(pathDescBuilder.build());
         }
         return servicePathBuilder.build();

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
index bee6ff37615ad43f590c9e304f0b488debc12090..d2e2c2d025021b7ea0a146a92c77ebe2dd23b39d 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
@@ -129,7 +129,7 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
             InstanceIdentifier<Services> iid = InstanceIdentifier
                     .create(ServiceList.class).child(Services.class,
                             new ServicesKey(serviceCreateInput.getServiceName()));
-            Services service = ModelMappingUtils.mappingServices(serviceCreateInput, null, outputFromPce);
+            Services service = ModelMappingUtils.mappingServices(serviceCreateInput, null);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
             writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
             writeTx.submit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
@@ -240,7 +240,7 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
                 InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class).child(Services.class,
                         new ServicesKey(serviceName));
 
-                Services service = ModelMappingUtils.mappingServices(input, null, output);
+                Services service = ModelMappingUtils.mappingServices(input, null);
                 writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
                 try {
                     writeTx.submit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java
index 8aedcda44d6675c882ef05d531ee9c7e7e47fd13..62aecaa3338d471d9d44dbe15caa7049036cb1ac 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java
@@ -82,23 +82,20 @@ public class ModelMappingUtilsTest extends AbstractTest {
 
     @Test
     public void mappingServicesNullServiceCreateInput() {
-        Services services = ModelMappingUtils.mappingServices(null, null,
-            this.pathComputationRequestOutput);
+        Services services = ModelMappingUtils.mappingServices(null, null);
         Assert.assertEquals(new ServicesBuilder().build(), services);
     }
 
     @Test
     public void mappingServiceNotNullServiceReconfigureInput() {
-        Services services = ModelMappingUtils.mappingServices(null, serviceReconfigureInput,
-            this.pathComputationRequestOutput);
+        Services services = ModelMappingUtils.mappingServices(null, serviceReconfigureInput);
         Assert.assertEquals("service 1", services.getServiceName());
     }
 
     @Test
     public void mappingServiceValid() {
         Services services = ModelMappingUtils.mappingServices(ServiceDataUtils.buildServiceCreateInput(),
-            serviceReconfigureInput,
-            this.pathComputationRequestOutput);
+            serviceReconfigureInput);
         Assert.assertEquals("service 1", services.getServiceName());
     }
 

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java
index 2f81fc1f04eeb2940c6ec72d45671aa0eaa9f2d4..3e277512f73e7e8e0ba7b36aaa5eb2f635879c0d 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java
@@ -1002,7 +1002,7 @@ public class ServiceHandlerImplTest extends AbstractTest {
         ServiceCreateInput serviceInput = ServiceDataUtils.buildServiceCreateInput();
 
         /** Mock RPC service-delete. */
-        Services serviceMock = ModelMappingUtils.mappingServices(serviceInput, null, null);
+        Services serviceMock = ModelMappingUtils.mappingServices(serviceInput, null);
         Optional<Services> service = Optional.of(serviceMock);
         Mockito.when(this.serviceDataStoreOperationsMock.getService(any(String.class))).thenReturn(service);
         org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426