From b9163367a8760d5e4249fce287f638f1ec9dddfb Mon Sep 17 00:00:00 2001 From: Elena Kuleshov Date: Thu, 1 Aug 2019 03:13:04 -0400 Subject: Handle no pservers case on lock check Check for null return value from pservers query Issue-ID: SO-2184 Signed-off-by: Kuleshov, Elena Change-Id: I34c71601e694241a6d3cfefa8227200e715e2ed3 --- .../src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java | 10 ++++++---- .../src/test/java/org/onap/so/client/aai/AAIValidatorTest.java | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java index 95ed01ee94..96844ff1cb 100644 --- a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java +++ b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java @@ -47,10 +47,12 @@ public class AAIValidatorImpl implements AAIValidator { List pservers; boolean isLocked = false; pservers = client.getPhysicalServerByVnfId(vnfId); - for (Pserver pserver : pservers) { - if (pserver.isInMaint()) { - isLocked = true; - return isLocked; + if (pservers != null) { + for (Pserver pserver : pservers) { + if (pserver.isInMaint()) { + isLocked = true; + return isLocked; + } } } return isLocked; diff --git a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java b/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java index 5fa2ff0295..b91d0e705a 100644 --- a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java +++ b/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java @@ -90,6 +90,13 @@ public class AAIValidatorTest { assertEquals(false, locked); } + @Test + public void test_IsPhysicalServerLocked_NoServers_False() throws IOException { + when(client.getPhysicalServerByVnfId(vnfName)).thenReturn(null); + boolean locked = validator.isPhysicalServerLocked(vnfName); + assertEquals(false, locked); + } + @Test public void test_IsVNFLocked_False() { when(client.getVnfByName(vnfName)).thenReturn(createGenericVnfs(false)); -- cgit 1.2.3-korg