From: guillaume.lambert <guillaume.lambert@orange.com>
Date: Thu, 6 Apr 2023 10:02:55 +0000 (+0200)
Subject: Refactor SH CatalogValidation
X-Git-Tag: 8.0.0~58
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=90db3fb091866ed5e21485999bac55f81623dbe6;hp=661e0ebf7cf611815b9faeb830f0b4d85f15e50e

Refactor SH CatalogValidation

JIRA: TRNSPRTPCE-714
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie33cf0a24959580a3b62cac66534d27ab02c784b
---

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/CatalogValidation.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/CatalogValidation.java
index 96577ffed..06c8523b2 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/CatalogValidation.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/CatalogValidation.java
@@ -13,8 +13,6 @@ import org.opendaylight.transportpce.servicehandler.CatalogInput;
 import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult;
 import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerComplianceCheck;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.RpcActions;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.sdnc.request.header.SdncRequestHeader;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.OperationalModeInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,10 +28,8 @@ public final class CatalogValidation {
          * -OR request header and operational mode info compliance are verified.
          */
         LOG.debug("checking OR Catalog Compliance ...");
-        SdncRequestHeader sdncRequestHeader = input.getSdncRequestHeader();
-        OperationalModeInfo operationalModeInfo = input.getOperationalModeInfo();
         ComplianceCheckResult serviceHandlerCheckResult = ServicehandlerComplianceCheck.checkORCatalog(
-                sdncRequestHeader, operationalModeInfo, rpcActions, true);
+                input.getSdncRequestHeader(), input.getOperationalModeInfo(), rpcActions, true);
         if (!serviceHandlerCheckResult.hasPassed()) {
             return OperationResult.failed(serviceHandlerCheckResult.getMessage());
         }
@@ -46,12 +42,8 @@ public final class CatalogValidation {
          * -Specific request header and operational mode info compliance are verified.
          */
         LOG.debug("checking specific Catalog Compliance ...");
-        SdncRequestHeader sdncRequestHeader = input.getSdncRequestHeader();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210
-                .add.specific.operational.modes.to.catalog.input.OperationalModeInfo operationalModeInfoSpecific
-            = input.getOperationalModeInfoSpecific();
         ComplianceCheckResult serviceHandlerCheckResult = ServicehandlerComplianceCheck.checkSpecificCatalog(
-                sdncRequestHeader, operationalModeInfoSpecific, rpcActions, true);
+                input.getSdncRequestHeader(), input.getOperationalModeInfoSpecific(), rpcActions, true);
         if (!serviceHandlerCheckResult.hasPassed()) {
             return OperationResult.failed(serviceHandlerCheckResult.getMessage());
         }