From 90db3fb091866ed5e21485999bac55f81623dbe6 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 6 Apr 2023 12:02:55 +0200 Subject: [PATCH] Refactor SH CatalogValidation JIRA: TRNSPRTPCE-714 Signed-off-by: guillaume.lambert Change-Id: Ie33cf0a24959580a3b62cac66534d27ab02c784b --- .../servicehandler/validation/CatalogValidation.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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()); } -- 2.36.6