aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src
diff options
context:
space:
mode:
authoreleonorali <eleonoral@amdocs.com>2018-06-12 13:08:38 +0300
committerAvi Gaffa <avi.gaffa@amdocs.com>2018-06-13 09:03:30 +0000
commitaf561a8c58022cd211fa5ff020b72307bdde1ac6 (patch)
tree49b497d25c93e07cc69c377631c32024b2565c76 /openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src
parent67e400cc929314f1d66accb2f2f47d489f6b0c4f (diff)
Remove Toggle
Remove Toggle for SIROV and VLAN_TAGGING Change-Id: Ia8b883c1f85de24f5c2000654a0926141cc269e8 Issue-ID: SDC-1418 Signed-off-by: eleonorali <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src')
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/VirtualMachineInterfaceValidator.java3
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/VirtualMachineInterfaceGuidelineValidator.java4
2 files changed, 0 insertions, 7 deletions
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,