aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2019-04-29 18:50:46 +0200
committersebdet <sebastien.determe@intl.att.com>2019-04-29 18:50:46 +0200
commit9507b7416ee595eb59e25c6797f3720c0a89767c (patch)
treee780adccb56a1e94364571f9d8a6964873d0e40a /src
parentc7e23eae162aa059bea8c9d13556d3931520f17b (diff)
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 <sebastien.determe@intl.att.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/clamp/clds/util/drawing/SvgFacade.java2
-rw-r--r--src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js2
-rw-r--r--src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java6
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 f5bd6e79d..f7bf92bfd 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 34e90e632..38cdc9388 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 f7d2fe76e..5eb664fe7 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<MicroService> 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();