aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2020-05-26 10:30:48 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-26 10:30:48 +0000
commit388a5e5ed87e479c4b8365a54860c87e489b154b (patch)
treecd0ea59e31f222b2bc0d1c4d419f402894749d46
parent1be844e494300c9c2eae7becbaf0aa9136d9278c (diff)
parent594721c136abf0b1f203228bf946a286747ed34c (diff)
Merge "use existing pnf - logging improvement"
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java3
-rw-r--r--bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIPnfResourcesTest.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java
index 7184bba377..3b22cd9d81 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java
@@ -98,7 +98,8 @@ public class AAIPnfResources {
pnfFromAai.getPnfName());
} else {
String errorMessage = String.format(
- "pnf with name %s already exists with orchestration status %s, only status Inventoried allows to use existing pnf",
+ "pnf with name %s already exists with orchestration status %s, existing pnf can be used only "
+ + "if status is not set or set as Inventoried",
pnfFromAai.getPnfName(), pnfFromAai.getOrchestrationStatus());
logger.error(errorMessage);
throw new Exception(errorMessage);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIPnfResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIPnfResourcesTest.java
index 5e9b4c7592..59cd53edd5 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIPnfResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIPnfResourcesTest.java
@@ -149,7 +149,8 @@ public class AAIPnfResourcesTest extends TestDataSetup {
} catch (Exception e) {
// then
assertThat(e.getMessage()).isEqualTo(String.format(
- "pnf with name %s already exists with orchestration status Active, only status Inventoried allows to use existing pnf",
+ "pnf with name %s already exists with orchestration status Active, existing pnf can be used only "
+ + "if status is not set or set as Inventoried",
PNF_NAME));
}
}