Adapt TransportPCE code to Chlorine

[transportpce.git] / servicehandler / src / main / java / org / opendaylight / transportpce / servicehandler / validation / checks / ServicehandlerServiceResiliencyCheck.java

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerServiceResiliencyCheck.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerServiceResiliencyCheck.java
index 2d5b173eca3a1eb4b8e945395c7d36e25ba3abf1..3ca5f7c63e2c0768e373a13dcc9bf762c3bc4be6 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerServiceResiliencyCheck.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerServiceResiliencyCheck.java
@@ -31,29 +31,25 @@ public final class ServicehandlerServiceResiliencyCheck {
      *         <code> false </code> otherwise
      */
     public static ComplianceCheckResult check(ServiceResiliency serviceResiliency) {
-        if (serviceResiliency.getResiliency() != null) {
-            switch (serviceResiliency.getResiliency().getSimpleName()) {
-                case "Unprotected":
-                    return checkUnprotectedResiliency(serviceResiliency);
-
-                case "UnprotectedDiverselyRouted":
-                    return checkUnprotectedDiverselyRoutedResiliency(serviceResiliency);
-
-                case "Protected":
-                    return checkProtectedResiliency(serviceResiliency);
-
-                case "Restorable":
-                case "ExternalTriggerRestorable":
-                    return checkRestorableAndExternalTriggerRestorableResiliency(serviceResiliency);
-
-                default:
-                    LOG.warn(LOG_RESILIENCY_TYPE_UNMANAGED);
-                    return new ComplianceCheckResult(false, LOG_RESILIENCY_TYPE_UNMANAGED);
-            }
-        } else {
+        if (serviceResiliency.getResiliency() == null) {
             LOG.warn(LOG_RESILIENCY_NULL);
             return new ComplianceCheckResult(false, LOG_RESILIENCY_NULL);
         }
+        String serviceResiliencyType = serviceResiliency.getResiliency().toString().split("\\{")[0];
+        switch (serviceResiliencyType) {
+            case "Unprotected":
+                return checkUnprotectedResiliency(serviceResiliency);
+            case "UnprotectedDiverselyRouted":
+                return checkUnprotectedDiverselyRoutedResiliency(serviceResiliency);
+            case "Protected":
+                return checkProtectedResiliency(serviceResiliency);
+            case "Restorable":
+            case "ExternalTriggerRestorable":
+                return checkRestorableAndExternalTriggerRestorableResiliency(serviceResiliency);
+            default:
+                LOG.warn(LOG_RESILIENCY_TYPE_UNMANAGED);
+                return new ComplianceCheckResult(false, LOG_RESILIENCY_TYPE_UNMANAGED);
+        }
     }
 
     private static ComplianceCheckResult checkUnprotectedResiliency(ServiceResiliency serviceResiliency) {