From 9507b7416ee595eb59e25c6797f3720c0a89767c Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 29 Apr 2019 18:50:46 +0200 Subject: [PATCH] Fix bad microservice window Fix the bug where operational policy window is opened in the UI instead of the right microservice one Issue-ID: CLAMP-364 Change-Id: I2fd64f0dd2de54e8498f4cdce2c55fd912fd5f21 Signed-off-by: sebdet --- src/main/java/org/onap/clamp/clds/util/drawing/SvgFacade.java | 2 +- .../META-INF/resources/designer/scripts/CldsModelService.js | 2 +- .../org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/SvgFacade.java b/src/main/java/org/onap/clamp/clds/util/drawing/SvgFacade.java index f5bd6e79..f7bf92bf 100644 --- a/src/main/java/org/onap/clamp/clds/util/drawing/SvgFacade.java +++ b/src/main/java/org/onap/clamp/clds/util/drawing/SvgFacade.java @@ -41,7 +41,7 @@ public class SvgFacade { Painter p = new Painter(svgGraphics2D, dp); ClampGraphBuilder cgp = new ClampGraphBuilder(p).collector("VES"); cgp.addAllMicroServices(microServicesChain); - ClampGraph cg = cgp.policy("Policy").build(); + ClampGraph cg = cgp.policy("OperationalPolicy").build(); return cg.getAsSVG(); } diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js index 34e90e63..38cdc938 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js @@ -34,7 +34,7 @@ app //This will open the methods located in the app.js if (undefined == name) { return; - }else if (name.toLowerCase().indexOf("policy") >= 0){ + }else if (name === "OperationalPolicy"){ PolicyWindow(); } else { $rootScope.selectedBoxName = name; diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java index f7d2fe76..5eb664fe 100644 --- a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java +++ b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java @@ -58,8 +58,8 @@ public class ClampGraphBuilderTest { String collector = "VES"; MicroService ms1 = new MicroService("ms1", "", "", "ms1_jpa_id", ""); MicroService ms2 = new MicroService("ms2", "", "", "ms2_jpa_id", ""); - ; - String policy = "Policy"; + + String policy = "OperationalPolicy"; List microServices = Arrays.asList(ms1, ms2); ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter); @@ -86,7 +86,7 @@ public class ClampGraphBuilderTest { @Test(expected = InvalidStateException.class) public void clampGraphBuilderNoMicroServiceGivenTest() { String collector = "VES"; - String policy = "Policy"; + String policy = "OperationalPolicy"; ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter); clampGraphBuilder.collector(collector).policy(policy).build(); -- 2.16.6