summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/docker/Dockerfile7
-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
4 files changed, 12 insertions, 5 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index e59146c4b..c47d6229e 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -21,6 +21,13 @@ RUN chmod 700 /opt/clamp/app.jar
RUN chown -R clamp:onap /opt/clamp
RUN apk add fontconfig
+RUN apk add ttf-dejavu
+
+RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so && \
+ ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 && \
+ ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1
+
+ENV LD_LIBRARY_PATH /usr/lib
USER clamp
WORKDIR /opt/clamp/
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();