From: Balagangadhar Bathula <bb4341@att.com>
Date: Wed, 7 Oct 2020 14:37:15 +0000 (-0400)
Subject: fix a bug in ServiceHandler ModelMappingUtil
X-Git-Tag: 2.1.0~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=c7d130de394d6237cefaca3af2d7a9416325d08b

fix a bug in ServiceHandler ModelMappingUtil

OTU, ODU and CLLI are wrongly assigned twice.

JIRA: TRNSPRTPCE-339
Change-Id: I3277d7d97bf43be2ddfd501d64d827107e84ce28
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 6b2681f7128d84c1f602f6a3cdd0142e2bbec858)
---

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 124eed52a..e21deef1b 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java
@@ -87,10 +87,6 @@ public final class ModelMappingUtils {
             .setOtuServiceRate(input.getServiceAEnd().getOtuServiceRate())
             .setOduServiceRate(input.getServiceAEnd().getOduServiceRate())
             .setClli(input.getServiceAEnd().getClli())
-            // set otu and odu
-            .setOtuServiceRate(input.getServiceAEnd().getOtuServiceRate())
-            .setOduServiceRate(input.getServiceZEnd().getOduServiceRate())
-            .setClli(input.getServiceAEnd().getClli())
             .setNodeId(new NodeIdType(input.getServiceAEnd().getNodeId().getValue()).getValue())
             .setTxDirection(new org.opendaylight.yang.gen.v1.http.org
                 .transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder()
@@ -106,10 +102,6 @@ public final class ModelMappingUtils {
             .setOtuServiceRate(input.getServiceZEnd().getOtuServiceRate())
             .setOduServiceRate(input.getServiceZEnd().getOduServiceRate())
             .setClli(input.getServiceZEnd().getClli())
-            // set otu and odu
-            .setOtuServiceRate(input.getServiceAEnd().getOtuServiceRate())
-            .setOduServiceRate(input.getServiceZEnd().getOduServiceRate())
-            .setClli(input.getServiceZEnd().getClli())
             .setNodeId(new NodeIdType(input.getServiceZEnd().getNodeId().getValue()).getValue())
             .setTxDirection(new org.opendaylight.yang.gen.v1.http.org
                 .transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder()