From ab9bc444f84f2cbb89747543657de3a54e4554b8 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 23 Apr 2020 03:01:37 +0200 Subject: Fix entityId bug A user defined entry has been added to the entity id by default, so that json editor falls back to that value when re-editing the policies Issue-ID: CLAMP-829 Signed-off-by: sebdet Change-Id: I593163f87df9f97a19964428bf2016154dc9576d --- .../OperationalPolicyRepresentationBuilder.java | 11 +++++++++++ src/main/resources/META-INF/resources/swagger.html | 19 +++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java index 787698ad..b1aa4ad1 100644 --- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java +++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java @@ -128,6 +128,15 @@ public class OperationalPolicyRepresentationBuilder { return vnfSchemaArray; } + private static JsonArray createBlankEntry() { + JsonArray result = new JsonArray(); + JsonObject blankObject = new JsonObject(); + blankObject.addProperty("title", "User defined"); + blankObject.add("properties", new JsonObject()); + result.add(blankObject); + return result; + } + private static JsonArray createVfModuleSchema(Service modelService, boolean generateType) { JsonArray vfModuleOneOfSchemaArray = new JsonArray(); JsonObject modelVfModules = modelService.getResourceByType("VFModule"); @@ -180,6 +189,8 @@ public class OperationalPolicyRepresentationBuilder { */ public static JsonArray createAnyOfArray(Service modelJson, boolean generateType) { JsonArray targetOneOfStructure = new JsonArray(); + // First entry must be user defined + targetOneOfStructure.addAll(createBlankEntry()); targetOneOfStructure.addAll(createVnfSchema(modelJson, generateType)); targetOneOfStructure.addAll(createVfModuleSchema(modelJson, generateType)); return targetOneOfStructure; diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html index 1f8cc9eb..6bce8367 100644 --- a/src/main/resources/META-INF/resources/swagger.html +++ b/src/main/resources/META-INF/resources/swagger.html @@ -566,7 +566,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
  • 2.18.3. Produces
    • -
  • 2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion} +
  • 2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}