From 3042f71ec5761450e46a3f22c3eb46a117771145 Mon Sep 17 00:00:00 2001
From: "Ben David, Elad (eb7504)" <eb7504@intl.att.com>
Date: Wed, 6 Nov 2019 17:45:27 +0200
Subject: [PATCH] Align Sdc warnings with VNF Requirements

Change-Id: Ic133faed7f8b612279de0eb836e88e9ea6b694d7
Issue-ID: SDC-2647
Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>
---
 onboarding/pom.xml                                                   | 2 +-
 openecomp-be/backend/openecomp-sdc-security-util/pom.xml             | 3 ++-
 .../NovaServerNamingConventionGuideLineValidator.java                | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 4ed44018cb..4a5eb4f195 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -125,7 +125,7 @@
         <build.tools.version>${project.version}</build.tools.version>
         <togglz.version>2.4.1.Final</togglz.version>
         <bouncycastle.version>1.61</bouncycastle.version>
-        <onap.logging.version>1.5.0</onap.logging.version>
+        <onap.logging.version>1.6.1</onap.logging.version>
     </properties>
 
     <dependencyManagement>
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
index 78fa00a17b..10e19243f9 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
@@ -92,7 +92,8 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-slf4j</artifactId>
-            <version>1.4.0</version>
+            <version>1.6.1</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/NovaServerNamingConventionGuideLineValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/NovaServerNamingConventionGuideLineValidator.java
index b1a8fe254d..e9f6257a88 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/NovaServerNamingConventionGuideLineValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/namingconvention/NovaServerNamingConventionGuideLineValidator.java
@@ -81,7 +81,6 @@ public class NovaServerNamingConventionGuideLineValidator implements ResourceVal
   private void validateHeatNovaResource(String fileName, String envFileName,
                                         HeatOrchestrationTemplate heatOrchestrationTemplate,
                                         GlobalValidationContext globalContext) {
-    Map<String, String> uniqueResourcePortNetworkRole = new HashMap<>();
     //if no resources exist return
     if (MapUtils.isEmpty(heatOrchestrationTemplate.getResources())) {
       return;
@@ -94,7 +93,7 @@ public class NovaServerNamingConventionGuideLineValidator implements ResourceVal
             .filter(entry -> entry.getValue().getType()
                     .equals(HeatResourcesTypes.NOVA_SERVER_RESOURCE_TYPE.getHeatResource()))
             .forEach( entry -> validateNovaServerResourceType(entry.getKey(), fileName, envFileName,
-                    entry, uniqueResourcePortNetworkRole, heatOrchestrationTemplate, globalContext));
+                    entry, new HashMap<String, String>(), heatOrchestrationTemplate, globalContext));
   }
 
   private void validateNovaServerResourceType(String resourceId, String fileName,
@@ -192,7 +191,7 @@ public class NovaServerNamingConventionGuideLineValidator implements ResourceVal
         }else if (network instanceof List){
           role = getNetworkRole((String)((List) network).get(0));
         }
-        if (role != null && (uniqueResourcePortNetworkRole.containsKey(role))) {
+        if (role != null && uniqueResourcePortNetworkRole.containsKey(role)) {
           globalValidationContext.addMessage(
                   fileName,
                   ErrorLevel.WARNING,
-- 
2.16.6