From af561a8c58022cd211fa5ff020b72307bdde1ac6 Mon Sep 17 00:00:00 2001
From: eleonorali <eleonoral@amdocs.com>
Date: Tue, 12 Jun 2018 13:08:38 +0300
Subject: Remove Toggle

Remove Toggle for SIROV and VLAN_TAGGING

Change-Id: Ia8b883c1f85de24f5c2000654a0926141cc269e8
Issue-ID: SDC-1418
Signed-off-by: eleonorali <eleonoral@amdocs.com>
---
 .../validators/heatresource/VirtualMachineInterfaceValidator.java     | 3 ---
 .../namingconvention/VirtualMachineInterfaceGuidelineValidator.java   | 4 ----
 2 files changed, 7 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src')

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/VirtualMachineInterfaceValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/VirtualMachineInterfaceValidator.java
index fc817c467d..016b911c81 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/VirtualMachineInterfaceValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/VirtualMachineInterfaceValidator.java
@@ -19,7 +19,6 @@ package org.openecomp.sdc.validation.impl.validators.heatresource;
 import org.openecomp.core.validation.ErrorMessageCode;
 import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
 import org.openecomp.core.validation.types.GlobalValidationContext;
-import org.openecomp.sdc.common.togglz.ToggleableFeature;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
 import org.openecomp.sdc.heat.datatypes.model.Resource;
 import org.openecomp.sdc.heat.services.HeatConstants;
@@ -40,7 +39,6 @@ public class VirtualMachineInterfaceValidator implements ResourceValidator {
   @Override
   public void validate(String fileName, Map.Entry<String, Resource> resourceEntry,
                        GlobalValidationContext globalContext, ValidationContext validationContext) {
-    if (ToggleableFeature.VLAN_TAGGING.isActive()) {
       HeatResourceValidationContext heatResourceValidationContext =
           (HeatResourceValidationContext) validationContext;
       final ValidityStatus status = calculateValidityStatus(resourceEntry.getValue());
@@ -77,7 +75,6 @@ public class VirtualMachineInterfaceValidator implements ResourceValidator {
           throw new IllegalArgumentException("Received a value for which no handling is " +
               "available " + status);
       }
-    }
   }
 
   private ValidityStatus calculateValidityStatus(Resource resource) {
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/VirtualMachineInterfaceGuidelineValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/VirtualMachineInterfaceGuidelineValidator.java
index 1b7a68a054..de4dc79207 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/VirtualMachineInterfaceGuidelineValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/VirtualMachineInterfaceGuidelineValidator.java
@@ -3,7 +3,6 @@ package org.openecomp.sdc.validation.impl.validators.namingconvention;
 import org.openecomp.core.validation.ErrorMessageCode;
 import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
 import org.openecomp.core.validation.types.GlobalValidationContext;
-import org.openecomp.sdc.common.togglz.ToggleableFeature;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
 import org.openecomp.sdc.heat.datatypes.DefinedHeatParameterTypes;
 import org.openecomp.sdc.heat.datatypes.model.Resource;
@@ -45,7 +44,6 @@ public class VirtualMachineInterfaceGuidelineValidator implements ResourceValida
   @Override
   public void validate(String fileName, Map.Entry<String, Resource> resourceEntry,
                        GlobalValidationContext globalContext, ValidationContext validationContext) {
-    if (ToggleableFeature.VLAN_TAGGING.isActive()) {
       NamingConventionValidationContext namingConventionValidationContext =
           (NamingConventionValidationContext) validationContext;
       Optional<Object> tagPropertyValue = getVlanTagPropertyValue(resourceEntry.getValue());
@@ -58,10 +56,8 @@ public class VirtualMachineInterfaceGuidelineValidator implements ResourceValida
         validateNamingConvention(fileName, resourceEntry, globalContext
         );
       }
-    }
   }
 
-
   private void validateModeledByResourceGroup(String fileName,
                                               Map.Entry<String, Resource> resourceEntry,
                                               GlobalValidationContext globalContext,
-- 
cgit 1.2.3-korg