Create SVG in UI

Remove the SVG generation from the backend and put it in the UI. Backend removal code + clean up of test resources

Issue-ID: CLAMP-854
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ie9d6cd20f0135b459dbc85901b9a66f65002a85c

16 files changed, 72 insertions, 534 deletions

diff --git a/src/test/java/org/onap/clamp/clds/util/XmlToolsTest.java b/src/test/java/org/onap/clamp/clds/util/XmlToolsTest.java
deleted file mode 100644
index a34ef3f94..000000000
--- a/src/test/java/org/onap/clamp/clds/util/XmlToolsTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.batik.anim.dom.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-import org.junit.Assert;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class XmlToolsTest {
-
-    @Test
-    public void exportXmlDocumentAsStringTest() throws IOException, ParserConfigurationException, SAXException {
-        String expected = ResourceFileUtil.getResourceAsString("clds/util/file.xml");
-        Document document = parseStringToXmlDocument(expected);
-        String actual = XmlTools.exportXmlDocumentAsString(document);
-        Assert.assertEquals(expected.trim(), actual.trim());
-    }
-
-    @Test
-    public void createEmptySvgDocumentTest() {
-        Document doc = XmlTools.createEmptySvgDocument();
-        Assert.assertEquals(SVGDOMImplementation.SVG_NAMESPACE_URI, doc.getDocumentElement().getNamespaceURI());
-        Assert.assertEquals(SVGConstants.SVG_SVG_TAG, doc.getDocumentElement().getNodeName());
-        Assert.assertNull(doc.getDoctype());
-    }
-
-    /**
-     * Method to parse String into XmlDocument.
-     *
-     * @param res
-     *        String to parse
-     * @return
-     *        XmlDocument
-     * @throws ParserConfigurationException
-     *         In case of issues with parse the document
-     * @throws SAXException
-     *         In case of bad format of res
-     * @throws IOException
-     *         In case of issues creating the document
-     */
-    public static Document parseStringToXmlDocument(String res)
-        throws ParserConfigurationException, SAXException, IOException {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setValidating(false);
-        dbf.setNamespaceAware(true);
-        dbf.setFeature("http://xml.org/sax/features/namespaces", false);
-        dbf.setFeature("http://xml.org/sax/features/validation", false);
-        dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
-        dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        InputSource is = new InputSource(new StringReader(res));
-        return db.parse(is);
-    }
-
-}
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
deleted file mode 100644
index 8eeba07ed..000000000
--- a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * Modifications copyright (c) 2019 AT&T
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.util.drawing;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import com.google.gson.JsonObject;
-import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ClampGraphBuilderTest {
-    @Mock
-    private Painter mockPainter;
-
-    @Captor
-    private ArgumentCaptor<String> collectorCaptor;
-
-    @Captor
-    private ArgumentCaptor<Set<MicroServicePolicy>> microServicesCaptor;
-
-    @Captor
-    private ArgumentCaptor<Set<OperationalPolicy>> policyCaptor;
-
-    /**
-     * Do a quick test of the graphBuilder chain.
-     */
-    @Test
-    public void clampGraphBuilderCompleteChainTest() {
-        String collector = "VES";
-        MicroServicePolicy ms1 = new MicroServicePolicy("ms1", new PolicyModel("org.onap.ms1", "", "1.0.0"), false,
-                null, null, null, null);
-        MicroServicePolicy ms2 = new MicroServicePolicy("ms2", new PolicyModel("org.onap.ms2", "", "1.0.0"), false,
-                null, null, null, null);
-
-        OperationalPolicy opPolicy = new OperationalPolicy("OperationalPolicy", new JsonObject(), new JsonObject(),
-                new PolicyModel("org.onap.opolicy", null, "1.0.0", "opolicy1"), null, null, null);
-        final Set<OperationalPolicy> opPolicies = Set.of(opPolicy);
-        final Set<MicroServicePolicy> microServices = Set.of(ms1, ms2);
-
-        ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter);
-        clampGraphBuilder.collector(collector).addMicroService(ms1).addMicroService(ms2).addPolicy(opPolicy).build();
-
-        verify(mockPainter, times(1)).doPaint(collectorCaptor.capture(), microServicesCaptor.capture(),
-                policyCaptor.capture());
-
-        Assert.assertEquals(collector, collectorCaptor.getValue());
-        Assert.assertEquals(microServices, microServicesCaptor.getValue());
-        Assert.assertEquals(opPolicies, policyCaptor.getValue());
-    }
-
-    /**
-     * Do a quick test of the graphBuilder chain when no policy is given.
-     */
-    @Test
-    public void clampGraphBuilderNoPolicyGivenTest() {
-        String collector = "VES";
-        MicroServicePolicy ms1 =
-                new MicroServicePolicy("ms1", new PolicyModel("org.onap.ms1", "", "1.0.0"), false, null, null, null,
-                        null);
-        MicroServicePolicy ms2 =
-                new MicroServicePolicy("ms2", new PolicyModel("org.onap.ms2", "", "1.0.0"), false, null, null, null,
-                        null);
-
-        ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter);
-        assertThat(clampGraphBuilder.collector(collector).addMicroService(ms1).addMicroService(ms2).build())
-                .isNotNull();
-
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphTest.java
deleted file mode 100644
index 4ae0a4908..000000000
--- a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.util.drawing;
-
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.onap.clamp.clds.util.XmlToolsTest;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ClampGraphTest {
-    @Mock
-    private DocumentBuilder mockDocumentBuilder;
-
-    @Test
-    public void getAsSvgTest() throws IOException, ParserConfigurationException, SAXException {
-        String expected = ResourceFileUtil.getResourceAsString("clds/util/file.xml");
-        Document document = XmlToolsTest.parseStringToXmlDocument(expected);
-
-        when(mockDocumentBuilder.getGroupingDocument()).thenReturn(document);
-
-        String actual = new ClampGraph(mockDocumentBuilder).getAsSvg();
-        Assert.assertEquals(expected.trim(), actual.trim());
-    }
-
-    @Test
-    public void getAsSvgLazyTest() throws IOException, ParserConfigurationException, SAXException {
-        String expected = ResourceFileUtil.getResourceAsString("clds/util/file.xml");
-        Document document = XmlToolsTest.parseStringToXmlDocument(expected);
-
-        when(mockDocumentBuilder.getGroupingDocument()).thenReturn(document);
-        ClampGraph cg = new ClampGraph(mockDocumentBuilder);
-
-        String actualFirst = cg.getAsSvg();
-        verify(mockDocumentBuilder, times(1)).getGroupingDocument();
-
-        String actualSecond = cg.getAsSvg();
-        verifyNoMoreInteractions(mockDocumentBuilder);
-
-        Assert.assertEquals(expected.trim(), actualFirst.trim());
-        Assert.assertEquals(expected.trim(), actualSecond.trim());
-
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/DocumentBuilderTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/DocumentBuilderTest.java
deleted file mode 100644
index 13f8e3ad6..000000000
--- a/src/test/java/org/onap/clamp/clds/util/drawing/DocumentBuilderTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.util.drawing;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.batik.util.SVGConstants;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.onap.clamp.clds.util.XmlToolsTest;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DocumentBuilderTest {
-    @Mock
-    private SVGGraphics2D mockG2d;
-
-    @Test
-    public void pushChangestoDocumentTest() throws IOException, ParserConfigurationException, SAXException {
-        String dataElementId = "someId";
-        String newNodeTag = "tagged";
-        String newNodeText = "Sample text";
-        String xml = ResourceFileUtil.getResourceAsString("clds/util/file.xml");
-        Document document = XmlToolsTest.parseStringToXmlDocument(xml);
-        Node newNode = document.createElement(newNodeTag);
-        newNode.appendChild(document.createTextNode(newNodeText));
-
-        when(mockG2d.getRoot(any(Element.class))).then(a -> a.getArgument(0, Element.class).appendChild(newNode));
-
-        DocumentBuilder db = new DocumentBuilder(document, document);
-        db.pushChangestoDocument(mockG2d, dataElementId);
-        Document actualDocument = db.getGroupingDocument();
-
-        Node addedActualNode = actualDocument.getDocumentElement().getLastChild();
-        String actualDataElementId = addedActualNode.getAttributes()
-                .getNamedItem(DocumentBuilder.DATA_ELEMENT_ID_ATTRIBUTE).getTextContent();
-
-        Assert.assertEquals(dataElementId, actualDataElementId);
-        Assert.assertEquals(SVGConstants.SVG_G_TAG, addedActualNode.getNodeName());
-
-        Node addedActualNodeChild = addedActualNode.getLastChild();
-        Assert.assertEquals(newNodeTag, addedActualNodeChild.getNodeName());
-        Assert.assertEquals(newNodeText, addedActualNodeChild.getTextContent());
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
deleted file mode 100644
index 0150af025..000000000
--- a/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.util.drawing;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
-import org.junit.Test;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.xml.sax.SAXException;
-
-public class SvgLoopGeneratorTest {
-    private Loop getLoop() {
-
-        LoopElementModel msModel = new LoopElementModel("testMs", LoopElementModel.MICRO_SERVICE_TYPE, "");
-        MicroServicePolicy ms1 =
-                new MicroServicePolicy("ms1", new PolicyModel("org.onap.ms1", "", "1.0.0", "short.ms1"),
-                        false,null,msModel,null,null);
-        MicroServicePolicy ms2 =
-                new MicroServicePolicy("ms2", new PolicyModel("org.onap.ms2", "", "1.0.0", "short.ms2"),
-                        false, null,msModel,null,null);
-        LoopElementModel opModel = new LoopElementModel("testOp", LoopElementModel.OPERATIONAL_POLICY_TYPE, "");
-        OperationalPolicy opPolicy = new OperationalPolicy("OperationalPolicy", new JsonObject(),new JsonObject(),
-                new PolicyModel("org.onap.opolicy", null, "1.0.0", "short.OperationalPolicy"), opModel, null, null);
-        Loop loop = new Loop();
-        loop.addMicroServicePolicy(ms1);
-        loop.addMicroServicePolicy(ms2);
-        loop.addOperationalPolicy(opPolicy);
-        return loop;
-    }
-
-    /**
-     * Test a Svg rendering with all objects.
-     *
-     * @throws IOException In case of isssues
-     * @throws ParserConfigurationException In case of isssues
-     * @throws SAXException In case of isssues
-     */
-    @Test
-    public void getAsSvgTest() throws IOException, ParserConfigurationException, SAXException {
-        String xml = SvgLoopGenerator.getSvgImage(getLoop());
-        assertThat(xml).contains("data-element-id=\"VES\"");
-        assertThat(xml).contains(">VES<");
-        assertThat(xml).contains("data-element-id=\"ms1\"");
-        assertThat(xml).contains("data-element-id=\"ms2\"");
-        assertThat(xml).contains("data-grouping-id=\"testMs\"");
-        assertThat(xml).contains("data-grouping-id=\"testOp\"");
-        assertThat(xml).contains("data-for-ui=\"testMs\"");
-        assertThat(xml).contains("data-for-ui=\"testOp\"");
-        assertThat(xml).contains(">short.ms1<");
-        assertThat(xml).contains(">short.ms2<");
-        assertThat(xml).contains("data-element-id=\"OperationalPolicy\"");
-        assertThat(xml).contains(">short.OperationalPolicy<");
-
-    }
-}
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index d14975238..7e1488604 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -219,7 +219,6 @@ public class CsarInstallerItCase {
         // set
         LoopTemplate loopTemplate = loopTemplatesRepo.findById(LoopTemplate.generateLoopTemplateName(generatedName,
                 "1.0", RESOURCE_INSTANCE_NAME_RESOURCE1, "tca.yaml")).get();
-        assertThat(loopTemplate.getSvgRepresentation()).startsWith("<svg ");
         assertThat(loopTemplate.getLoopElementModelsUsed()).hasSize(1);
         assertThat(loopTemplate.getModelService().getServiceUuid()).isEqualTo("63cac700-ab9a-4115-a74f-7eac85e3fce0");
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"),
diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
index 7f3b57095..022d10eb2 100644
--- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
@@ -45,7 +45,7 @@ import org.onap.clamp.policy.microservice.MicroServicePolicy;
 public class DcaeComponentTest {
 
     private Loop createTestLoop() {
-        Loop loopTest = new Loop("ControlLoopTest", "<xml></xml>");
+        Loop loopTest = new Loop("ControlLoopTest");
         loopTest.setGlobalPropertiesJson(
                 new Gson().fromJson(
                         "{\"dcaeDeployParameters\":{\"uniqueBlueprintParameters\": {\"policy_id\": \"name\"}}}",
@@ -60,7 +60,7 @@ public class DcaeComponentTest {
         microServicePolicy.setConfigurationsJson(new Gson().fromJson("{\"param1\":\"value1\"}", JsonObject.class));
 
         loopTest.addMicroServicePolicy(microServicePolicy);
-        LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", "svg", 1, null);
+        LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", 1, null);
         loopTemplate.setDcaeBlueprintId("UUID-blueprint");
         loopTest.setLoopTemplate(loopTemplate);
 
diff --git a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
index 97fe337de..07e7c4d7c 100644
--- a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
@@ -66,12 +66,12 @@ public class DeployFlowTestItCase {
      * This method tests a deployment a single blueprint.
      *
      * @throws JsonSyntaxException In case of issues
-     * @throws IOException In case of issues
+     * @throws IOException         In case of issues
      */
     @Test
     @Transactional
     public void deployWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "<xml></xml>", "yamlcontent",
+        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent",
                 "{\"dcaeDeployParameters\":{\"uniqueBlueprintParameters\": {\"policy_id\": \"name\"}}}",
                 "UUID-blueprint");
         LoopTemplate template = new LoopTemplate();
@@ -97,12 +97,12 @@ public class DeployFlowTestItCase {
      * This method tests the deployment of multiple separated  blueprints.
      *
      * @throws JsonSyntaxException In case of issues
-     * @throws IOException In case of issues
+     * @throws IOException         In case of issues
      */
     @Test
     @Transactional
     public void deployWithMultipleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest2 = createLoop("ControlLoopTest2", "<xml></xml>", "yamlcontent", "{\"dcaeDeployParameters\": {"
+        Loop loopTest2 = createLoop("ControlLoopTest2", "yamlcontent", "{\"dcaeDeployParameters\": {"
                 + "\"microService1\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName1_tca\"},"
                 + "\"microService2\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName2_tca\"}"
                 + "}}", "UUID-blueprint");
@@ -135,12 +135,12 @@ public class DeployFlowTestItCase {
      * This method tests the undeployment of a single blueprint.
      *
      * @throws JsonSyntaxException In case of issues
-     * @throws IOException In case of issues
+     * @throws IOException         In case of issues
      */
     @Test
     @Transactional
     public void undeployWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "UUID-blueprint");
         LoopTemplate template = new LoopTemplate();
         template.setName("templateName");
@@ -166,12 +166,12 @@ public class DeployFlowTestItCase {
      * This method tests the undeployment of multiple separated blueprints.
      *
      * @throws JsonSyntaxException In case of issues
-     * @throws IOException In case of issues
+     * @throws IOException         In case of issues
      */
     @Test
     @Transactional
     public void undeployWithMultipleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest2 = createLoop("ControlLoopTest2", "<xml></xml>", "yamlcontent", "{\"dcaeDeployParameters\": {"
+        Loop loopTest2 = createLoop("ControlLoopTest2", "yamlcontent", "{\"dcaeDeployParameters\": {"
                 + "\"microService1\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName1_tca\"},"
                 + "\"microService2\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName2_tca\"}"
                 + "}}", "UUID-blueprint");
@@ -205,12 +205,12 @@ public class DeployFlowTestItCase {
      * This method tests the DCAE get status for a single blueprint.
      *
      * @throws JsonSyntaxException In case of issues
-     * @throws IOException In case of issues
+     * @throws IOException         In case of issues
      */
     @Test
     @Transactional
     public void getStatusWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "UUID-blueprint");
         LoopTemplate template = new LoopTemplate();
         template.setName("templateName");
@@ -241,12 +241,12 @@ public class DeployFlowTestItCase {
      * This method tests the dcae get status for multiple blueprints.
      *
      * @throws JsonSyntaxException In case of issues
-     * @throws IOException In case of issues
+     * @throws IOException         In case of issues
      */
     @Test
     @Transactional
     public void getStatusWithMultipleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "UUID-blueprint");
         LoopTemplate template = new LoopTemplate();
         template.setName("templateName");
@@ -271,9 +271,9 @@ public class DeployFlowTestItCase {
         camelContext.createProducerTemplate().send("direct:update-dcae-status-for-loop", myCamelExchange);
 
         assertThat(loopTest.getComponent("DCAE_configPolicyTest").getState().getStateName())
-            .isEqualTo("BLUEPRINT_DEPLOYED");
+                .isEqualTo("BLUEPRINT_DEPLOYED");
         assertThat(loopTest.getComponent("DCAE_configPolicyTest2").getState().getStateName())
-            .isEqualTo("BLUEPRINT_DEPLOYED");
+                .isEqualTo("BLUEPRINT_DEPLOYED");
 
         Loop loopAfterTest = loopService.getLoop("ControlLoopTest");
         assertThat(loopAfterTest.getComponents().size()).isEqualTo(3);
@@ -283,18 +283,18 @@ public class DeployFlowTestItCase {
         assertThat(loopTest.getComponent("DCAE_configPolicyTest2")).isNotNull();
     }
 
-    private Loop createLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
-            String dcaeBlueprintId) throws JsonSyntaxException, IOException {
-        Loop loop = new Loop(name, svgRepresentation);
+    private Loop createLoop(String name, String blueprint, String globalPropertiesJson,
+                            String dcaeBlueprintId) throws JsonSyntaxException, IOException {
+        Loop loop = new Loop(name);
         loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
         loop.setLastComputedState(LoopState.DESIGN);
         return loop;
     }
 
     private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
-            String policyTosca, String jsonProperties, boolean shared) {
+                                                     String policyTosca, String jsonProperties, boolean shared) {
 
-        PolicyModel policyModel = new PolicyModel(modelType, policyTosca,"1.0.0");
+        PolicyModel policyModel = new PolicyModel(modelType, policyTosca, "1.0.0");
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy microService = new MicroServicePolicy(name, policyModel,
                 shared,
@@ -305,8 +305,9 @@ public class DeployFlowTestItCase {
     }
 
     private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
-            String policyTosca, String jsonProperties, boolean shared, String deploymengId,
-            String deploymentStatusUrl) {
+                                                     String policyTosca, String jsonProperties, boolean shared,
+                                                     String deploymengId,
+                                                     String deploymentStatusUrl) {
         MicroServicePolicy microService = getMicroServicePolicy(name, modelType, jsonRepresentation, policyTosca,
                 jsonProperties, shared);
 
diff --git a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
index 26db6b013..f170bc6df 100644
--- a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
@@ -86,7 +86,7 @@ public class LoopControllerTestItCase {
     }
 
     private Loop createTestLoop(String loopName, String loopBlueprint, String loopSvg) {
-        return new Loop(loopName, loopSvg);
+        return new Loop(loopName);
     }
 
     @Test
@@ -150,14 +150,6 @@ public class LoopControllerTestItCase {
 
     @Test
     @Transactional
-    public void testGetSvgRepresentation() {
-        saveTestLoopToDb();
-        String svgRepresentation = loopController.getSvgRepresentation(EXAMPLE_LOOP_NAME);
-        assertThat(svgRepresentation).isEqualTo("representation");
-    }
-
-    @Test
-    @Transactional
     public void testAddAndRemoveOperationalPolicies() throws IOException {
         saveTestLoopToDb();
         PolicyModel policyModel = new PolicyModel("testPolicyModel",
diff --git a/src/test/java/org/onap/clamp/loop/LoopLogServiceTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopLogServiceTestItCase.java
index 15b9cb43a..ddab7b659 100644
--- a/src/test/java/org/onap/clamp/loop/LoopLogServiceTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopLogServiceTestItCase.java
@@ -25,11 +25,8 @@ package org.onap.clamp.loop;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.JsonObject;
-
 import java.util.Set;
-
 import javax.transaction.Transactional;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
@@ -50,7 +47,6 @@ public class LoopLogServiceTestItCase {
     private static final String CLAMP_COMPONENT = "CLAMP";
     private static final String SAMPLE_LOG_MESSAGE = "Sample log";
     private static final String BLUEPRINT = "blueprint";
-    private static final String SVG_REPRESENTATION = "representation";
 
     @Autowired
     LoopService loopService;
@@ -62,7 +58,7 @@ public class LoopLogServiceTestItCase {
     LoopLogService loopLogService;
 
     private void saveTestLoopToDb() {
-        Loop testLoop = new Loop(EXAMPLE_LOOP_NAME, SVG_REPRESENTATION);
+        Loop testLoop = new Loop(EXAMPLE_LOOP_NAME);
         testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
         loopService.saveOrUpdateLoop(testLoop);
     }
@@ -88,7 +84,7 @@ public class LoopLogServiceTestItCase {
         log.setLogComponent(CLAMP_COMPONENT);
         log.setLogType(LogType.INFO);
         log.setMessage(SAMPLE_LOG_MESSAGE);
-        Loop testLoop = new Loop(EXAMPLE_LOOP_NAME, SVG_REPRESENTATION);
+        Loop testLoop = new Loop(EXAMPLE_LOOP_NAME);
         log.setLoop(testLoop);
         assertThat(log.getMessage()).isEqualTo(SAMPLE_LOG_MESSAGE);
         assertThat(log.getLogType()).isEqualTo(LogType.INFO);
diff --git a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
index 164625fef..9815575cc 100644
--- a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
@@ -106,9 +106,9 @@ public class LoopRepositoriesItCase {
         return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
     }
 
-    private LoopTemplate getLoopTemplates(String name, String blueprint, String svgRepresentation, String createdBy,
+    private LoopTemplate getLoopTemplates(String name, String blueprint, String createdBy,
                                           Integer maxInstancesAllowed) {
-        LoopTemplate template = new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);
+        LoopTemplate template = new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
         template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "org.onap.policy.drools", createdBy,
                 getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools")));
         template.addLoopElementModel(getLoopElementModel("yaml", "oppolicy1", "org.onap.policy.drools.legacy",
@@ -117,16 +117,15 @@ public class LoopRepositoriesItCase {
         return template;
     }
 
-    private Loop getLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
+    private Loop getLoop(String name, String blueprint, String globalPropertiesJson,
                          String dcaeId, String dcaeUrl, String dcaeBlueprintId) {
         Loop loop = new Loop();
         loop.setName(name);
-        loop.setSvgRepresentation(svgRepresentation);
         loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
         loop.setLastComputedState(LoopState.DESIGN);
         loop.setDcaeDeploymentId(dcaeId);
         loop.setDcaeDeploymentStatusUrl(dcaeUrl);
-        loop.setLoopTemplate(getLoopTemplates("templateName", "yaml", "svg", "toto", 1));
+        loop.setLoopTemplate(getLoopTemplates("templateName", "yaml", "toto", 1));
         return loop;
     }
 
@@ -149,7 +148,7 @@ public class LoopRepositoriesItCase {
     @Transactional
     public void crudTest() {
         // Setup
-        Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest = getLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "123456789", "https://dcaetest.org", "UUID-blueprint");
         OperationalPolicy opPolicy = this.getOperationalPolicy("{\"type\":\"GUARD\"}", "GuardOpPolicyTest",
                 getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "DroolsLegacy"));
@@ -217,7 +216,7 @@ public class LoopRepositoriesItCase {
 
         // Attempt an update
         ((LoopLog) loopInDbRetrieved.getLoopLogs().toArray()[0]).setLogInstant(Instant.now());
-        loopInDbRetrieved.setSvgRepresentation("");
+        loopInDbRetrieved.setLastComputedState(LoopState.RUNNING);
         Loop loopInDbRetrievedUpdated = loopRepository.saveAndFlush(loopInDbRetrieved);
         // Loop loopInDbRetrievedUpdated =
         // loopRepository.findById(loopTest.getName()).get();
diff --git a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
index 5449ada1a..15cf59f38 100644
--- a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
@@ -78,8 +78,7 @@ public class LoopServiceTestItCase {
     public void shouldCreateEmptyLoop() {
         // given
         String loopBlueprint = "blueprint";
-        String loopSvg = "representation";
-        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, loopBlueprint, loopSvg);
+        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, loopBlueprint);
         testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
         testLoop.setLastComputedState(LoopState.DESIGN);
 
@@ -90,7 +89,6 @@ public class LoopServiceTestItCase {
         assertThat(actualLoop).isNotNull();
         assertThat(actualLoop).isEqualTo(loopsRepository.findById(actualLoop.getName()).get());
         assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        assertThat(actualLoop.getSvgRepresentation()).isEqualTo(loopSvg);
         assertThat(actualLoop.getGlobalPropertiesJson().getAsJsonPrimitive("testName").getAsString())
                 .isEqualTo("testValue");
     }
@@ -183,7 +181,7 @@ public class LoopServiceTestItCase {
     }
 
     private void saveTestLoopToDb() {
-        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, "blueprint", "representation");
+        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, "blueprint");
         testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
         LoopTemplate template = new LoopTemplate();
         template.setName("testTemplate");
@@ -376,7 +374,7 @@ public class LoopServiceTestItCase {
         assertThat(microServicePolicyService.isExisting("policyName")).isTrue();
     }
 
-    private Loop createTestLoop(String loopName, String loopBlueprint, String loopSvg) {
-        return new Loop(loopName, loopSvg);
+    private Loop createTestLoop(String loopName, String loopBlueprint) {
+        return new Loop(loopName);
     }
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java b/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
index e5b64c99c..70ff9b118 100644
--- a/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
@@ -37,8 +37,8 @@ import org.onap.clamp.loop.template.PolicyModel;
 public class LoopTemplateLoopElementModelTest {
 
     private LoopElementModel loopElementModel = getLoopElementModel("yaml", "microService1",
-        getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"));
-    private LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", "svg", 1);
+            getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"));
+    private LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", 1);
 
     private LoopElementModel getLoopElementModel(String yaml, String name, PolicyModel policyModel) {
         LoopElementModel model = new LoopElementModel();
@@ -54,9 +54,8 @@ public class LoopTemplateLoopElementModelTest {
         return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
     }
 
-    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,
-                                         Integer maxInstancesAllowed) {
-        LoopTemplate template = new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);
+    private LoopTemplate getLoopTemplate(String name, String blueprint, Integer maxInstancesAllowed) {
+        LoopTemplate template = new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
         template.addLoopElementModel(loopElementModel);
         return template;
     }
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
index cabc778b8..b8b1144f6 100644
--- a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
@@ -55,7 +55,7 @@ public class LoopTemplatesServiceItCase {
     private static final String VERSION = "1.0.0";

 

     private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType,

-        String createdBy, PolicyModel policyModel) {

+                                                 String createdBy, PolicyModel policyModel) {

         LoopElementModel model = new LoopElementModel(name, loopElementType, yaml);

         model.setBlueprint("");

         model.setDcaeBlueprintId("");

@@ -64,16 +64,15 @@ public class LoopTemplatesServiceItCase {
     }

 

     private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,

-        String policyAcronym, String createdBy) {

+                                       String policyAcronym, String createdBy) {

         return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);

     }

 

-    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,

-        String createdBy, Integer maxInstancesAllowed) {

+    private LoopTemplate getLoopTemplate(String name, String blueprint, String createdBy, Integer maxInstancesAllowed) {

         LoopTemplate template =

-            new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);

+                new LoopTemplate(name, blueprint, maxInstancesAllowed, null);

         template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService",

-            createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));

+                createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));

         template.setAllowedLoopType(LoopType.OPEN);

         return template;

     }

@@ -81,9 +80,9 @@ public class LoopTemplatesServiceItCase {
     @Test

     @Transactional

     public void shouldSaveOrUpdateLoopTemplate() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

         LoopTemplate actualLoopTemplate =

-            loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

+                loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

 

         assertNotNull(actualLoopTemplate);

         assertThat(loopTemplate.getName()).isEqualTo("TemplateName");

@@ -92,8 +91,8 @@ public class LoopTemplatesServiceItCase {
 

     @Test

     @Transactional

-    public void shouldReturnAllLoopemplates() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+    public void shouldReturnAllLoopTemplates() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

         List<LoopTemplate> loopTemplateList = loopTemplatesService.getAllLoopTemplates();

 

@@ -102,8 +101,8 @@ public class LoopTemplatesServiceItCase {
 

     @Test

     @Transactional

-    public void shouldReturnLoopemplateNames() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+    public void shouldReturnLoopTemplateNames() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

         List<String> loopTemplateNames = loopTemplatesService.getLoopTemplateNames();

 

@@ -113,8 +112,8 @@ public class LoopTemplatesServiceItCase {
 

     @Test

     @Transactional

-    public void shouldReturnLoopemplate() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+    public void shouldReturnLoopTemplate() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

         LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");

 

@@ -122,33 +121,22 @@ public class LoopTemplatesServiceItCase {
         assertThat(loopTemplate).isEqualTo(actualLoopTemplate);

         assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName());

         assertThat(loopTemplate.getMaximumInstancesAllowed())

-            .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());

+                .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());

         SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =

-            loopTemplate.getLoopElementModelsUsed();

+                loopTemplate.getLoopElementModelsUsed();

         LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();

         assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName())

-            .isEqualTo("microService1");

+                .isEqualTo("microService1");

         assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())

-            .isEqualTo("TemplateName");

+                .isEqualTo("TemplateName");

         assertNull(actualLoopTemplate.getBlueprint());

         assertNull(actualLoopTemplate.getModelService());

     }

 

     @Test

     @Transactional

-    public void shouldReturnLoopemplateSvg() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-        String svgRepresentation = loopTemplatesService.getSvgRepresentation("TemplateName");

-

-        assertNotNull(svgRepresentation);

-        assertThat(svgRepresentation).isEqualTo(loopTemplate.getSvgRepresentation());

-    }

-

-    @Test

-    @Transactional

-    public void shouldDeleteLoopemplate() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+    public void shouldDeleteLoopTemplate() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

         loopTemplatesService.deleteLoopTemplate("TemplateName");

         LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");

diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
index 6c7836e50..6827bf5f4 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
@@ -27,7 +27,6 @@ package org.onap.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -37,7 +36,6 @@ import java.util.Random;
 import org.junit.Test;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.onap.clamp.loop.components.external.PolicyComponent;
 import org.onap.clamp.loop.log.LogType;
 import org.onap.clamp.loop.log.LoopLog;
 import org.onap.clamp.loop.service.Service;
@@ -46,7 +44,6 @@ import org.onap.clamp.loop.template.LoopTemplate;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.skyscreamer.jsonassert.JSONAssert;
 
 public class LoopToJsonTest {
 
@@ -54,13 +51,13 @@ public class LoopToJsonTest {
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name) {
         return new OperationalPolicy(name, null, gson.fromJson(configJson, JsonObject.class),
-                getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "Drools", "type1"), null,null,null);
+                getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "Drools", "type1"), null, null, null);
     }
 
-    private Loop getLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
+    private Loop getLoop(String name, String blueprint, String globalPropertiesJson,
                          String dcaeId, String dcaeUrl, String dcaeBlueprintId)
             throws JsonSyntaxException, IOException {
-        Loop loop = new Loop(name, svgRepresentation);
+        Loop loop = new Loop(name);
         loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
         loop.setLastComputedState(LoopState.DESIGN);
         loop.setDcaeDeploymentId(dcaeId);
@@ -91,9 +88,8 @@ public class LoopToJsonTest {
         return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
     }
 
-    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,
-                                         Integer maxInstancesAllowed) {
-        LoopTemplate template = new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);
+    private LoopTemplate getLoopTemplate(String name, String blueprint, Integer maxInstancesAllowed) {
+        LoopTemplate template = new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
         template.addLoopElementModel(getLoopElementModel("yaml", "microService1",
                 getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1")));
         return template;
@@ -107,11 +103,12 @@ public class LoopToJsonTest {
 
     /**
      * This tests a GSON encode/decode.
+     *
      * @throws IOException In case of failure
      */
     @Test
     public void loopGsonTest() throws IOException {
-        Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest = getLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "123456789", "https://dcaetest.org", "UUID-blueprint");
         OperationalPolicy opPolicy = this.getOperationalPolicy(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), "GuardOpPolicyTest");
@@ -122,7 +119,7 @@ public class LoopToJsonTest {
         loopTest.addMicroServicePolicy(microServicePolicy);
         LoopLog loopLog = getLoopLog(LogType.INFO, "test message", loopTest);
         loopTest.addLog(loopLog);
-        LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", "svg", 1);
+        LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", 1);
         loopTest.setLoopTemplate(loopTemplate);
 
         String jsonSerialized = JsonUtils.GSON_JPA_MODEL.toJson(loopTest);
@@ -136,8 +133,7 @@ public class LoopToJsonTest {
                 .isEqualToComparingFieldByField(loopTest.getComponent("DCAE").getState());
         assertThat(loopTestDeserialized.getComponent("POLICY").getState()).isEqualToComparingOnlyGivenFields(
                 loopTest.getComponent("POLICY").getState(), "stateName", "description");
-        // svg and blueprint not exposed so wont be deserialized
-        assertThat(loopTestDeserialized.getSvgRepresentation()).isEqualTo(null);
+        // blueprint not exposed so wont be deserialized
 
         assertThat(loopTestDeserialized.getOperationalPolicies()).containsExactly(opPolicy);
         assertThat(loopTestDeserialized.getMicroServicePolicies()).containsExactly(microServicePolicy);
@@ -156,7 +152,7 @@ public class LoopToJsonTest {
      */
     @Test
     public void loopServiceTest() throws IOException {
-        Loop loopTest2 = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest2 = getLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "123456789", "https://dcaetest.org", "UUID-blueprint");
 
         JsonObject jsonModel = new GsonBuilder().create()
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
index 6449a8966..02135933e 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
@@ -256,7 +256,7 @@ public class PolicyComponentTest {
      */
     @Test
     public void createPoliciesPayloadPdpGroupTest() throws IOException {
-        Loop loopTest = new Loop("ControlLoopTest", "<xml></xml>");
+        Loop loopTest = new Loop("ControlLoopTest");
         PolicyModel policyModel1 = new PolicyModel("onap.policies.monitoring.test", null, "1.0.0");
 
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", policyModel1, true,
@@ -285,7 +285,7 @@ public class PolicyComponentTest {
 
         loopTest.addOperationalPolicy(opLegacyPolicy);
 
-        LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", "svg", 1, null);
+        LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", 1, null);
         loopTemplate.setDcaeBlueprintId("UUID-blueprint");
         loopTest.setLoopTemplate(loopTemplate);