471 files changed, 3274 insertions, 2462 deletions

diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 000000000..d962fc74a
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>policy-clamp</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-common</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Common utilities and code for the TOSCA Control Loop system</description>
+</project>
diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico
index cb712ebd2..cb712ebd2 100755..100644
--- a/docs/_static/favicon.ico
+++ b/docs/_static/favicon.ico
diff --git a/docs/images/user-guide/blueprint_node_type.png b/docs/images/user-guide/blueprint_node_type.png
index 1e5ef6a4a..1e5ef6a4a 100755..100644
--- a/docs/images/user-guide/blueprint_node_type.png
+++ b/docs/images/user-guide/blueprint_node_type.png
diff --git a/docs/images/user-guide/clamp-cds-operation.png b/docs/images/user-guide/clamp-cds-operation.png
index edc4c63aa..edc4c63aa 100755..100644
--- a/docs/images/user-guide/clamp-cds-operation.png
+++ b/docs/images/user-guide/clamp-cds-operation.png
diff --git a/docs/images/user-guide/config-policy-tca.png b/docs/images/user-guide/config-policy-tca.png
index ce5f79bc8..ce5f79bc8 100755..100644
--- a/docs/images/user-guide/config-policy-tca.png
+++ b/docs/images/user-guide/config-policy-tca.png
diff --git a/docs/images/user-guide/deploy-params.png b/docs/images/user-guide/deploy-params.png
index 9d003258f..9d003258f 100755..100644
--- a/docs/images/user-guide/deploy-params.png
+++ b/docs/images/user-guide/deploy-params.png
diff --git a/docs/images/user-guide/op-policy-box-policy.png b/docs/images/user-guide/op-policy-box-policy.png
index 89c6265ba..89c6265ba 100755..100644
--- a/docs/images/user-guide/op-policy-box-policy.png
+++ b/docs/images/user-guide/op-policy-box-policy.png
diff --git a/docs/images/user-guide/open-menu-prop.png b/docs/images/user-guide/open-menu-prop.png
index 046e2a3d3..046e2a3d3 100755..100644
--- a/docs/images/user-guide/open-menu-prop.png
+++ b/docs/images/user-guide/open-menu-prop.png
diff --git a/docs/images/user-guide/policy-submitted.png b/docs/images/user-guide/policy-submitted.png
index 04a9df358..04a9df358 100755..100644
--- a/docs/images/user-guide/policy-submitted.png
+++ b/docs/images/user-guide/policy-submitted.png
diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 5a958e29b..75c629562 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,7 +1,7 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "6.1.1-SNAPSHOT",
+    "version" : "6.1.2-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
   "host" : "localhost:37747",
@@ -1802,4 +1802,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 99dca1882..9d51932ef 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20210426134156+02'00')
-/ModDate (D:20210426134156+02'00')
+/CreationDate (D:20210510121240+01'00')
+/ModDate (D:20210510121240+01'00')
 >>
 endobj
 2 0 obj
diff --git a/models/pom.xml b/models/pom.xml
new file mode 100644
index 000000000..380ae0c03
--- /dev/null
+++ b/models/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>policy-clamp</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-models</artifactId>
+    <name>${project.artifactId}</name>
+</project>
diff --git a/participant/participant-impl/participant-impl-cds/pom.xml b/participant/participant-impl/participant-impl-cds/pom.xml
new file mode 100644
index 000000000..ccdd8bee7
--- /dev/null
+++ b/participant/participant-impl/participant-impl-cds/pom.xml
@@ -0,0 +1,34 @@
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant-impl</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-participant-impl-cds</artifactId>
+    <name>${project.artifactId}</name>
+    <description>CDS participant, that allows CDS to partake in control loops</description>
+</project>
diff --git a/participant/participant-impl/participant-impl-dcae/pom.xml b/participant/participant-impl/participant-impl-dcae/pom.xml
new file mode 100644
index 000000000..6186ced61
--- /dev/null
+++ b/participant/participant-impl/participant-impl-dcae/pom.xml
@@ -0,0 +1,34 @@
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant-impl</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-participant-impl-dcae</artifactId>
+    <name>${project.artifactId}</name>
+    <description>DCAE participant, that allows DCAE to partake in control loops</description>
+</project>
diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml
new file mode 100644
index 000000000..a85c5fdbf
--- /dev/null
+++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml
@@ -0,0 +1,34 @@
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant-impl</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-participant-impl-kubernetes</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Kubernetes participant, that allows microservices running in Kubernetes to partake in control loops</description>
+</project>
diff --git a/participant/participant-impl/participant-impl-policy/pom.xml b/participant/participant-impl/participant-impl-policy/pom.xml
new file mode 100644
index 000000000..a5a75626e
--- /dev/null
+++ b/participant/participant-impl/participant-impl-policy/pom.xml
@@ -0,0 +1,34 @@
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant-impl</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-participant-impl-policy</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Policy participant, that allows Policy to partake in control loops</description>
+</project>
diff --git a/participant/participant-impl/participant-impl-simulator/pom.xml b/participant/participant-impl/participant-impl-simulator/pom.xml
new file mode 100644
index 000000000..d54a23e53
--- /dev/null
+++ b/participant/participant-impl/participant-impl-simulator/pom.xml
@@ -0,0 +1,34 @@
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant-impl</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-participant-impl-simulator</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Participant simulator, used to test control loops</description>
+</project>
diff --git a/participant/participant-impl/pom.xml b/participant/participant-impl/pom.xml
new file mode 100644
index 000000000..6c67bfa51
--- /dev/null
+++ b/participant/participant-impl/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-participant-impl</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>participant-impl-simulator</module>
+        <module>participant-impl-dcae</module>
+        <module>participant-impl-policy</module>
+        <module>participant-impl-cds</module>
+        <module>participant-impl-kubernetes</module>
+    </modules>
+</project>
diff --git a/participant/participant-intermediary/pom.xml b/participant/participant-intermediary/pom.xml
new file mode 100644
index 000000000..df354d46c
--- /dev/null
+++ b/participant/participant-intermediary/pom.xml
@@ -0,0 +1,37 @@
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp.participant</groupId>
+        <artifactId>policy-clamp-participant</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.policy.clamp.participant</groupId>
+    <artifactId>policy-clamp-participant-intermediary</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Common intermediary library for managing DMaaP participant messaging and holding participant and control
+     loop state</description>
+
+</project>
diff --git a/participant/pom.xml b/participant/pom.xml
new file mode 100644
index 000000000..c18ee14d0
--- /dev/null
+++ b/participant/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>policy-clamp</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.policy.clamp.participant</groupId>
+    <artifactId>policy-clamp-participant</artifactId>
+    <name>${project.artifactId}</name>
+    <description>participants that communicate with the runtime server to handle control loops</description>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>participant-intermediary</module>
+        <module>participant-impl</module>
+    </modules>
+</project>
diff --git a/pom.xml b/pom.xml
index dccefcafe..6f86ff513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,1329 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ONAP POLICY-CLAMP
-  ================================================================================
-  Copyright (C) 2017-2021 AT&T Intellectual Property. All rights
-                              reserved.
+  Copyright (C) 2021 Nordix Foundation.
   ================================================================================
   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
+       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============================================
-  ===================================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.policy</groupId>
-    <artifactId>clamp</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
-    <name>policy-clamp</name>
+  ============LICENSE_END=========================================================
+  -->
 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.3.0</version>
-        <relativePath/>
+        <version>3.4.0-SNAPSHOT</version>
     </parent>
 
-    <description>
-        This is the MAVEN project that builds everything for ONAP POLICY-CLAMP.
-        Docker engine is normally requires to perfom all possible tasks (including integration tests)
-
-        It can build:
-        - The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code.
-        - The DOCKER images for:
-        * POLICY-CLAMP backend (Java Spring)
-        * POLICY-CLAMP frontend (Javascript React)
-
-        It can test:
-        - The POLICY-CLAMP backend, JAVA unit testing
-        - The POLICY-CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae
-        emulator written in python)
-        - The POLICY-CLAMP frontend, Javascript tests (NodeJS(NPM) + JEST and Enzyme for React)
-
-        The test coverage for dev's can be found after a "clean install" build in:
-        - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged)
-        or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec
-        - Clamp frontend: target/ui-react/coverage
-
-        Useful mvn commands:
-        - mvn clean install: Build Clamp backend JAR + unit tests + integration tests + NPM tests (+coverage for all)
-        - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it
-        does not require a DOCKER engine
-        - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images
+    <groupId>org.onap.policy.clamp</groupId>
+    <artifactId>policy-clamp</artifactId>
+    <version>6.1.2-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
 
-        To start POLICY-CLAMP (Build it before):
-        - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml
-        - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh
-        - Use your IDE to use the Jar or start NVM/NPM
+    <packaging>pom</packaging>
 
+    <description>
+        This is the root Maven module for the policy-clamp project.
+
+        It contains the following modules:
+        - policy-clamp-common: Common code for all CLAMP modules
+        - policy-clamp-models: POJOs and other model code for REST and DMaaP messages and for persistence
+        - policy-clamp-runtime: The runtime server for CLAMP
+        - policy-clamp-participant: Modules for CLAMP control loop participants
+            o policy-clamp-participant-intermediary: A common JAR that handles participant state and DMaaP handling
+            o policy-clamp-participant-impl-cds: A standard participant for interworking with CDS
+            o policy-clamp-participant-impl-dcae: A standard participant for interworking with DCAE
+            o policy-clamp-participant-impl-kubernetes: A standard participant for Kubernetes microservices
+            o policy-clamp-participant-impl-policy: A standard participant for handling polcies for Policy Framework
+            o policy-clamp-participant-impl-simulator: A participant simulator for integration testing
     </description>
 
     <properties>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <clamp.project.version>${project.version}</clamp.project.version>
-        <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <eelf.core.version>1.0.0</eelf.core.version>
-        <camel.version>3.7.3</camel.version>
-        <springboot.version>2.4.4</springboot.version>
-
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/jacoco-html-xml-reports/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
-        <sonar.projectVersion>${project.version}</sonar.projectVersion>
-        <sonar.log.level>DEBUG</sonar.log.level>
-        <sonar.nodejs.executable>${project.build.directory}/${ui.react.src}/node/node</sonar.nodejs.executable>
-        <sonar.verbose>true</sonar.verbose>
-        <sonar.sources>src/main,${project.build.directory}/${ui.react.src}/src</sonar.sources>
-        <sonar.exclusions>src/main/resources/**</sonar.exclusions>
-        <sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
-        <sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info
-        </sonar.javascript.lcov.reportPaths>
-        <sonar.coverage.exclusions>
-            src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js
-        </sonar.coverage.exclusions>
-        <docker.push.registry>localhost:5000</docker.push.registry>
-        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
-        <docker.skip.build>true</docker.skip.build>
-        <docker.skip.push>true</docker.skip.push>
-        <docker.skip.tag>true</docker.skip.tag>
-        <skip.staging.artifacts>false</skip.staging.artifacts>
-        <python.http.proxy.param/>
-        <tomcat.version>9.0.45</tomcat.version>
-        <ui.react.src>ui-react</ui.react.src>
-        <ui.react.lib.src>ui-react-lib</ui.react.lib.src>
-        <npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
-
-        <policy.models.version>2.4.0</policy.models.version>
-        <policy.common.version>1.8.1</policy.common.version>
+        <policy.common.version>1.9.0-SNAPSHOT</policy.common.version>
+        <policy.models.version>2.5.0-SNAPSHOT</policy.models.version>
     </properties>
 
-    <profiles>
-        <!-- BEGIN: NOT USABLE profiles, those are defined when specific flags are enabled -->
-        <profile>
-            <id>without-test</id>
-            <activation>
-                <property>
-                    <name>maven.test.skip</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <docker.skip.run>true</docker.skip.run>
-                <docker.skip>true</docker.skip>
-            </properties>
-        </profile>
-        <profile>
-            <id>without-IT-only</id>
-            <activation>
-                <property>
-                    <name>skipITs</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <docker.skip.run>true</docker.skip.run>
-                <docker.skip>true</docker.skip>
-            </properties>
-        </profile>
-        <profile>
-            <id>without-IT-only2</id>
-            <activation>
-                <property>
-                    <name>skipTests</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <docker.skip.run>true</docker.skip.run>
-                <docker.skip>true</docker.skip>
-            </properties>
-        </profile>
-        <!-- END: NOT USABLE profiles, those are defined when specific flags are enabled -->
-        <profile>
-            <id>docker</id>
-            <properties>
-                <skip.staging.artifacts>true</skip.staging.artifacts>
-                <docker.skip.build>false</docker.skip.build>
-                <docker.skip.tag>false</docker.skip.tag>
-                <docker.skip.push>false</docker.skip.push>
-                <docker.skip>false</docker.skip>
-            </properties>
-        </profile>
-    </profiles>
-
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ONAP Release Repository</name>
-            <url>https://nexus.onap.org/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ONAP Snapshot Repository</name>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-        </snapshotRepository>
-        <site>
-            <id>ecomp-site</id>
-            <url>dav:https://nexus.onap.org/content/sites/site/org/onap/policy/clamp/${project.version}</url>
-        </site>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>onap-public</id>
-            <name>onap-public</name>
-            <url>https://nexus.onap.org/content/repositories/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ONAP Release Repository</name>
-            <url>https://nexus.onap.org/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>ecomp-staging</id>
-            <name>ONAP Staging Repository</name>
-            <url>https://nexus.onap.org/content/repositories/staging/</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>ONAP Snapshot Repository</name>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>central</id>
-            <url>http://repo1.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>onap-public</id>
-            <name>onap-public</name>
-            <url>https://nexus.onap.org/content/repositories/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>central</id>
-            <url>http://repo1.maven.org/maven2/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spring Boot BOM -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${springboot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- Camel BOM -->
-            <dependency>
-                <groupId>org.apache.camel.springboot</groupId>
-                <artifactId>camel-spring-boot-bom</artifactId>
-                <version>${camel.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <modules>
+        <module>common</module>
+        <module>models</module>
+        <module>runtime</module>
+        <module>participant</module>
+    </modules>
 
     <dependencies>
         <dependency>
-            <groupId>com.att.eelf</groupId>
-            <artifactId>eelf-core</artifactId>
-            <version>${eelf.core.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.powermock</groupId>
-                    <artifactId>powermock-module-junit4</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.powermock</groupId>
-                    <artifactId>powermock-api-mockito</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.janino</groupId>
-            <artifactId>janino</artifactId>
-            <version>3.0.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-el</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-websocket</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-annotations-api</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <!-- For CAMEL -->
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-http-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-jaxb-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-servlet-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-gson-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-swagger-java-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>jsr311-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-ext</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Spring famework -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-json</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>jakarta.el</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.vaadin.external.google</groupId>
-                    <artifactId>android-json</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <!-- Policy dependencies mainly for the models required -->
-        <dependency>
-            <groupId>org.onap.policy.models</groupId>
-            <artifactId>policy-models-pdp</artifactId>
-            <version>${policy.models.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.containers</groupId>
-                    <artifactId>jersey-container-servlet</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-reflect</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib-common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Others dependencies -->
-        <!-- Jaxws is required for AAF -->
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aaf.authz</groupId>
-            <artifactId>aaf-cadi-aaf</artifactId>
-            <version>2.1.15</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs2</artifactId>
-            <version>2.8.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-        <!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <version>3.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-            <version>1.0.1.Final</version>
-        </dependency>
-
-
-        <!-- Remove the MYSQL connector and replace it by Mariadb -->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>2.7.2</version>
-        </dependency>
-        <!-- For SDC Controller -->
-        <dependency>
-            <groupId>org.onap.sdc.sdc-distribution-client</groupId>
-            <artifactId>sdc-distribution-client</artifactId>
-            <version>1.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdc.sdc-tosca</groupId>
-            <artifactId>sdc-tosca</artifactId>
-            <version>1.5.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.28</version>
-        </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-
-        <!-- TESTING -->
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>5.7.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java-core</artifactId>
-            <version>3.2.7</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java</artifactId>
-            <version>3.2.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils-test</artifactId>
-            <version>${policy.common.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <finalName>policy-clamp-backend</finalName>
-
-        <testResources>
-            <testResource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>clds/aaf/**</exclude>
-                </excludes>
-            </testResource>
-            <testResource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>clds/aaf/**</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <excludes>
-                    <exclude>**/*.jks</exclude>
-                    <exclude>**/*.csar</exclude>
-                </excludes>
-                <filtering>true</filtering>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources/https</directory>
-                <includes>
-                    <include>**.jks</include>
-                </includes>
-                <filtering>false</filtering>
-                <targetPath>https</targetPath>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources/example/sdc</directory>
-                <includes>
-                    <include>**.csar</include>
-                </includes>
-                <filtering>false</filtering>
-                <targetPath>example/sdc</targetPath>
-            </testResource>
-        </testResources>
-        <resources>
-            <!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise
-                they will be broken and unreadable -->
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>clds/aaf/**</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>clds/aaf/**</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${ui.react.src}</directory>
-                <excludes>
-                    <exclude>node_modules</exclude>
-                </excludes>
-                <includes>
-                    <include>src/**</include>
-                    <include>public/**</include>
-                    <include>package.json</include>
-                    <include>package-lock.json</include>
-                </includes>
-                <filtering>true</filtering>
-                <targetPath>${project.build.directory}/${ui.react.src}</targetPath>
-            </resource>
-            <resource>
-                <directory>${ui.react.src}</directory>
-                <includes>
-                    <include>src/**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/__snapshots__/**</exclude>
-                    <exclude>**/**.test.js</exclude>
-                </excludes>
-                <filtering>true</filtering>
-                <targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
-            </resource>
-            <resource>
-                <directory>${ui.react.lib.src}</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>node_modules/**</exclude>
-                    <exclude>package-lock.json</exclude>
-                </excludes>
-                <filtering>true</filtering>
-                <targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>de.jpdigital</groupId>
-                <artifactId>hibernate52-ddl-maven-plugin</artifactId>
-                <version>2.2.0</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>2.3.0</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>gen-ddl</goal>
-                        </goals>
-                        <configuration>
-                            <packages>
-                                <param>org.onap.policy.clamp</param>
-                            </packages>
-                            <dialects>
-                                <param>MARIADB53</param>
-                            </dialects>
-                            <outputDirectory>${project.basedir}/extra/sql/bulkload/</outputDirectory>
-                            <outputFileNameSuffix>create-tables</outputFileNameSuffix>
-                            <!-- <createDropStatements>true</createDropStatements> -->
-                            <omitDialectFromFileName>true</omitDialectFromFileName>
-                        </configuration>
-                    </execution>
-                </executions>
-
-            </plugin>
-            <!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate
-                a list of .adoc files containing the APIs info in more structured way -->
-            <plugin>
-                <groupId>io.github.swagger2markup</groupId>
-                <artifactId>swagger2markup-maven-plugin</artifactId>
-                <version>1.3.3</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.github.swagger2markup</groupId>
-                        <artifactId>swagger2markup-import-files-ext</artifactId>
-                        <version>1.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>io.github.swagger2markup</groupId>
-                        <artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-                        <version>1.3.3</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
-                    <outputDir>${project.build.directory}/asciidoc/generated</outputDir>
-                    <config>
-                        <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
-                    </config>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>convertSwagger2markup</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Run the generated asciidoc through Asciidoctor to generate other documentation
-                types, such as PDFs or HTML5 -->
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>1.5.7.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-pdf</artifactId>
-                        <version>1.5.0-alpha.10.1</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
-                    <sourceDocumentName>swagger.adoc</sourceDocumentName>
-                    <attributes>
-                        <doctype>book</doctype>
-                        <toc>left</toc>
-                        <toclevels>3</toclevels>
-                        <numbered/>
-                        <hardbreaks/>
-                        <sectlinks/>
-                        <sectanchors/>
-                        <generated>${project.build.directory}/asciidoc/generated</generated>
-                    </attributes>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>output-html</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <backend>html5</backend>
-                            <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
-                            <outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>output-pdf</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <backend>pdf</backend>
-                            <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>docker-tags</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>${project.basedir}/src/main/script/TagVersion.groovy</source>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm-repos-selection</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>${project.basedir}/src/main/script/SelectNpmRepo.groovy</source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>jar-with-only-classes</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>classes</classifier>
-                            <includes>
-                                <include>org/**</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/policy-clamp-backend-classes.jar</file>
-                                    <type>jar</type>
-                                    <classifier>classes</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>reserve-port-for-tests</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>reserve-network-port</goal>
-                        </goals>
-                        <configuration>
-                            <portNames>
-                                <portName>docker.mariadb.port.host</portName>
-                                <portName>docker.http-cache.port.host</portName>
-                                <portName>clamp.it.tests.http-redirected</portName>
-                                <portName>clamp.it.tests.robotframework.http</portName>
-                                <portName>clamp.it.tests.https</portName>
-                                <portName>clamp.it.tests.http</portName>
-                            </portNames>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${springboot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-                <configuration>
-                    <forkCount>1C</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <useSystemClassLoader>false</useSystemClassLoader>
-                    <argLine>${surefireArgLine}</argLine>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
-                <executions>
-                    <execution>
-                        <id>integration-tests</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <additionalClasspathElements>
-                                <additionalClasspathElement>${project.build.directory}/classes
-                                </additionalClasspathElement>
-                            </additionalClasspathElements>
-                            <includes>
-                                <include>**/*ItCase.java</include>
-                            </includes>
-                            <forkCount>1C</forkCount>
-                            <reuseForks>true</reuseForks>
-                            <useSystemClassLoader>false</useSystemClassLoader>
-                            <argLine>${failsafeArgLine}</argLine>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.35.0</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
-                        <version>4.5.5</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <verbose>true</verbose>
-                    <apiVersion>1.35</apiVersion>
-                    <images>
-                        <image>
-                            <name>docker.io/mariadb:10.5.4</name>
-                            <alias>mariadb</alias>
-                            <run>
-                                <env>
-                                    <MYSQL_ROOT_PASSWORD>strong_pitchou</MYSQL_ROOT_PASSWORD>
-                                </env>
-                                <hostname>mariadb</hostname>
-                                <volumes>
-                                    <bind>
-                                        <volume>${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d:rw</volume>
-                                        <volume>${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d</volume>
-                                    </bind>
-                                </volumes>
-                                <wait>
-                                    <log>port: 3306</log>
-                                    <time>300000</time>
-                                    <exec>
-                                        <preStop>/docker-entrypoint-initdb.d/dump/backup-data-only.sh</preStop>
-                                    </exec>
-                                </wait>
-                                <ports>
-                                    <port>${docker.mariadb.port.host}:3306</port>
-                                </ports>
-                                <network>
-                                    <mode>bridge</mode>
-                                </network>
-                            </run>
-                        </image>
-                        <image>
-                            <name>docker.io/python:2-slim</name>
-                            <alias>python</alias>
-                            <run>
-                                <hostname>python</hostname>
-                                <volumes>
-                                    <bind>
-                                        <volume>
-                                            ${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app
-                                        </volume>
-                                        <volume>
-                                            ${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache
-                                        </volume>
-                                    </bind>
-                                </volumes>
-                                <wait>
-                                    <tcp>
-                                        <ports>
-                                            <port>8080</port>
-                                        </ports>
-                                        <mode>direct</mode>
-                                    </tcp>
-                                    <time>120000</time>
-                                </wait>
-                                <ports>
-                                    <port>${docker.http-cache.port.host}:8080</port>
-                                </ports>
-                                <workingDir>/usr/src/http-cache-app</workingDir>
-                                <cmd>
-                                    <shell>./start_http_cache.sh ${python.http.proxy.param}
-                                        --python_proxyaddress=localhost:${docker.http-cache.port.host}
-                                    </shell>
-                                </cmd>
-                                <network>
-                                    <mode>bridge</mode>
-                                </network>
-                            </run>
-                        </image>
-                        <image>
-                            <name>onap/policy-clamp-backend</name>
-                            <alias>onap-policy-clamp-backend</alias>
-                            <run>
-                                <skip>true</skip>
-                            </run>
-                            <build>
-                                <cleanup>true</cleanup>
-                                <tags>
-                                    <tag>latest</tag>
-                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                    <tag>${project.docker.latesttag.version}</tag>
-                                </tags>
-                                <!-- A relative path is looked up in ${project.basedir}/src/main/docker by
-                                    default -->
-                                <dockerFile>backend/Dockerfile</dockerFile>
-                                <assembly>
-                                    <descriptor>backend/backend-files.xml</descriptor>
-                                    <name>onap-policy-clamp-backend</name>
-                                </assembly>
-                            </build>
-                        </image>
-                        <image>
-                            <name>onap/policy-clamp-frontend</name>
-                            <alias>onap-policy-clamp-frontend</alias>
-                            <run>
-                                <skip>true</skip>
-                            </run>
-                            <build>
-                                <cleanup>true</cleanup>
-                                <tags>
-                                    <tag>latest</tag>
-                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                    <tag>${project.docker.latesttag.version}</tag>
-                                </tags>
-                                <!-- A relative path is looked up in ${project.basedir}/src/main/docker by
-                                    default -->
-                                <dockerFile>frontend/Dockerfile</dockerFile>
-                                <assembly>
-                                    <descriptor>frontend/frontend-files.xml</descriptor>
-                                    <name>onap-policy-clamp-frontend</name>
-                                </assembly>
-                            </build>
-                        </image>
-                    </images>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>generate-images</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>push-images</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>docker-start-for-it</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>docker-stop-for-it</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
-                <configuration>
-                    <dumpOnExit>true</dumpOnExit>
-                    <append>true</append>
-                    <includes>
-                        <include>org/onap/policy/clamp/**</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                            <propertyName>surefireArgLine</propertyName>
-                            <!-- <append>true</append> -->
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                            <propertyName>failsafeArgLine</propertyName>
-                            <!-- <append>true</append> -->
-                            <!-- Need to overwrite the policy integration parent flag -->
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet
-                                        implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco.exec</destFile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>report-xml</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Setting explicit path, so that we remember where it picks them up from -->
-                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
-                            <outputDirectory>${project.build.directory}/jacoco-html-xml-reports</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- This plugin will be useful when we will have multi-modules project -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>1.3.1</version>
-            </plugin>
-
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.11.3</version>
-                <configuration>
-                    <installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
-                    <npmDownloadRoot>${repo.npm}</npmDownloadRoot>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install_node_and_npm</id>
-                        <goals>
-                            <goal>install-node-and-npm</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <nodeVersion>v14.16.1</nodeVersion>
-                            <npmVersion>6.14.13</npmVersion>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm_install</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <phase>compile</phase>
-                        <configuration>
-                            <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm_test</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <phase>test</phase>
-                        <configuration>
-                            <skip>${maven.test.skip}</skip>
-                            <arguments>run-script test:coverage</arguments>
-                            <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm_install_lib</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                        <configuration>
-                            <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm_build_lib</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                        <configuration>
-                            <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
-                            <arguments>run build</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm_publish</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                        <configuration>
-                            <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
-                            <arguments>publish</arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.sonarsource.scanner.maven</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.7.0.1746</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.3.2</version>
-                <executions>
-                    <execution>
-                        <id>libIndexCheck</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>bash</executable>
-                    <arguments>
-                        <argument>${project.basedir}/src/main/script/checkLibIndex.sh</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <!-- Plugin to generate a X509 Certificate for https tests  -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>keytool-maven-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <id>add-certificate-for-dev</id>
-                        <configuration>
-                            <keystore>${project.build.directory}/classes/clds/aaf/org.onap.clamp.p12</keystore>
-                            <storepass>China in the Spring</storepass>
-                            <alias>clamptest</alias>
-                            <storetype>PKCS12</storetype>
-                            <keyalg>RSA</keyalg>
-                            <dname>cn=CN, ou=OU, o=O, c=C</dname>
-                            <validity>365</validity>
-                        </configuration>
-                        <goals>
-                            <goal>generateKeyPair</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
-                    <execution>
-                        <id>add-certificate-for-test</id>
-                        <configuration>
-                            <keystore>${project.build.directory}/test-classes/clds/aaf/org.onap.clamp.p12</keystore>
-                            <storepass>China in the Spring</storepass>
-                            <alias>clamptest</alias>
-                            <storetype>PKCS12</storetype>
-                            <keyalg>RSA</keyalg>
-                            <dname>cn=CN, ou=OU, o=O, c=C</dname>
-                            <validity>365</validity>
-                        </configuration>
-                        <goals>
-                            <goal>generateKeyPair</goal>
-                        </goals>
-                        <phase>generate-test-resources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/extra/bin-for-dev/start-backend.sh b/runtime/extra/bin-for-dev/start-backend.sh
index df513d263..df513d263 100755
--- a/extra/bin-for-dev/start-backend.sh
+++ b/runtime/extra/bin-for-dev/start-backend.sh
diff --git a/extra/bin-for-dev/start-db.sh b/runtime/extra/bin-for-dev/start-db.sh
index 97f8de1f5..97f8de1f5 100755
--- a/extra/bin-for-dev/start-db.sh
+++ b/runtime/extra/bin-for-dev/start-db.sh
diff --git a/extra/bin-for-dev/start-emulator.sh b/runtime/extra/bin-for-dev/start-emulator.sh
index 274d88939..274d88939 100755
--- a/extra/bin-for-dev/start-emulator.sh
+++ b/runtime/extra/bin-for-dev/start-emulator.sh
diff --git a/extra/bin-for-dev/start-frontend.sh b/runtime/extra/bin-for-dev/start-frontend.sh
index d5f4d2414..d5f4d2414 100755
--- a/extra/bin-for-dev/start-frontend.sh
+++ b/runtime/extra/bin-for-dev/start-frontend.sh
diff --git a/extra/docker/clamp/clamp.env b/runtime/extra/docker/clamp/clamp.env
index 5d31aa42e..5d31aa42e 100644
--- a/extra/docker/clamp/clamp.env
+++ b/runtime/extra/docker/clamp/clamp.env
diff --git a/extra/docker/clamp/docker-compose.yml b/runtime/extra/docker/clamp/docker-compose.yml
index c56be0aae..c56be0aae 100644
--- a/extra/docker/clamp/docker-compose.yml
+++ b/runtime/extra/docker/clamp/docker-compose.yml
diff --git a/extra/docker/mariadb/conf1/my.cnf b/runtime/extra/docker/mariadb/conf1/my.cnf
index c6631fb4e..c6631fb4e 100644
--- a/extra/docker/mariadb/conf1/my.cnf
+++ b/runtime/extra/docker/mariadb/conf1/my.cnf
diff --git a/extra/docker/mariadb/conf2/my.cnf b/runtime/extra/docker/mariadb/conf2/my.cnf
index bf5f9c177..bf5f9c177 100644
--- a/extra/docker/mariadb/conf2/my.cnf
+++ b/runtime/extra/docker/mariadb/conf2/my.cnf
diff --git a/extra/docker/mariadb/conf3/my.cnf b/runtime/extra/docker/mariadb/conf3/my.cnf
index 74f7a31b0..74f7a31b0 100644
--- a/extra/docker/mariadb/conf3/my.cnf
+++ b/runtime/extra/docker/mariadb/conf3/my.cnf
diff --git a/extra/sql/bootstrap-database.sh b/runtime/extra/sql/bootstrap-database.sh
index 224a813db..224a813db 100755
--- a/extra/sql/bootstrap-database.sh
+++ b/runtime/extra/sql/bootstrap-database.sh
diff --git a/extra/sql/bulkload/create-db.sql b/runtime/extra/sql/bulkload/create-db.sql
index ea4d97c1b..ea4d97c1b 100644
--- a/extra/sql/bulkload/create-db.sql
+++ b/runtime/extra/sql/bulkload/create-db.sql
diff --git a/extra/sql/bulkload/create-tables.sql b/runtime/extra/sql/bulkload/create-tables.sql
index 111a4058e..111a4058e 100644
--- a/extra/sql/bulkload/create-tables.sql
+++ b/runtime/extra/sql/bulkload/create-tables.sql
diff --git a/extra/sql/dump/backup-data-only.sh b/runtime/extra/sql/dump/backup-data-only.sh
index 8ebebf91d..8ebebf91d 100755
--- a/extra/sql/dump/backup-data-only.sh
+++ b/runtime/extra/sql/dump/backup-data-only.sh
diff --git a/extra/sql/dump/backup-database.sh b/runtime/extra/sql/dump/backup-database.sh
index 1ae7ee2b7..1ae7ee2b7 100755
--- a/extra/sql/dump/backup-database.sh
+++ b/runtime/extra/sql/dump/backup-database.sh
diff --git a/extra/sql/dump/load-fake-data.sh b/runtime/extra/sql/dump/load-fake-data.sh
index 572972683..572972683 100755
--- a/extra/sql/dump/load-fake-data.sh
+++ b/runtime/extra/sql/dump/load-fake-data.sh
diff --git a/extra/sql/dump/test-data.sql b/runtime/extra/sql/dump/test-data.sql
index 367ddb61d..367ddb61d 100644
--- a/extra/sql/dump/test-data.sql
+++ b/runtime/extra/sql/dump/test-data.sql
diff --git a/runtime/pom.xml b/runtime/pom.xml
new file mode 100644
index 000000000..66d555ac7
--- /dev/null
+++ b/runtime/pom.xml
@@ -0,0 +1,1250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP POLICY-CLAMP
+  ================================================================================
+  Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  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============================================
+  ===================================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>policy-clamp</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-clamp-runtime</artifactId>
+    <name>${project.artifactId}</name>
+
+    <description>
+        This is the MAVEN project that builds everything for ONAP POLICY-CLAMP.
+        Docker engine is normally required to perfom all possible tasks (including integration tests)
+
+        It can build:
+        - The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code.
+        - The DOCKER images for:
+        * POLICY-CLAMP backend (Java Spring)
+        * POLICY-CLAMP frontend (Javascript React)
+
+        It can test:
+        - The POLICY-CLAMP backend, JAVA unit testing
+        - The POLICY-CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae
+        emulator written in python)
+        - The POLICY-CLAMP frontend, Javascript tests (NodeJS(NPM) + JEST and Enzyme for React)
+
+        The test coverage for dev's can be found after a "clean install" build in:
+        - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged)
+        or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec
+        - Clamp frontend: target/ui-react/coverage
+
+        Useful mvn commands:
+        - mvn clean install: Build Clamp backend JAR + unit tests + integration tests + NPM tests (+coverage for all)
+        - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it
+        does not require a DOCKER engine
+        - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images
+
+        To start POLICY-CLAMP (Build it before):
+        - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml
+        - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh
+        - Use your IDE to use the Jar or start NVM/NPM
+
+    </description>
+
+    <properties>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <clamp.project.version>${project.version}</clamp.project.version>
+        <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <eelf.core.version>1.0.0</eelf.core.version>
+        <camel.version>3.7.3</camel.version>
+        <springboot.version>2.4.4</springboot.version>
+
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/jacoco-html-xml-reports/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <sonar.log.level>DEBUG</sonar.log.level>
+        <sonar.nodejs.executable>${project.build.directory}/${ui.react.src}/node/node</sonar.nodejs.executable>
+        <sonar.verbose>true</sonar.verbose>
+        <sonar.sources>src/main,${project.build.directory}/${ui.react.src}/src</sonar.sources>
+        <sonar.exclusions>src/main/resources/**</sonar.exclusions>
+        <sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
+        <sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info
+        </sonar.javascript.lcov.reportPaths>
+        <sonar.coverage.exclusions>
+            src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js
+        </sonar.coverage.exclusions>
+        <docker.push.registry>localhost:5000</docker.push.registry>
+        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+        <docker.skip.build>true</docker.skip.build>
+        <docker.skip.push>true</docker.skip.push>
+        <docker.skip.tag>true</docker.skip.tag>
+        <skip.staging.artifacts>false</skip.staging.artifacts>
+        <python.http.proxy.param/>
+        <tomcat.version>9.0.45</tomcat.version>
+        <ui.react.src>ui-react</ui.react.src>
+        <ui.react.lib.src>ui-react-lib</ui.react.lib.src>
+        <npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
+    </properties>
+
+    <profiles>
+        <!-- BEGIN: NOT USABLE profiles, those are defined when specific flags are enabled -->
+        <profile>
+            <id>without-test</id>
+            <activation>
+                <property>
+                    <name>maven.test.skip</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <docker.skip.run>true</docker.skip.run>
+                <docker.skip>true</docker.skip>
+            </properties>
+        </profile>
+        <profile>
+            <id>without-IT-only</id>
+            <activation>
+                <property>
+                    <name>skipITs</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <docker.skip.run>true</docker.skip.run>
+                <docker.skip>true</docker.skip>
+            </properties>
+        </profile>
+        <profile>
+            <id>without-IT-only2</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <docker.skip.run>true</docker.skip.run>
+                <docker.skip>true</docker.skip>
+            </properties>
+        </profile>
+        <!-- END: NOT USABLE profiles, those are defined when specific flags are enabled -->
+        <profile>
+            <id>docker</id>
+            <properties>
+                <skip.staging.artifacts>true</skip.staging.artifacts>
+                <docker.skip.build>false</docker.skip.build>
+                <docker.skip.tag>false</docker.skip.tag>
+                <docker.skip.push>false</docker.skip.push>
+                <docker.skip>false</docker.skip>
+            </properties>
+        </profile>
+    </profiles>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Spring Boot BOM -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${springboot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Camel BOM -->
+            <dependency>
+                <groupId>org.apache.camel.springboot</groupId>
+                <artifactId>camel-spring-boot-bom</artifactId>
+                <version>${camel.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.att.eelf</groupId>
+            <artifactId>eelf-core</artifactId>
+            <version>${eelf.core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-module-junit4</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>janino</artifactId>
+            <version>3.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-annotations-api</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <!-- For CAMEL -->
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-http-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-jaxb-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-servlet-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-gson-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-swagger-java-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-ext</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Spring famework -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>jakarta.el</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- Policy dependencies mainly for the models required -->
+        <dependency>
+            <groupId>org.onap.policy.models</groupId>
+            <artifactId>policy-models-pdp</artifactId>
+            <version>${policy.models.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.jersey.containers</groupId>
+                    <artifactId>jersey-container-servlet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-reflect</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Others dependencies -->
+        <!-- Jaxws is required for AAF -->
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+            <version>2.1.15</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs2</artifactId>
+            <version>2.8.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+        <!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+            <version>1.0.1.Final</version>
+        </dependency>
+
+
+        <!-- Remove the MYSQL connector and replace it by Mariadb -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.7.2</version>
+        </dependency>
+        <!-- For SDC Controller -->
+        <dependency>
+            <groupId>org.onap.sdc.sdc-distribution-client</groupId>
+            <artifactId>sdc-distribution-client</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.sdc.sdc-tosca</groupId>
+            <artifactId>sdc-tosca</artifactId>
+            <version>1.5.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.28</version>
+        </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.3</version>
+        </dependency>
+
+        <!-- TESTING -->
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.7.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java-core</artifactId>
+            <version>3.2.7</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java</artifactId>
+            <version>3.2.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils-test</artifactId>
+            <version>${policy.common.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>policy-clamp-backend</finalName>
+
+        <testResources>
+            <testResource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>clds/aaf/**</exclude>
+                </excludes>
+            </testResource>
+            <testResource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>clds/aaf/**</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <excludes>
+                    <exclude>**/*.jks</exclude>
+                    <exclude>**/*.csar</exclude>
+                </excludes>
+                <filtering>true</filtering>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources/https</directory>
+                <includes>
+                    <include>**.jks</include>
+                </includes>
+                <filtering>false</filtering>
+                <targetPath>https</targetPath>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources/example/sdc</directory>
+                <includes>
+                    <include>**.csar</include>
+                </includes>
+                <filtering>false</filtering>
+                <targetPath>example/sdc</targetPath>
+            </testResource>
+        </testResources>
+        <resources>
+            <!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise
+                they will be broken and unreadable -->
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>clds/aaf/**</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>clds/aaf/**</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${ui.react.src}</directory>
+                <excludes>
+                    <exclude>node_modules</exclude>
+                </excludes>
+                <includes>
+                    <include>src/**</include>
+                    <include>public/**</include>
+                    <include>package.json</include>
+                    <include>package-lock.json</include>
+                </includes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}/${ui.react.src}</targetPath>
+            </resource>
+            <resource>
+                <directory>${ui.react.src}</directory>
+                <includes>
+                    <include>src/**</include>
+                </includes>
+                <excludes>
+                    <exclude>**/__snapshots__/**</exclude>
+                    <exclude>**/**.test.js</exclude>
+                </excludes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
+            </resource>
+            <resource>
+                <directory>${ui.react.lib.src}</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
+                <excludes>
+                    <exclude>node_modules/**</exclude>
+                    <exclude>package-lock.json</exclude>
+                </excludes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>de.jpdigital</groupId>
+                <artifactId>hibernate52-ddl-maven-plugin</artifactId>
+                <version>2.2.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.3.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>gen-ddl</goal>
+                        </goals>
+                        <configuration>
+                            <packages>
+                                <param>org.onap.policy.clamp</param>
+                            </packages>
+                            <dialects>
+                                <param>MARIADB53</param>
+                            </dialects>
+                            <outputDirectory>${project.basedir}/extra/sql/bulkload/</outputDirectory>
+                            <outputFileNameSuffix>create-tables</outputFileNameSuffix>
+                            <!-- <createDropStatements>true</createDropStatements> -->
+                            <omitDialectFromFileName>true</omitDialectFromFileName>
+                        </configuration>
+                    </execution>
+                </executions>
+
+            </plugin>
+            <!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate
+                a list of .adoc files containing the APIs info in more structured way -->
+            <plugin>
+                <groupId>io.github.swagger2markup</groupId>
+                <artifactId>swagger2markup-maven-plugin</artifactId>
+                <version>1.3.3</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.github.swagger2markup</groupId>
+                        <artifactId>swagger2markup-import-files-ext</artifactId>
+                        <version>1.3.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.github.swagger2markup</groupId>
+                        <artifactId>swagger2markup-spring-restdocs-ext</artifactId>
+                        <version>1.3.3</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
+                    <outputDir>${project.build.directory}/asciidoc/generated</outputDir>
+                    <config>
+                        <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
+                    </config>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>convertSwagger2markup</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Run the generated asciidoc through Asciidoctor to generate other documentation
+                types, such as PDFs or HTML5 -->
+            <plugin>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+                <version>1.5.7.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj-pdf</artifactId>
+                        <version>1.5.0-alpha.10.1</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
+                    <sourceDocumentName>swagger.adoc</sourceDocumentName>
+                    <attributes>
+                        <doctype>book</doctype>
+                        <toc>left</toc>
+                        <toclevels>3</toclevels>
+                        <numbered/>
+                        <hardbreaks/>
+                        <sectlinks/>
+                        <sectanchors/>
+                        <generated>${project.build.directory}/asciidoc/generated</generated>
+                    </attributes>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>output-html</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                        <configuration>
+                            <backend>html5</backend>
+                            <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+                            <outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>output-pdf</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                        <configuration>
+                            <backend>pdf</backend>
+                            <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>docker-tags</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${project.basedir}/src/main/script/TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-repos-selection</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${project.basedir}/src/main/script/SelectNpmRepo.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>jar-with-only-classes</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>classes</classifier>
+                            <includes>
+                                <include>org/**</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/policy-clamp-backend-classes.jar</file>
+                                    <type>jar</type>
+                                    <classifier>classes</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>reserve-port-for-tests</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <configuration>
+                            <portNames>
+                                <portName>docker.mariadb.port.host</portName>
+                                <portName>docker.http-cache.port.host</portName>
+                                <portName>clamp.it.tests.http-redirected</portName>
+                                <portName>clamp.it.tests.robotframework.http</portName>
+                                <portName>clamp.it.tests.https</portName>
+                                <portName>clamp.it.tests.http</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <forkCount>1C</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                    <argLine>${surefireArgLine}</argLine>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.22.2</version>
+                <executions>
+                    <execution>
+                        <id>integration-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <additionalClasspathElements>
+                                <additionalClasspathElement>${project.build.directory}/classes
+                                </additionalClasspathElement>
+                            </additionalClasspathElements>
+                            <includes>
+                                <include>**/*ItCase.java</include>
+                            </includes>
+                            <forkCount>1C</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <useSystemClassLoader>false</useSystemClassLoader>
+                            <argLine>${failsafeArgLine}</argLine>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.35.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                        <version>4.5.5</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <verbose>true</verbose>
+                    <apiVersion>1.35</apiVersion>
+                    <images>
+                        <image>
+                            <name>docker.io/mariadb:10.5.4</name>
+                            <alias>mariadb</alias>
+                            <run>
+                                <env>
+                                    <MYSQL_ROOT_PASSWORD>strong_pitchou</MYSQL_ROOT_PASSWORD>
+                                </env>
+                                <hostname>mariadb</hostname>
+                                <volumes>
+                                    <bind>
+                                        <volume>${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d:rw</volume>
+                                        <volume>${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d</volume>
+                                    </bind>
+                                </volumes>
+                                <wait>
+                                    <log>port: 3306</log>
+                                    <time>300000</time>
+                                    <exec>
+                                        <preStop>/docker-entrypoint-initdb.d/dump/backup-data-only.sh</preStop>
+                                    </exec>
+                                </wait>
+                                <ports>
+                                    <port>${docker.mariadb.port.host}:3306</port>
+                                </ports>
+                                <network>
+                                    <mode>bridge</mode>
+                                </network>
+                            </run>
+                        </image>
+                        <image>
+                            <name>docker.io/python:2-slim</name>
+                            <alias>python</alias>
+                            <run>
+                                <hostname>python</hostname>
+                                <volumes>
+                                    <bind>
+                                        <volume>
+                                            ${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app
+                                        </volume>
+                                        <volume>
+                                            ${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache
+                                        </volume>
+                                    </bind>
+                                </volumes>
+                                <wait>
+                                    <tcp>
+                                        <ports>
+                                            <port>8080</port>
+                                        </ports>
+                                        <mode>direct</mode>
+                                    </tcp>
+                                    <time>120000</time>
+                                </wait>
+                                <ports>
+                                    <port>${docker.http-cache.port.host}:8080</port>
+                                </ports>
+                                <workingDir>/usr/src/http-cache-app</workingDir>
+                                <cmd>
+                                    <shell>./start_http_cache.sh ${python.http.proxy.param}
+                                        --python_proxyaddress=localhost:${docker.http-cache.port.host}
+                                    </shell>
+                                </cmd>
+                                <network>
+                                    <mode>bridge</mode>
+                                </network>
+                            </run>
+                        </image>
+                        <image>
+                            <name>onap/policy-clamp-backend</name>
+                            <alias>onap-policy-clamp-backend</alias>
+                            <run>
+                                <skip>true</skip>
+                            </run>
+                            <build>
+                                <cleanup>true</cleanup>
+                                <tags>
+                                    <tag>latest</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                    <tag>${project.docker.latesttag.version}</tag>
+                                </tags>
+                                <!-- A relative path is looked up in ${project.basedir}/src/main/docker by
+                                    default -->
+                                <dockerFile>backend/Dockerfile</dockerFile>
+                                <assembly>
+                                    <descriptor>backend/backend-files.xml</descriptor>
+                                    <name>onap-policy-clamp-backend</name>
+                                </assembly>
+                            </build>
+                        </image>
+                        <image>
+                            <name>onap/policy-clamp-frontend</name>
+                            <alias>onap-policy-clamp-frontend</alias>
+                            <run>
+                                <skip>true</skip>
+                            </run>
+                            <build>
+                                <cleanup>true</cleanup>
+                                <tags>
+                                    <tag>latest</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                    <tag>${project.docker.latesttag.version}</tag>
+                                </tags>
+                                <!-- A relative path is looked up in ${project.basedir}/src/main/docker by
+                                    default -->
+                                <dockerFile>frontend/Dockerfile</dockerFile>
+                                <assembly>
+                                    <descriptor>frontend/frontend-files.xml</descriptor>
+                                    <name>onap-policy-clamp-frontend</name>
+                                </assembly>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>generate-images</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>push-images</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>docker-start-for-it</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>docker-stop-for-it</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.5</version>
+                <configuration>
+                    <dumpOnExit>true</dumpOnExit>
+                    <append>true</append>
+                    <includes>
+                        <include>org/onap/policy/clamp/**</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                            <!-- <append>true</append> -->
+                            <!-- Need to overwrite the policy integration parent flag -->
+                            <skip>false</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <fileSets>
+                                <fileSet
+                                        implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco.exec</destFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>report-xml</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Setting explicit path, so that we remember where it picks them up from -->
+                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+                            <outputDirectory>${project.build.directory}/jacoco-html-xml-reports</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- This plugin will be useful when we will have multi-modules project -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>1.3.1</version>
+            </plugin>
+
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.11.3</version>
+                <configuration>
+                    <installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
+                    <npmDownloadRoot>${repo.npm}</npmDownloadRoot>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install_node_and_npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <nodeVersion>v14.16.1</nodeVersion>
+                            <npmVersion>6.14.13</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm_install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm_test</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <skip>${maven.test.skip}</skip>
+                            <arguments>run-script test:coverage</arguments>
+                            <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm_install_lib</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm_build_lib</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm_publish</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+                            <arguments>publish</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.7.0.1746</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <id>libIndexCheck</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>bash</executable>
+                    <arguments>
+                        <argument>${project.basedir}/src/main/script/checkLibIndex.sh</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
+            <!-- Plugin to generate a X509 Certificate for https tests  -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>keytool-maven-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>add-certificate-for-dev</id>
+                        <configuration>
+                            <keystore>${project.build.directory}/classes/clds/aaf/org.onap.clamp.p12</keystore>
+                            <storepass>China in the Spring</storepass>
+                            <alias>clamptest</alias>
+                            <storetype>PKCS12</storetype>
+                            <keyalg>RSA</keyalg>
+                            <dname>cn=CN, ou=OU, o=O, c=C</dname>
+                            <validity>365</validity>
+                        </configuration>
+                        <goals>
+                            <goal>generateKeyPair</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                    </execution>
+                    <execution>
+                        <id>add-certificate-for-test</id>
+                        <configuration>
+                            <keystore>${project.build.directory}/test-classes/clds/aaf/org.onap.clamp.p12</keystore>
+                            <storepass>China in the Spring</storepass>
+                            <alias>clamptest</alias>
+                            <storetype>PKCS12</storetype>
+                            <keyalg>RSA</keyalg>
+                            <dname>cn=CN, ou=OU, o=O, c=C</dname>
+                            <validity>365</validity>
+                        </configuration>
+                        <goals>
+                            <goal>generateKeyPair</goal>
+                        </goals>
+                        <phase>generate-test-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/runtime/runtime/src/main/resources/META-INF/resources/swagger.html b/runtime/runtime/src/main/resources/META-INF/resources/swagger.html
new file mode 100644
index 000000000..b6f49a78f
--- /dev/null
+++ b/runtime/runtime/src/main/resources/META-INF/resources/swagger.html
@@ -0,0 +1,454 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="generator" content="Asciidoctor 1.5.7.1">
+<title>Untitled</title>
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
+<style>
+/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
+/* Uncomment @import statement below to use as custom stylesheet */
+/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
+article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}
+audio,canvas,video{display:inline-block}
+audio:not([controls]){display:none;height:0}
+script{display:none!important}
+html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
+a{background:transparent}
+a:focus{outline:thin dotted}
+a:active,a:hover{outline:0}
+h1{font-size:2em;margin:.67em 0}
+abbr[title]{border-bottom:1px dotted}
+b,strong{font-weight:bold}
+dfn{font-style:italic}
+hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
+mark{background:#ff0;color:#000}
+code,kbd,pre,samp{font-family:monospace;font-size:1em}
+pre{white-space:pre-wrap}
+q{quotes:"\201C" "\201D" "\2018" "\2019"}
+small{font-size:80%}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
+sup{top:-.5em}
+sub{bottom:-.25em}
+img{border:0}
+svg:not(:root){overflow:hidden}
+figure{margin:0}
+fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
+legend{border:0;padding:0}
+button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
+button,input{line-height:normal}
+button,select{text-transform:none}
+button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
+button[disabled],html input[disabled]{cursor:default}
+input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
+textarea{overflow:auto;vertical-align:top}
+table{border-collapse:collapse;border-spacing:0}
+*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+html,body{font-size:100%}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+a:hover{cursor:pointer}
+img,object,embed{max-width:100%;height:auto}
+object,embed{height:100%}
+img{-ms-interpolation-mode:bicubic}
+.left{float:left!important}
+.right{float:right!important}
+.text-left{text-align:left!important}
+.text-right{text-align:right!important}
+.text-center{text-align:center!important}
+.text-justify{text-align:justify!important}
+.hide{display:none}
+img,object,svg{display:inline-block;vertical-align:middle}
+textarea{height:auto;min-height:50px}
+select{width:100%}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
+.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
+a{color:#2156a5;text-decoration:underline;line-height:inherit}
+a:hover,a:focus{color:#1d4b8f}
+a img{border:none}
+p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
+p aside{font-size:.875em;line-height:1.35;font-style:italic}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
+h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
+h1{font-size:2.125em}
+h2{font-size:1.6875em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
+h4,h5{font-size:1.125em}
+h6{font-size:1em}
+hr{border:solid #ddddd8;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
+em,i{font-style:italic;line-height:inherit}
+strong,b{font-weight:bold;line-height:inherit}
+small{font-size:60%;line-height:inherit}
+code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
+ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
+ul,ol{margin-left:1.5em}
+ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
+ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
+ul.square{list-style-type:square}
+ul.circle{list-style-type:circle}
+ul.disc{list-style-type:disc}
+ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
+dl dt{margin-bottom:.3125em;font-weight:bold}
+dl dd{margin-bottom:1.25em}
+abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
+abbr{text-transform:none}
+blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
+blockquote cite{display:block;font-size:.9375em;color:rgba(0,0,0,.6)}
+blockquote cite::before{content:"\2014 \0020"}
+blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.6)}
+blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
+@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
+h1{font-size:2.75em}
+h2{font-size:2.3125em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
+h4{font-size:1.4375em}}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
+table thead,table tfoot{background:#f7f8f7}
+table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
+table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
+table tr.even,table tr.alt,table tr:nth-of-type(even){background:#f8f8f7}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
+h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
+.clearfix::after,.float-group::after{clear:both}
+*:not(pre)>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background-color:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
+*:not(pre)>code.nobreak{word-wrap:normal}
+*:not(pre)>code.nowrap{white-space:nowrap}
+pre,pre>code{line-height:1.45;color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;text-rendering:optimizeSpeed}
+em em{font-style:normal}
+strong strong{font-weight:400}
+.keyseq{color:rgba(51,51,51,.8)}
+kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
+.keyseq kbd:first-child{margin-left:0}
+.keyseq kbd:last-child{margin-right:0}
+.menuseq,.menuref{color:#000}
+.menuseq b:not(.caret),.menuref{font-weight:inherit}
+.menuseq{word-spacing:-.02em}
+.menuseq b.caret{font-size:1.25em;line-height:.8}
+.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
+b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
+b.button::before{content:"[";padding:0 3px 0 2px}
+b.button::after{content:"]";padding:0 2px 0 3px}
+p a>code:hover{color:rgba(0,0,0,.9)}
+#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
+#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
+#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
+#content{margin-top:1.25em}
+#content::before{content:none}
+#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
+#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #ddddd8}
+#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #ddddd8;padding-bottom:8px}
+#header .details{border-bottom:1px solid #ddddd8;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
+#header .details span:first-child{margin-left:-.125em}
+#header .details span.email a{color:rgba(0,0,0,.85)}
+#header .details br{display:none}
+#header .details br+span::before{content:"\00a0\2013\00a0"}
+#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
+#header .details br+span#revremark::before{content:"\00a0|\00a0"}
+#header #revnumber{text-transform:capitalize}
+#header #revnumber::after{content:"\00a0"}
+#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #ddddd8;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
+#toc{border-bottom:1px solid #efefed;padding-bottom:.5em}
+#toc>ul{margin-left:.125em}
+#toc ul.sectlevel0>li>a{font-style:italic}
+#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
+#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
+#toc li{line-height:1.3334;margin-top:.3334em}
+#toc a{text-decoration:none}
+#toc a:active{text-decoration:underline}
+#toctitle{color:#7a2518;font-size:1.2em}
+@media screen and (min-width:768px){#toctitle{font-size:1.375em}
+body.toc2{padding-left:15em;padding-right:0}
+#toc.toc2{margin-top:0!important;background-color:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #efefed;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
+#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
+#toc.toc2>ul{font-size:.9em;margin-bottom:0}
+#toc.toc2 ul ul{margin-left:0;padding-left:1em}
+#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
+body.toc2.toc-right{padding-left:0;padding-right:15em}
+body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #efefed;left:auto;right:0}}
+@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
+#toc.toc2{width:20em}
+#toc.toc2 #toctitle{font-size:1.375em}
+#toc.toc2>ul{font-size:.95em}
+#toc.toc2 ul ul{padding-left:1.25em}
+body.toc2.toc-right{padding-left:0;padding-right:20em}}
+#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
+#content #toc>:first-child{margin-top:0}
+#content #toc>:last-child{margin-bottom:0}
+#footer{max-width:100%;background-color:rgba(0,0,0,.8);padding:1.25em}
+#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
+#content{margin-bottom:.625em}
+.sect1{padding-bottom:.625em}
+@media screen and (min-width:768px){#content{margin-bottom:1.25em}
+.sect1{padding-bottom:1.25em}}
+.sect1:last-child{padding-bottom:0}
+.sect1+.sect1{border-top:1px solid #efefed}
+#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
+#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
+#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
+#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
+#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
+.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
+.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
+table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
+.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
+table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
+.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
+.admonitionblock>table td.icon{text-align:center;width:80px}
+.admonitionblock>table td.icon img{max-width:none}
+.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #ddddd8;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
+.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
+.exampleblock>.content>:first-child{margin-top:0}
+.exampleblock>.content>:last-child{margin-bottom:0}
+.sidebarblock{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
+.sidebarblock>:first-child{margin-top:0}
+.sidebarblock>:last-child{margin-bottom:0}
+.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
+.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
+.literalblock pre,.listingblock pre:not(.highlight),.listingblock pre[class="highlight"],.listingblock pre[class^="highlight "],.listingblock pre.CodeRay,.listingblock pre.prettyprint{background:#f7f7f8}
+.sidebarblock .literalblock pre,.sidebarblock .listingblock pre:not(.highlight),.sidebarblock .listingblock pre[class="highlight"],.sidebarblock .listingblock pre[class^="highlight "],.sidebarblock .listingblock pre.CodeRay,.sidebarblock .listingblock pre.prettyprint{background:#f2f1f1}
+.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;padding:1em;font-size:.8125em}
+.literalblock pre.nowrap,.literalblock pre[class].nowrap,.listingblock pre.nowrap,.listingblock pre[class].nowrap{overflow-x:auto;white-space:pre;word-wrap:normal}
+@media screen and (min-width:768px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:.90625em}}
+@media screen and (min-width:1280px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:1em}}
+.literalblock.output pre{color:#f7f7f8;background-color:rgba(0,0,0,.9)}
+.listingblock pre.highlightjs{padding:0}
+.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
+.listingblock pre.prettyprint{border-width:0}
+.listingblock>.content{position:relative}
+.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:#999}
+.listingblock:hover code[data-lang]::before{display:block}
+.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:#999}
+.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
+table.pyhltable{border-collapse:separate;border:0;margin-bottom:0;background:none}
+table.pyhltable td{vertical-align:top;padding-top:0;padding-bottom:0;line-height:1.45}
+table.pyhltable td.code{padding-left:.75em;padding-right:0}
+pre.pygments .lineno,table.pyhltable td:not(.code){color:#999;padding-left:0;padding-right:.5em;border-right:1px solid #ddddd8}
+pre.pygments .lineno{display:inline-block;margin-right:.25em}
+table.pyhltable .linenodiv{background:none!important;padding-right:0!important}
+.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
+.quoteblock>.title{margin-left:-1.5em;margin-bottom:.75em}
+.quoteblock blockquote,.quoteblock blockquote p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
+.quoteblock blockquote{margin:0;padding:0;border:0}
+.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
+.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
+.quoteblock .attribution{margin-top:.5em;margin-right:.5ex;text-align:right}
+.quoteblock .quoteblock{margin-left:0;margin-right:0;padding:.5em 0;border-left:3px solid rgba(0,0,0,.6)}
+.quoteblock .quoteblock blockquote{padding:0 0 0 .75em}
+.quoteblock .quoteblock blockquote::before{display:none}
+.verseblock{margin:0 1em 1.25em}
+.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
+.verseblock pre strong{font-weight:400}
+.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
+.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
+.quoteblock .attribution br,.verseblock .attribution br{display:none}
+.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
+.quoteblock.abstract{margin:0 1em 1.25em;display:block}
+.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
+.quoteblock.abstract blockquote,.quoteblock.abstract blockquote p{word-spacing:0;line-height:1.6}
+.quoteblock.abstract blockquote::before,.quoteblock.abstract p::before{display:none}
+table.tableblock{max-width:100%;border-collapse:separate}
+p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:-1.25em}
+table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
+table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
+table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
+table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
+table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
+table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
+table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
+table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.frame-all{border-width:1px}
+table.frame-sides{border-width:0 1px}
+table.frame-topbot,table.frame-ends{border-width:1px 0}
+table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd){background:#f8f8f7}
+table.stripes-none tr,table.stripes-odd tr:nth-of-type(even){background:none}
+th.halign-left,td.halign-left{text-align:left}
+th.halign-right,td.halign-right{text-align:right}
+th.halign-center,td.halign-center{text-align:center}
+th.valign-top,td.valign-top{vertical-align:top}
+th.valign-bottom,td.valign-bottom{vertical-align:bottom}
+th.valign-middle,td.valign-middle{vertical-align:middle}
+table thead th,table tfoot th{font-weight:bold}
+tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
+tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
+p.tableblock>code:only-child{background:none;padding:0}
+p.tableblock{font-size:1em}
+td>div.verse{white-space:pre}
+ol{margin-left:1.75em}
+ul li ol{margin-left:1.5em}
+dl dd{margin-left:1.125em}
+dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
+ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
+ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
+ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
+ul.unstyled,ol.unstyled{margin-left:0}
+ul.checklist{margin-left:.625em}
+ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
+ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
+ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
+ul.inline>li{margin-left:1.25em}
+.unstyled dl dt{font-weight:400;font-style:normal}
+ol.arabic{list-style-type:decimal}
+ol.decimal{list-style-type:decimal-leading-zero}
+ol.loweralpha{list-style-type:lower-alpha}
+ol.upperalpha{list-style-type:upper-alpha}
+ol.lowerroman{list-style-type:lower-roman}
+ol.upperroman{list-style-type:upper-roman}
+ol.lowergreek{list-style-type:lower-greek}
+.hdlist>table,.colist>table{border:0;background:none}
+.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
+td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
+td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
+.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
+.colist td:not([class]):first-child img{max-width:none}
+.colist td:not([class]):last-child{padding:.25em 0}
+.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
+.imageblock.left,.imageblock[style*="float: left"]{margin:.25em .625em 1.25em 0}
+.imageblock.right,.imageblock[style*="float: right"]{margin:.25em 0 1.25em .625em}
+.imageblock>.title{margin-bottom:0}
+.imageblock.thumb,.imageblock.th{border-width:6px}
+.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
+.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
+.image.left{margin-right:.625em}
+.image.right{margin-left:.625em}
+a.image{text-decoration:none;display:inline-block}
+a.image object{pointer-events:none}
+sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
+sup.footnote a,sup.footnoteref a{text-decoration:none}
+sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
+#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
+#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
+#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
+#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
+#footnotes .footnote:last-of-type{margin-bottom:0}
+#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
+.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
+.gist .file-data>table td.line-data{width:99%}
+div.unbreakable{page-break-inside:avoid}
+.big{font-size:larger}
+.small{font-size:smaller}
+.underline{text-decoration:underline}
+.overline{text-decoration:overline}
+.line-through{text-decoration:line-through}
+.aqua{color:#00bfbf}
+.aqua-background{background-color:#00fafa}
+.black{color:#000}
+.black-background{background-color:#000}
+.blue{color:#0000bf}
+.blue-background{background-color:#0000fa}
+.fuchsia{color:#bf00bf}
+.fuchsia-background{background-color:#fa00fa}
+.gray{color:#606060}
+.gray-background{background-color:#7d7d7d}
+.green{color:#006000}
+.green-background{background-color:#007d00}
+.lime{color:#00bf00}
+.lime-background{background-color:#00fa00}
+.maroon{color:#600000}
+.maroon-background{background-color:#7d0000}
+.navy{color:#000060}
+.navy-background{background-color:#00007d}
+.olive{color:#606000}
+.olive-background{background-color:#7d7d00}
+.purple{color:#600060}
+.purple-background{background-color:#7d007d}
+.red{color:#bf0000}
+.red-background{background-color:#fa0000}
+.silver{color:#909090}
+.silver-background{background-color:#bcbcbc}
+.teal{color:#006060}
+.teal-background{background-color:#007d7d}
+.white{color:#bfbfbf}
+.white-background{background-color:#fafafa}
+.yellow{color:#bfbf00}
+.yellow-background{background-color:#fafa00}
+span.icon>.fa{cursor:default}
+a span.icon>.fa{cursor:inherit}
+.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
+.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
+.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
+.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
+.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
+.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
+.conum[data-value]{display:inline-block;color:#fff!important;background-color:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value] *{color:#fff!important}
+.conum[data-value]+b{display:none}
+.conum[data-value]::after{content:attr(data-value)}
+pre .conum[data-value]{position:relative;top:-.125em}
+b.conum *{color:inherit!important}
+.conum:not([data-value]):empty{display:none}
+dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
+h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
+p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
+p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
+p{margin-bottom:1.25rem}
+.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
+.exampleblock>.content{background-color:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
+.print-only{display:none!important}
+@page{margin:1.25cm .75cm}
+@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
+html{font-size:80%}
+a{color:inherit!important;text-decoration:underline!important}
+a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
+a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
+abbr[title]::after{content:" (" attr(title) ")"}
+pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
+thead{display:table-header-group}
+svg{max-width:100%}
+p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
+h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#toc,.sidebarblock,.exampleblock>.content{background:none!important}
+#toc{border-bottom:1px solid #ddddd8!important;padding-bottom:0!important}
+body.book #header{text-align:center}
+body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
+body.book #header .details{border:0!important;display:block;padding:0!important}
+body.book #header .details span:first-child{margin-left:0!important}
+body.book #header .details br{display:block}
+body.book #header .details br+span::before{content:none!important}
+body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
+body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
+.listingblock code[data-lang]::before{display:block}
+#footer{padding:0 .9375em}
+.hide-on-print{display:none!important}
+.print-only{display:block!important}
+.hide-for-print{display:none!important}
+.show-for-print{display:inherit!important}}
+@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
+.sect1{padding:0!important}
+.sect1+.sect1{border:0}
+#footer{background:none}
+#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
+@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
+</style>
+</head>
+<body class="book">
+<div id="header">
+</div>
+<div id="content">
+<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/overview.adoc[]<br>
+Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/paths.adoc[]<br>
+Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/security.adoc[]<br>
+Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/definitions.adoc[]</p>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2021-05-06 17:18:25 BST
+</div>
+</div>
+</body>
+</html>
diff --git a/src/main/docker/backend/Dockerfile b/runtime/src/main/docker/backend/Dockerfile
index 7b6687b9e..bb964158e 100644
--- a/src/main/docker/backend/Dockerfile
+++ b/runtime/src/main/docker/backend/Dockerfile
@@ -50,3 +50,4 @@ RUN set -x && \
 USER onap

 WORKDIR /opt/policy/clamp/

 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"]

+

diff --git a/src/main/docker/backend/backend-files.xml b/runtime/src/main/docker/backend/backend-files.xml
index c73c47f64..c73c47f64 100644
--- a/src/main/docker/backend/backend-files.xml
+++ b/runtime/src/main/docker/backend/backend-files.xml
diff --git a/src/main/docker/frontend/Dockerfile b/runtime/src/main/docker/frontend/Dockerfile
index e67495350..1d64d2a2d 100644
--- a/src/main/docker/frontend/Dockerfile
+++ b/runtime/src/main/docker/frontend/Dockerfile
@@ -1,70 +1,71 @@
-###

-# ============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============================================

-# ===================================================================

-#

-###

-

-# build environment

-FROM node:12.10.0-alpine as build

-WORKDIR /app

-#ENV PATH /app/node_modules/.bin:$PATH

-COPY onap-policy-clamp-frontend/ /app/

-RUN npm install --silent && \

-    npm run build

-

-FROM nginx:1.17.0-alpine

-

-MAINTAINER "The Onap Team"

-LABEL Description="This image contains Clamp frontend"

-

-ARG http_proxy

-ARG https_proxy

-ENV HTTP_PROXY=$http_proxy

-ENV HTTPS_PROXY=$https_proxy

-ENV http_proxy=$HTTP_PROXY

-ENV https_proxy=$HTTPS_PROXY

-

-RUN addgroup onap && \

-    adduser -D -G onap clamp && \

-    mkdir /var/log/onap && \

-    chmod a+rwx /var/log/onap

-

-COPY --from=build /app/build /usr/share/nginx/html

-COPY --from=build /app/ssl /etc/ssl

-

-RUN rm /etc/nginx/conf.d/default.conf && \

-    ln -sf /dev/stdout /var/log/nginx/access.log && \

-    ln -sf /dev/stderr /var/log/nginx/error.log

-

-COPY nginx/nginx.conf /etc/nginx/nginx.conf

-COPY nginx/default.conf /etc/nginx/conf.d/default.conf

-

-WORKDIR /app

-

-RUN chown -R clamp:onap /app && chmod -R 755 /app && \

-        chown -R clamp:onap /var/cache/nginx && \

-        chown -R clamp:onap /var/log/nginx && \

-        chown -R clamp:onap /etc/nginx/conf.d && \

-        touch /var/run/nginx.pid && \

-        chown -R clamp:onap /var/run/nginx.pid

-

-USER clamp

-EXPOSE 2443

-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+###
+# ============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============================================
+# ===================================================================
+#
+###
+
+# build environment
+FROM node:12.10.0-alpine as build
+WORKDIR /app
+#ENV PATH /app/node_modules/.bin:$PATH
+COPY onap-policy-clamp-frontend/ /app/
+RUN npm install --silent && \
+    npm run build
+
+FROM nginx:1.17.0-alpine
+
+MAINTAINER "The Onap Team"
+LABEL Description="This image contains Clamp frontend"
+
+ARG http_proxy
+ARG https_proxy
+ENV HTTP_PROXY=$http_proxy
+ENV HTTPS_PROXY=$https_proxy
+ENV http_proxy=$HTTP_PROXY
+ENV https_proxy=$HTTPS_PROXY
+
+RUN addgroup onap && \
+    adduser -D -G onap clamp && \
+    mkdir /var/log/onap && \
+    chmod a+rwx /var/log/onap
+
+COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/ssl /etc/ssl
+
+RUN rm /etc/nginx/conf.d/default.conf && \
+    ln -sf /dev/stdout /var/log/nginx/access.log && \
+    ln -sf /dev/stderr /var/log/nginx/error.log
+
+COPY nginx/nginx.conf /etc/nginx/nginx.conf
+COPY nginx/default.conf /etc/nginx/conf.d/default.conf
+
+WORKDIR /app
+
+RUN chown -R clamp:onap /app && chmod -R 755 /app && \
+        chown -R clamp:onap /var/cache/nginx && \
+        chown -R clamp:onap /var/log/nginx && \
+        chown -R clamp:onap /etc/nginx/conf.d && \
+        touch /var/run/nginx.pid && \
+        chown -R clamp:onap /var/run/nginx.pid
+
+USER clamp
+EXPOSE 2443
+CMD ["nginx", "-g", "daemon off;"]
+
diff --git a/src/main/docker/frontend/frontend-files.xml b/runtime/src/main/docker/frontend/frontend-files.xml
index aaf32be81..aaf32be81 100644
--- a/src/main/docker/frontend/frontend-files.xml
+++ b/runtime/src/main/docker/frontend/frontend-files.xml
diff --git a/src/main/docker/frontend/nginx/default.conf b/runtime/src/main/docker/frontend/nginx/default.conf
index 570806034..570806034 100644
--- a/src/main/docker/frontend/nginx/default.conf
+++ b/runtime/src/main/docker/frontend/nginx/default.conf
diff --git a/src/main/docker/frontend/nginx/nginx.conf b/runtime/src/main/docker/frontend/nginx/nginx.conf
index beeb2b1eb..beeb2b1eb 100644
--- a/src/main/docker/frontend/nginx/nginx.conf
+++ b/runtime/src/main/docker/frontend/nginx/nginx.conf
diff --git a/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
index 89be4fc28..89be4fc28 100644
--- a/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
diff --git a/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
index 8f1e2bf67..8f1e2bf67 100644
--- a/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
diff --git a/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
index 41887a315..41887a315 100644
--- a/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
diff --git a/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
index 0b178c256..0b178c256 100644
--- a/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
diff --git a/src/main/java/org/onap/policy/clamp/authorization/UserService.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/UserService.java
index 96347f82f..96347f82f 100644
--- a/src/main/java/org/onap/policy/clamp/authorization/UserService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/authorization/UserService.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/Application.java b/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java
index ba300ac09..ba300ac09 100644
--- a/src/main/java/org/onap/policy/clamp/clds/Application.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java b/runtime/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
index 939cea49c..939cea49c 100644
--- a/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java b/runtime/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
index ccde7cf11..ccde7cf11 100644
--- a/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java b/runtime/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
index f66a09c41..f66a09c41 100644
--- a/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java b/runtime/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
index 80ff9f774..cb74ad9e4 100644
--- a/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
@@ -1,229 +1,229 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP POLICY-CLAMP

- * ================================================================================

- * Copyright (C) 2020 Huawei Technologies Co., Ltd.

- * ================================================================================

- * Modifications Copyright (C) 2021 AT&T.

- * ================================================================================

- * 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.policy.clamp.clds.client;

-

-import static java.lang.Boolean.parseBoolean;

-

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-import com.google.gson.JsonElement;

-import com.google.gson.JsonObject;

-import com.google.gson.JsonParser;

-import java.io.IOException;

-import java.util.Date;

-import java.util.Map;

-import org.apache.camel.CamelContext;

-import org.apache.camel.Exchange;

-import org.apache.camel.ProducerTemplate;

-import org.apache.camel.builder.ExchangeBuilder;

-import org.onap.policy.clamp.clds.exception.cds.CdsParametersException;

-import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse;

-import org.onap.policy.clamp.clds.util.JsonUtils;

-import org.onap.policy.clamp.clds.util.LoggingUtils;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.http.HttpStatus;

-import org.springframework.stereotype.Component;

-

-/**

- * This class implements the communication with CDS for the service inventory.

- */

-@Component

-public class CdsServices {

-

-    @Autowired

-    CamelContext camelContext;

-

-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CdsServices.class);

-

-    private static final String TYPE = "type";

-    private static final String PROPERTIES = "properties";

-    private static final String LIST = "list";

-

-    /**

-     * Query CDS to get blueprint's workflow list.

-     *

-     * @param blueprintName    CDS blueprint name

-     * @param blueprintVersion CDS blueprint version

-     * @return CdsBpWorkFlowListResponse CDS blueprint's workflow list

-     */

-    public CdsBpWorkFlowListResponse getBlueprintWorkflowList(String blueprintName, String blueprintVersion) {

-        LoggingUtils.setTargetContext("CDS", "getBlueprintWorkflowList");

-

-        try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) {

-            Exchange exchangeResponse =

-                    producerTemplate.send("direct:get-blueprint-workflow-list", ExchangeBuilder.anExchange(camelContext)

-                            .withProperty("blueprintName", blueprintName)

-                            .withProperty("blueprintVersion", blueprintVersion)

-                            .withProperty("raiseHttpExceptionFlag", false).build());

-

-            if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))

-                    .is2xxSuccessful()) {

-                String cdsResponse = (String) exchangeResponse.getIn().getBody();

-                logger.info("getBlueprintWorkflowList, response from CDS:" + cdsResponse);

-                LoggingUtils.setResponseContext("0", "Get Blueprint workflow list", this.getClass().getName());

-                Date startTime = new Date();

-                LoggingUtils.setTimeContext(startTime, new Date());

-                return JsonUtils.GSON_JPA_MODEL.fromJson(cdsResponse, CdsBpWorkFlowListResponse.class);

-            } else {

-                logger.error("CDS getBlueprintWorkflowList FAILED");

-            }

-        } catch (IOException e) {

-            logger.error("IOException caught when trying to execute get-blueprint-workflow-list flow", e);

-        }

-        return null;

-    }

-

-    /**

-     * Query CDS to get input properties of workflow.

-     *

-     * @param blueprintName    CDS blueprint name

-     * @param blueprintVersion CDS blueprint name

-     * @param workflow         CDS blueprint's workflow

-     * @return input properties in json format

-     */

-    public JsonObject getWorkflowInputProperties(String blueprintName, String blueprintVersion,

-                                                 String workflow) {

-        LoggingUtils.setTargetContext("CDS", "getWorkflowInputProperties");

-

-        try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) {

-            Exchange exchangeResponse = producerTemplate

-                    .send("direct:get-blueprint-workflow-input-properties", ExchangeBuilder.anExchange(camelContext)

-                            .withBody(getCdsPayloadForWorkFlow(blueprintName, blueprintVersion, workflow))

-                            .withProperty("raiseHttpExceptionFlag", false).build());

-            if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))

-                    .is2xxSuccessful()) {

-                String cdsResponse = (String) exchangeResponse.getIn().getBody();

-                logger.info("getWorkflowInputProperties, response from CDS:" + cdsResponse);

-                LoggingUtils

-                        .setResponseContext("0", "Get Blueprint workflow input properties", this.getClass().getName());

-                Date startTime = new Date();

-                LoggingUtils.setTimeContext(startTime, new Date());

-                return parseCdsResponse(cdsResponse);

-            } else {

-                logger.error("CDS getWorkflowInputProperties FAILED");

-            }

-        } catch (IOException e) {

-            logger.error("IOException caught when trying to execute get-blueprint-workflow-input-properties flow", e);

-        }

-        return null;

-    }

-

-    protected JsonObject parseCdsResponse(String response) {

-        JsonObject root = JsonParser.parseString(response).getAsJsonObject();

-        JsonObject inputs = root.getAsJsonObject("workFlowData").getAsJsonObject("inputs");

-        JsonObject dataTypes = root.getAsJsonObject("dataTypes");

-

-        JsonObject workFlowProperties = new JsonObject();

-        workFlowProperties.add("inputs", getInputProperties(inputs, dataTypes, new JsonObject()));

-        return workFlowProperties;

-    }

-

-    private JsonObject getInputProperties(JsonObject inputs, JsonObject dataTypes, JsonObject inputObject) {

-        if (inputs == null) {

-            return inputObject;

-        }

-

-        for (Map.Entry<String, JsonElement> entry : inputs.entrySet()) {

-            String key = entry.getKey();

-            JsonObject inputProperty = inputs.getAsJsonObject(key);

-            String type = inputProperty.get(TYPE).getAsString();

-            if (isComplexType(type, dataTypes)) {

-                inputObject.add(key, handleComplexType(type, dataTypes));

-            } else if (LIST.equalsIgnoreCase(type)) {

-                handleListType(key, inputProperty, dataTypes, inputObject);

-            } else if (isInputParam(inputProperty)) {

-                inputObject.add(key, entry.getValue());

-            }

-        }

-        return inputObject;

-    }

-

-    private void handleListType(String propertyName,

-                                JsonObject inputProperty,

-                                JsonObject dataTypes,

-                                JsonObject inputObject) {

-        if (inputProperty.get("entry_schema") == null) {

-            throw new CdsParametersException("Entry schema is null for " + propertyName);

-        }

-

-        String type = inputProperty.get("entry_schema").getAsJsonObject().get(

-                TYPE).getAsString();

-        if (dataTypes != null && dataTypes.get(type) != null) {

-            JsonObject jsonObject = new JsonObject();

-            jsonObject.addProperty(TYPE, LIST);

-            jsonObject.add(PROPERTIES, getPropertiesObject(type, dataTypes));

-            inputObject.add(propertyName, jsonObject);

-        } else if (isInputParam(inputProperty)) {

-            inputObject.add(propertyName, inputProperty);

-        }

-    }

-

-    private JsonObject handleComplexType(String key, JsonObject dataTypes) {

-        JsonObject jsonObject = new JsonObject();

-        jsonObject.addProperty(TYPE, "object");

-        jsonObject.add(PROPERTIES, getPropertiesObject(key, dataTypes));

-        return jsonObject;

-    }

-

-    private JsonObject getPropertiesObject(String key, JsonObject dataTypes) {

-        JsonObject properties = dataTypes.get(key).getAsJsonObject().get(PROPERTIES).getAsJsonObject();

-        JsonObject object = new JsonObject();

-        getInputProperties(properties, dataTypes, object);

-        return object;

-    }

-

-    private boolean isComplexType(String type, JsonObject dataTypes) {

-        if (dataTypes == null) {

-            return false;

-        }

-        return dataTypes.get(type) != null;

-    }

-

-    private boolean isInputParam(JsonObject inputProperty) {

-        JsonElement inputParam = inputProperty.get("input-param");

-        if (inputParam == null) {

-            return false;

-        }

-        return parseBoolean(inputParam.getAsString());

-    }

-

-    /**

-     * Creates payload to query CDS to get workflow input properties.

-     *

-     * @param blueprintName CDS blueprint name

-     * @param version       CDS blueprint version

-     * @param workflow      CDS blueprint workflow

-     * @return returns payload in json format

-     */

-    public String getCdsPayloadForWorkFlow(String blueprintName, String version, String workflow) {

-        JsonObject jsonObject = new JsonObject();

-        jsonObject.addProperty("blueprintName", blueprintName);

-        jsonObject.addProperty("version", version);

-        jsonObject.addProperty("returnContent", "json");

-        jsonObject.addProperty("workflowName", workflow);

-        jsonObject.addProperty("specType", "TOSCA");

-        return jsonObject.toString();

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP POLICY-CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Modifications Copyright (C) 2021 AT&T.
+ * ================================================================================
+ * 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.policy.clamp.clds.client;
+
+import static java.lang.Boolean.parseBoolean;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.onap.policy.clamp.clds.exception.cds.CdsParametersException;
+import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class implements the communication with CDS for the service inventory.
+ */
+@Component
+public class CdsServices {
+
+    @Autowired
+    CamelContext camelContext;
+
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CdsServices.class);
+
+    private static final String TYPE = "type";
+    private static final String PROPERTIES = "properties";
+    private static final String LIST = "list";
+
+    /**
+     * Query CDS to get blueprint's workflow list.
+     *
+     * @param blueprintName    CDS blueprint name
+     * @param blueprintVersion CDS blueprint version
+     * @return CdsBpWorkFlowListResponse CDS blueprint's workflow list
+     */
+    public CdsBpWorkFlowListResponse getBlueprintWorkflowList(String blueprintName, String blueprintVersion) {
+        LoggingUtils.setTargetContext("CDS", "getBlueprintWorkflowList");
+
+        try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) {
+            Exchange exchangeResponse =
+                    producerTemplate.send("direct:get-blueprint-workflow-list", ExchangeBuilder.anExchange(camelContext)
+                            .withProperty("blueprintName", blueprintName)
+                            .withProperty("blueprintVersion", blueprintVersion)
+                            .withProperty("raiseHttpExceptionFlag", false).build());
+
+            if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))
+                    .is2xxSuccessful()) {
+                String cdsResponse = (String) exchangeResponse.getIn().getBody();
+                logger.info("getBlueprintWorkflowList, response from CDS:" + cdsResponse);
+                LoggingUtils.setResponseContext("0", "Get Blueprint workflow list", this.getClass().getName());
+                Date startTime = new Date();
+                LoggingUtils.setTimeContext(startTime, new Date());
+                return JsonUtils.GSON_JPA_MODEL.fromJson(cdsResponse, CdsBpWorkFlowListResponse.class);
+            } else {
+                logger.error("CDS getBlueprintWorkflowList FAILED");
+            }
+        } catch (IOException e) {
+            logger.error("IOException caught when trying to execute get-blueprint-workflow-list flow", e);
+        }
+        return null;
+    }
+
+    /**
+     * Query CDS to get input properties of workflow.
+     *
+     * @param blueprintName    CDS blueprint name
+     * @param blueprintVersion CDS blueprint name
+     * @param workflow         CDS blueprint's workflow
+     * @return input properties in json format
+     */
+    public JsonObject getWorkflowInputProperties(String blueprintName, String blueprintVersion,
+                                                 String workflow) {
+        LoggingUtils.setTargetContext("CDS", "getWorkflowInputProperties");
+
+        try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) {
+            Exchange exchangeResponse = producerTemplate
+                    .send("direct:get-blueprint-workflow-input-properties", ExchangeBuilder.anExchange(camelContext)
+                            .withBody(getCdsPayloadForWorkFlow(blueprintName, blueprintVersion, workflow))
+                            .withProperty("raiseHttpExceptionFlag", false).build());
+            if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))
+                    .is2xxSuccessful()) {
+                String cdsResponse = (String) exchangeResponse.getIn().getBody();
+                logger.info("getWorkflowInputProperties, response from CDS:" + cdsResponse);
+                LoggingUtils
+                        .setResponseContext("0", "Get Blueprint workflow input properties", this.getClass().getName());
+                Date startTime = new Date();
+                LoggingUtils.setTimeContext(startTime, new Date());
+                return parseCdsResponse(cdsResponse);
+            } else {
+                logger.error("CDS getWorkflowInputProperties FAILED");
+            }
+        } catch (IOException e) {
+            logger.error("IOException caught when trying to execute get-blueprint-workflow-input-properties flow", e);
+        }
+        return null;
+    }
+
+    protected JsonObject parseCdsResponse(String response) {
+        JsonObject root = JsonParser.parseString(response).getAsJsonObject();
+        JsonObject inputs = root.getAsJsonObject("workFlowData").getAsJsonObject("inputs");
+        JsonObject dataTypes = root.getAsJsonObject("dataTypes");
+
+        JsonObject workFlowProperties = new JsonObject();
+        workFlowProperties.add("inputs", getInputProperties(inputs, dataTypes, new JsonObject()));
+        return workFlowProperties;
+    }
+
+    private JsonObject getInputProperties(JsonObject inputs, JsonObject dataTypes, JsonObject inputObject) {
+        if (inputs == null) {
+            return inputObject;
+        }
+
+        for (Map.Entry<String, JsonElement> entry : inputs.entrySet()) {
+            String key = entry.getKey();
+            JsonObject inputProperty = inputs.getAsJsonObject(key);
+            String type = inputProperty.get(TYPE).getAsString();
+            if (isComplexType(type, dataTypes)) {
+                inputObject.add(key, handleComplexType(type, dataTypes));
+            } else if (LIST.equalsIgnoreCase(type)) {
+                handleListType(key, inputProperty, dataTypes, inputObject);
+            } else if (isInputParam(inputProperty)) {
+                inputObject.add(key, entry.getValue());
+            }
+        }
+        return inputObject;
+    }
+
+    private void handleListType(String propertyName,
+                                JsonObject inputProperty,
+                                JsonObject dataTypes,
+                                JsonObject inputObject) {
+        if (inputProperty.get("entry_schema") == null) {
+            throw new CdsParametersException("Entry schema is null for " + propertyName);
+        }
+
+        String type = inputProperty.get("entry_schema").getAsJsonObject().get(
+                TYPE).getAsString();
+        if (dataTypes != null && dataTypes.get(type) != null) {
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.addProperty(TYPE, LIST);
+            jsonObject.add(PROPERTIES, getPropertiesObject(type, dataTypes));
+            inputObject.add(propertyName, jsonObject);
+        } else if (isInputParam(inputProperty)) {
+            inputObject.add(propertyName, inputProperty);
+        }
+    }
+
+    private JsonObject handleComplexType(String key, JsonObject dataTypes) {
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty(TYPE, "object");
+        jsonObject.add(PROPERTIES, getPropertiesObject(key, dataTypes));
+        return jsonObject;
+    }
+
+    private JsonObject getPropertiesObject(String key, JsonObject dataTypes) {
+        JsonObject properties = dataTypes.get(key).getAsJsonObject().get(PROPERTIES).getAsJsonObject();
+        JsonObject object = new JsonObject();
+        getInputProperties(properties, dataTypes, object);
+        return object;
+    }
+
+    private boolean isComplexType(String type, JsonObject dataTypes) {
+        if (dataTypes == null) {
+            return false;
+        }
+        return dataTypes.get(type) != null;
+    }
+
+    private boolean isInputParam(JsonObject inputProperty) {
+        JsonElement inputParam = inputProperty.get("input-param");
+        if (inputParam == null) {
+            return false;
+        }
+        return parseBoolean(inputParam.getAsString());
+    }
+
+    /**
+     * Creates payload to query CDS to get workflow input properties.
+     *
+     * @param blueprintName CDS blueprint name
+     * @param version       CDS blueprint version
+     * @param workflow      CDS blueprint workflow
+     * @return returns payload in json format
+     */
+    public String getCdsPayloadForWorkFlow(String blueprintName, String version, String workflow) {
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty("blueprintName", blueprintName);
+        jsonObject.addProperty("version", version);
+        jsonObject.addProperty("returnContent", "json");
+        jsonObject.addProperty("workflowName", workflow);
+        jsonObject.addProperty("specType", "TOSCA");
+        return jsonObject.toString();
+    }
+}
diff --git a/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java b/runtime/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
index 98eeae220..843107040 100644
--- a/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
@@ -1,144 +1,144 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP POLICY-CLAMP

- * ================================================================================

- * Copyright (C) 2017-2018, 2021 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============================================

- * Modifications copyright (c) 2018 Nokia

- * ===================================================================

- *

- */

-

-package org.onap.policy.clamp.clds.client;

-

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-import java.io.IOException;

-import java.util.Date;

-import org.apache.camel.CamelContext;

-import org.apache.camel.Exchange;

-import org.apache.camel.ProducerTemplate;

-import org.apache.camel.builder.ExchangeBuilder;

-import org.json.simple.JSONArray;

-import org.json.simple.JSONObject;

-import org.json.simple.parser.JSONParser;

-import org.json.simple.parser.ParseException;

-import org.onap.policy.clamp.clds.config.ClampProperties;

-import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;

-import org.onap.policy.clamp.clds.util.JsonUtils;

-import org.onap.policy.clamp.clds.util.LoggingUtils;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.http.HttpStatus;

-import org.springframework.stereotype.Component;

-

-/**

- * This class implements the communication with DCAE for the service inventory.

- */

-@Component

-public class DcaeInventoryServices {

-

-    @Autowired

-    CamelContext camelContext;

-

-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeInventoryServices.class);

-    protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();

-    protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();

-    public static final String DCAE_INVENTORY_URL = "dcae.inventory.url";

-    public static final String DCAE_INVENTORY_RETRY_INTERVAL = "dcae.intentory.retry.interval";

-    public static final String DCAE_INVENTORY_RETRY_LIMIT = "dcae.intentory.retry.limit";

-    private final ClampProperties refProp;

-

-    /**

-     * Constructor.

-     */

-    @Autowired

-    public DcaeInventoryServices(ClampProperties refProp) {

-        this.refProp = refProp;

-    }

-

-    private int getTotalCountFromDcaeInventoryResponse(String responseStr) throws ParseException {

-        JSONParser parser = new JSONParser();

-        Object obj0 = parser.parse(responseStr);

-        JSONObject jsonObj = (JSONObject) obj0;

-        Long totalCount = (Long) jsonObj.get("totalCount");

-        return totalCount.intValue();

-    }

-

-    private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException {

-        JSONParser parser = new JSONParser();

-        Object obj0 = parser.parse(responseStr);

-        JSONObject jsonObj = (JSONObject) obj0;

-        JSONArray itemsArray = (JSONArray) jsonObj.get("items");

-        JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0);

-        return JsonUtils.GSON.fromJson(dcaeServiceType0.toString(), DcaeInventoryResponse.class);

-    }

-

-    /**

-     * DO a query to DCAE to get some Information.

-     *

-     * @param artifactName The artifact Name

-     * @param serviceUuid  The service UUID

-     * @param resourceUuid The resource UUID

-     * @return The DCAE inventory for the artifact in DcaeInventoryResponse

-     * @throws IOException    In case of issues with the stream

-     * @throws ParseException In case of issues with the Json parsing

-     */

-    public DcaeInventoryResponse getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid)

-            throws IOException, ParseException, InterruptedException {

-        LoggingUtils.setTargetContext("DCAE", "getDcaeInformation");

-

-        int retryInterval = 0;

-        int retryLimit = 1;

-        if (refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT) != null) {

-            retryLimit = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT));

-        }

-        if (refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL) != null) {

-            retryInterval = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL));

-        }

-        for (int i = 0; i < retryLimit; i++) {

-            metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory");

-            try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) {

-                Exchange exchangeResponse = producerTemplate

-                        .send("direct:get-dcae-blueprint-inventory", ExchangeBuilder.anExchange(camelContext)

-                                .withProperty("blueprintResourceId", resourceUuid)

-                                .withProperty("blueprintServiceId", serviceUuid)

-                                .withProperty("blueprintName", artifactName)

-                                .withProperty("raiseHttpExceptionFlag", false).build());

-

-                if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))

-                        .is2xxSuccessful()) {

-                    String dcaeResponse = (String) exchangeResponse.getIn().getBody();

-                    int totalCount = getTotalCountFromDcaeInventoryResponse(dcaeResponse);

-                    metricsLogger.info("getDcaeInformation complete: totalCount returned=" + totalCount);

-                    if (totalCount > 0) {

-                        logger.info("getDcaeInformation, answer from DCAE inventory:" + dcaeResponse);

-                        LoggingUtils.setResponseContext("0", "Get Dcae Information success", this.getClass().getName());

-                        Date startTime = new Date();

-                        LoggingUtils.setTimeContext(startTime, new Date());

-                        return getItemsFromDcaeInventoryResponse(dcaeResponse);

-                    } else {

-                        logger.info("Dcae inventory totalCount returned is 0, so waiting " + retryInterval

-                                + "ms before retrying ...");

-                        // wait for a while and try to connect to DCAE again

-                        Thread.sleep(retryInterval);

-                    }

-                }

-            }

-        }

-        logger.warn("Dcae inventory totalCount returned is still 0, after " + retryLimit + " attempts, returning NULL");

-        return null;

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP POLICY-CLAMP
+ * ================================================================================
+ * Copyright (C) 2017-2018, 2021 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============================================
+ * Modifications copyright (c) 2018 Nokia
+ * ===================================================================
+ *
+ */
+
+package org.onap.policy.clamp.clds.client;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import java.io.IOException;
+import java.util.Date;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class implements the communication with DCAE for the service inventory.
+ */
+@Component
+public class DcaeInventoryServices {
+
+    @Autowired
+    CamelContext camelContext;
+
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeInventoryServices.class);
+    protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+    protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
+    public static final String DCAE_INVENTORY_URL = "dcae.inventory.url";
+    public static final String DCAE_INVENTORY_RETRY_INTERVAL = "dcae.intentory.retry.interval";
+    public static final String DCAE_INVENTORY_RETRY_LIMIT = "dcae.intentory.retry.limit";
+    private final ClampProperties refProp;
+
+    /**
+     * Constructor.
+     */
+    @Autowired
+    public DcaeInventoryServices(ClampProperties refProp) {
+        this.refProp = refProp;
+    }
+
+    private int getTotalCountFromDcaeInventoryResponse(String responseStr) throws ParseException {
+        JSONParser parser = new JSONParser();
+        Object obj0 = parser.parse(responseStr);
+        JSONObject jsonObj = (JSONObject) obj0;
+        Long totalCount = (Long) jsonObj.get("totalCount");
+        return totalCount.intValue();
+    }
+
+    private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException {
+        JSONParser parser = new JSONParser();
+        Object obj0 = parser.parse(responseStr);
+        JSONObject jsonObj = (JSONObject) obj0;
+        JSONArray itemsArray = (JSONArray) jsonObj.get("items");
+        JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0);
+        return JsonUtils.GSON.fromJson(dcaeServiceType0.toString(), DcaeInventoryResponse.class);
+    }
+
+    /**
+     * DO a query to DCAE to get some Information.
+     *
+     * @param artifactName The artifact Name
+     * @param serviceUuid  The service UUID
+     * @param resourceUuid The resource UUID
+     * @return The DCAE inventory for the artifact in DcaeInventoryResponse
+     * @throws IOException    In case of issues with the stream
+     * @throws ParseException In case of issues with the Json parsing
+     */
+    public DcaeInventoryResponse getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid)
+            throws IOException, ParseException, InterruptedException {
+        LoggingUtils.setTargetContext("DCAE", "getDcaeInformation");
+
+        int retryInterval = 0;
+        int retryLimit = 1;
+        if (refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT) != null) {
+            retryLimit = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT));
+        }
+        if (refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL) != null) {
+            retryInterval = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL));
+        }
+        for (int i = 0; i < retryLimit; i++) {
+            metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory");
+            try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) {
+                Exchange exchangeResponse = producerTemplate
+                        .send("direct:get-dcae-blueprint-inventory", ExchangeBuilder.anExchange(camelContext)
+                                .withProperty("blueprintResourceId", resourceUuid)
+                                .withProperty("blueprintServiceId", serviceUuid)
+                                .withProperty("blueprintName", artifactName)
+                                .withProperty("raiseHttpExceptionFlag", false).build());
+
+                if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))
+                        .is2xxSuccessful()) {
+                    String dcaeResponse = (String) exchangeResponse.getIn().getBody();
+                    int totalCount = getTotalCountFromDcaeInventoryResponse(dcaeResponse);
+                    metricsLogger.info("getDcaeInformation complete: totalCount returned=" + totalCount);
+                    if (totalCount > 0) {
+                        logger.info("getDcaeInformation, answer from DCAE inventory:" + dcaeResponse);
+                        LoggingUtils.setResponseContext("0", "Get Dcae Information success", this.getClass().getName());
+                        Date startTime = new Date();
+                        LoggingUtils.setTimeContext(startTime, new Date());
+                        return getItemsFromDcaeInventoryResponse(dcaeResponse);
+                    } else {
+                        logger.info("Dcae inventory totalCount returned is 0, so waiting " + retryInterval
+                                + "ms before retrying ...");
+                        // wait for a while and try to connect to DCAE again
+                        Thread.sleep(retryInterval);
+                    }
+                }
+            }
+        }
+        logger.warn("Dcae inventory totalCount returned is still 0, after " + retryLimit + " attempts, returning NULL");
+        return null;
+    }
+}
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
index 9b6338e00..9b6338e00 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
index 5f10c0afb..5f10c0afb 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
index f11e16733..f11e16733 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
index 20d7143fb..20d7143fb 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
index 27cf0b941..27cf0b941 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
index bb7b76af3..bb7b76af3 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
index a72cffd09..a72cffd09 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
index 3e2e62b66..3e2e62b66 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
index 5d8cbb05e..5d8cbb05e 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
index 67060d776..67060d776 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
index 72f09ce13..72f09ce13 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
index 6005b0d39..6005b0d39 100644
--- a/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
index ef1ced0a3..ef1ced0a3 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
index 4d4855b6f..4d4855b6f 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
index 73c117932..73c117932 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
index b4a013eb4..b4a013eb4 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
index 78c2c6331..78c2c6331 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
index 6939fdf06..6939fdf06 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
index e3f16f908..e3f16f908 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
index 1202ec199..1202ec199 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
index e391ee7e8..e391ee7e8 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
index 3c0240ef3..3c0240ef3 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
index fe573882f..fe573882f 100644
--- a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java b/runtime/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
index 6fa8ecb2b..6fa8ecb2b 100644
--- a/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
index 5708cb6ec..5708cb6ec 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
index c814a628d..c814a628d 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
index a3b42524e..a3b42524e 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
index a69d1a353..a69d1a353 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
index 72ae61359..72ae61359 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
index 4d6e544da..4d6e544da 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
index 9389a51fc..9389a51fc 100644
--- a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
index ca46c6d31..ca46c6d31 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
index 39e64e46b..39e64e46b 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
index fe269c486..fe269c486 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
index df81cfb0c..df81cfb0c 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
index 519a24f46..519a24f46 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
index ada47992a..ada47992a 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
index 10e7a56a4..10e7a56a4 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
index 436e594ce..436e594ce 100644
--- a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java b/runtime/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
index 02481494a..02481494a 100644
--- a/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
index 32f328079..32f328079 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
index c2b5d5963..c2b5d5963 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
index 6702a6200..6702a6200 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
index fb684b57b..fb684b57b 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
index 9834c78e7..fb9d66752 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
@@ -1,72 +1,72 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2020 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.policy.clamp.clds.tosca.update.elements;

-

-import com.google.gson.JsonArray;

-import java.util.ArrayList;

-

-public class ArrayField {

-

-    private ArrayList<Object> complexFields;

-

-    /**

-     * Constructor from arraryList.

-     *

-     * @param arrayProperties the array properties

-     */

-    public ArrayField(ArrayList<Object> arrayProperties) {

-        this.complexFields = arrayProperties;

-    }

-

-    /**

-     * Each LinkedHashMap is parsed to extract the Array and each of its value. They are casted for the JsonObject.

-     *

-     * @return JsonArray

-     */

-    public JsonArray deploy() {

-

-        JsonArray subPropertyValuesArray = new JsonArray();

-        for (Object arrayElement : complexFields) {

-            //Cast for each Primitive Type

-            String typeValue = arrayElement.getClass().getSimpleName();

-            switch (typeValue) {

-                case "String":

-                    subPropertyValuesArray.add((String) arrayElement);

-                    break;

-                case "Boolean":

-                    subPropertyValuesArray.add((Boolean) arrayElement);

-                    break;

-                case "Double":

-                    subPropertyValuesArray.add((Number) arrayElement);

-                    break;

-                case "Integer":

-                    subPropertyValuesArray.add((Number) arrayElement);

-                    break;

-                default:

-                    break;

-            }

-        }

-        return subPropertyValuesArray;

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 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.policy.clamp.clds.tosca.update.elements;
+
+import com.google.gson.JsonArray;
+import java.util.ArrayList;
+
+public class ArrayField {
+
+    private ArrayList<Object> complexFields;
+
+    /**
+     * Constructor from arraryList.
+     *
+     * @param arrayProperties the array properties
+     */
+    public ArrayField(ArrayList<Object> arrayProperties) {
+        this.complexFields = arrayProperties;
+    }
+
+    /**
+     * Each LinkedHashMap is parsed to extract the Array and each of its value. They are casted for the JsonObject.
+     *
+     * @return JsonArray
+     */
+    public JsonArray deploy() {
+
+        JsonArray subPropertyValuesArray = new JsonArray();
+        for (Object arrayElement : complexFields) {
+            //Cast for each Primitive Type
+            String typeValue = arrayElement.getClass().getSimpleName();
+            switch (typeValue) {
+                case "String":
+                    subPropertyValuesArray.add((String) arrayElement);
+                    break;
+                case "Boolean":
+                    subPropertyValuesArray.add((Boolean) arrayElement);
+                    break;
+                case "Double":
+                    subPropertyValuesArray.add((Number) arrayElement);
+                    break;
+                case "Integer":
+                    subPropertyValuesArray.add((Number) arrayElement);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return subPropertyValuesArray;
+    }
+}
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
index b41042abe..651456ca6 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
@@ -1,222 +1,222 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2020 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.policy.clamp.clds.tosca.update.elements;

-

-import com.google.gson.JsonArray;

-import com.google.gson.JsonObject;

-import java.util.ArrayList;

-import java.util.LinkedHashMap;

-import java.util.Map.Entry;

-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;

-

-public class Constraint {

-

-    private LinkedHashMap<String, Object> constraints;

-    private JsonTemplate jsonTemplate;

-

-    public Constraint(LinkedHashMap<String, Object> constraints, JsonTemplate jsonTemplate) {

-        this.jsonTemplate = jsonTemplate;

-        this.constraints = constraints;

-    }

-

-    /**

-     * Deploy the linkedhashmap which contains the constraints, to extract them one to one.

-     *

-     * @param jsonSchema   The json Schema

-     * @param typeProperty The ype property

-     * @return the json object

-     */

-    public JsonObject deployConstraints(JsonObject jsonSchema, String typeProperty) {

-        for (Entry<String, Object> constraint : constraints.entrySet()) {

-            this.parseConstraint(jsonSchema, constraint.getKey(), constraint.getValue(), typeProperty);

-        }

-        return jsonSchema;

-    }

-

-    /**

-     * Each case of Tosca constraints below parse specifically the field in the JsonObject.

-     *

-     * @param jsonSchema      Json Schema

-     * @param nameConstraint  Name constraint

-     * @param valueConstraint value constraint

-     * @param typeProperty    Type Property

-     */

-    @SuppressWarnings("unchecked")

-    public void parseConstraint(JsonObject jsonSchema, String nameConstraint, Object valueConstraint,

-                                String typeProperty) {

-        switch (nameConstraint) {

-            case "equal":

-                checkTemplateField("const", jsonSchema, valueConstraint);

-                break;

-            case "greater_than":

-                checkTemplateField("exclusiveMinimum", jsonSchema, valueConstraint);

-                break;

-            case "greater_or_equal":

-                checkTemplateField("minimum", jsonSchema, valueConstraint);

-                break;

-            case "less_than":

-                checkTemplateField("exclusiveMaximum", jsonSchema, valueConstraint);

-                break;

-            case "less_or_equal":

-                checkTemplateField("maximum", jsonSchema, valueConstraint);

-                break;

-            case "in_range":

-                ArrayList<Integer> limitValues = (ArrayList<Integer>) valueConstraint;

-                checkTemplateField("minimum", jsonSchema, limitValues.get(0));

-                checkTemplateField("maximum", jsonSchema, limitValues.get(1));

-                break;

-            case "pattern":

-                jsonSchema.addProperty(nameConstraint, (String) valueConstraint);

-                break;

-            case "length":

-                this.getSpecificLength(jsonSchema, valueConstraint, typeProperty);

-                break;

-            case "min_length":

-                String[] prefixValues = nameConstraint.split("_");

-                this.getLimitValue(jsonSchema, valueConstraint, typeProperty, prefixValues[0]);

-                break;

-            case "max_length":

-                String[] maxtab = nameConstraint.split("_");

-                this.getLimitValue(jsonSchema, valueConstraint, typeProperty, maxtab[0]);

-                break;

-            default://valid_value

-                this.getValueArray(jsonSchema, valueConstraint, typeProperty);

-                break;

-        }

-

-    }

-

-    /**

-     * To be done.

-     *

-     * @param jsonSchema   json schema

-     * @param fieldValue   field value

-     * @param typeProperty For the complex components, get a specific number of items/properties

-     */

-    public void getSpecificLength(JsonObject jsonSchema, Object fieldValue, String typeProperty) {

-        switch (typeProperty.toLowerCase()) {

-            case "string":

-                checkTemplateField("minLength", jsonSchema, fieldValue);

-                checkTemplateField("maxLength", jsonSchema, fieldValue);

-                break;

-            case "array":

-                if (fieldValue.equals(1) && jsonTemplate.hasFields("uniqueItems")) {

-                    jsonSchema.addProperty("uniqueItems", true);

-                } else {

-                    checkTemplateField("minItems", jsonSchema, fieldValue);

-                    checkTemplateField("maxItems", jsonSchema, fieldValue);

-                }

-                break;

-            default:// Map && List

-                checkTemplateField("minProperties", jsonSchema, fieldValue);

-                checkTemplateField("maxProperties", jsonSchema, fieldValue);

-                break;

-        }

-

-    }

-

-    /**

-     * To be done.

-     *

-     * @param jsonSchema   json schema

-     * @param fieldValue   field value

-     * @param typeProperty type property

-     * @param side         Get the limits fieldValue for the properties : depend of the type of the component

-     */

-    public void getLimitValue(JsonObject jsonSchema, Object fieldValue, String typeProperty, String side) {

-        switch (typeProperty) {

-            case "string":

-                if (side.equals("min")) {

-                    checkTemplateField("minLength", jsonSchema, fieldValue);

-                } else {

-                    checkTemplateField("maxLength", jsonSchema, fieldValue);

-                }

-                break;

-            default:// Array

-                if (side.equals("min")) {

-                    checkTemplateField("minItems", jsonSchema, fieldValue);

-                } else {

-                    checkTemplateField("maxItems", jsonSchema, fieldValue);

-                }

-                break;

-        }

-

-    }

-

-    /**

-     * To be done.

-     *

-     * @param jsonSchema   Json schema

-     * @param fieldValue   field value

-     * @param typeProperty Get as Enum the valid values for the property

-     */

-    public void getValueArray(JsonObject jsonSchema, Object fieldValue, String typeProperty) {

-        if (jsonTemplate.hasFields("enum")) {

-            JsonArray enumeration = new JsonArray();

-            if (typeProperty.equals("string") || typeProperty.equals("String")) {

-                ArrayList<String> arrayValues = (ArrayList<String>) fieldValue;

-                for (String arrayItem : arrayValues) {

-                    enumeration.add(arrayItem);

-                }

-                jsonSchema.add("enum", enumeration);

-            } else {

-                ArrayList<Number> arrayValues = (ArrayList<Number>) fieldValue;

-                for (Number arrayItem : arrayValues) {

-                    enumeration.add(arrayItem);

-                }

-                jsonSchema.add("enum", enumeration);

-            }

-        }

-    }

-

-    /**

-     * To be done.

-     *

-     * @param field      Field

-     * @param jsonSchema Json schema

-     * @param fieldValue Simple way to avoid code duplication

-     */

-    public void checkTemplateField(String field, JsonObject jsonSchema, Object fieldValue) {

-        if (jsonTemplate.hasFields(field)) {

-            String typeField = fieldValue.getClass().getSimpleName();

-            switch (typeField) {

-                case "String":

-                    jsonSchema.addProperty(field, (String) fieldValue);

-                    break;

-                case "Integer":

-                    jsonSchema.addProperty(field, (Integer) fieldValue);

-                    break;

-                case "Number":

-                    jsonSchema.addProperty(field, (Number) fieldValue);

-                    break;

-                case "Boolean":

-                    jsonSchema.addProperty(field, (Boolean) fieldValue);

-                    break;

-                default:

-                    break;

-            }

-        }

-    }

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 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.policy.clamp.clds.tosca.update.elements;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+
+public class Constraint {
+
+    private LinkedHashMap<String, Object> constraints;
+    private JsonTemplate jsonTemplate;
+
+    public Constraint(LinkedHashMap<String, Object> constraints, JsonTemplate jsonTemplate) {
+        this.jsonTemplate = jsonTemplate;
+        this.constraints = constraints;
+    }
+
+    /**
+     * Deploy the linkedhashmap which contains the constraints, to extract them one to one.
+     *
+     * @param jsonSchema   The json Schema
+     * @param typeProperty The ype property
+     * @return the json object
+     */
+    public JsonObject deployConstraints(JsonObject jsonSchema, String typeProperty) {
+        for (Entry<String, Object> constraint : constraints.entrySet()) {
+            this.parseConstraint(jsonSchema, constraint.getKey(), constraint.getValue(), typeProperty);
+        }
+        return jsonSchema;
+    }
+
+    /**
+     * Each case of Tosca constraints below parse specifically the field in the JsonObject.
+     *
+     * @param jsonSchema      Json Schema
+     * @param nameConstraint  Name constraint
+     * @param valueConstraint value constraint
+     * @param typeProperty    Type Property
+     */
+    @SuppressWarnings("unchecked")
+    public void parseConstraint(JsonObject jsonSchema, String nameConstraint, Object valueConstraint,
+                                String typeProperty) {
+        switch (nameConstraint) {
+            case "equal":
+                checkTemplateField("const", jsonSchema, valueConstraint);
+                break;
+            case "greater_than":
+                checkTemplateField("exclusiveMinimum", jsonSchema, valueConstraint);
+                break;
+            case "greater_or_equal":
+                checkTemplateField("minimum", jsonSchema, valueConstraint);
+                break;
+            case "less_than":
+                checkTemplateField("exclusiveMaximum", jsonSchema, valueConstraint);
+                break;
+            case "less_or_equal":
+                checkTemplateField("maximum", jsonSchema, valueConstraint);
+                break;
+            case "in_range":
+                ArrayList<Integer> limitValues = (ArrayList<Integer>) valueConstraint;
+                checkTemplateField("minimum", jsonSchema, limitValues.get(0));
+                checkTemplateField("maximum", jsonSchema, limitValues.get(1));
+                break;
+            case "pattern":
+                jsonSchema.addProperty(nameConstraint, (String) valueConstraint);
+                break;
+            case "length":
+                this.getSpecificLength(jsonSchema, valueConstraint, typeProperty);
+                break;
+            case "min_length":
+                String[] prefixValues = nameConstraint.split("_");
+                this.getLimitValue(jsonSchema, valueConstraint, typeProperty, prefixValues[0]);
+                break;
+            case "max_length":
+                String[] maxtab = nameConstraint.split("_");
+                this.getLimitValue(jsonSchema, valueConstraint, typeProperty, maxtab[0]);
+                break;
+            default://valid_value
+                this.getValueArray(jsonSchema, valueConstraint, typeProperty);
+                break;
+        }
+
+    }
+
+    /**
+     * To be done.
+     *
+     * @param jsonSchema   json schema
+     * @param fieldValue   field value
+     * @param typeProperty For the complex components, get a specific number of items/properties
+     */
+    public void getSpecificLength(JsonObject jsonSchema, Object fieldValue, String typeProperty) {
+        switch (typeProperty.toLowerCase()) {
+            case "string":
+                checkTemplateField("minLength", jsonSchema, fieldValue);
+                checkTemplateField("maxLength", jsonSchema, fieldValue);
+                break;
+            case "array":
+                if (fieldValue.equals(1) && jsonTemplate.hasFields("uniqueItems")) {
+                    jsonSchema.addProperty("uniqueItems", true);
+                } else {
+                    checkTemplateField("minItems", jsonSchema, fieldValue);
+                    checkTemplateField("maxItems", jsonSchema, fieldValue);
+                }
+                break;
+            default:// Map && List
+                checkTemplateField("minProperties", jsonSchema, fieldValue);
+                checkTemplateField("maxProperties", jsonSchema, fieldValue);
+                break;
+        }
+
+    }
+
+    /**
+     * To be done.
+     *
+     * @param jsonSchema   json schema
+     * @param fieldValue   field value
+     * @param typeProperty type property
+     * @param side         Get the limits fieldValue for the properties : depend of the type of the component
+     */
+    public void getLimitValue(JsonObject jsonSchema, Object fieldValue, String typeProperty, String side) {
+        switch (typeProperty) {
+            case "string":
+                if (side.equals("min")) {
+                    checkTemplateField("minLength", jsonSchema, fieldValue);
+                } else {
+                    checkTemplateField("maxLength", jsonSchema, fieldValue);
+                }
+                break;
+            default:// Array
+                if (side.equals("min")) {
+                    checkTemplateField("minItems", jsonSchema, fieldValue);
+                } else {
+                    checkTemplateField("maxItems", jsonSchema, fieldValue);
+                }
+                break;
+        }
+
+    }
+
+    /**
+     * To be done.
+     *
+     * @param jsonSchema   Json schema
+     * @param fieldValue   field value
+     * @param typeProperty Get as Enum the valid values for the property
+     */
+    public void getValueArray(JsonObject jsonSchema, Object fieldValue, String typeProperty) {
+        if (jsonTemplate.hasFields("enum")) {
+            JsonArray enumeration = new JsonArray();
+            if (typeProperty.equals("string") || typeProperty.equals("String")) {
+                ArrayList<String> arrayValues = (ArrayList<String>) fieldValue;
+                for (String arrayItem : arrayValues) {
+                    enumeration.add(arrayItem);
+                }
+                jsonSchema.add("enum", enumeration);
+            } else {
+                ArrayList<Number> arrayValues = (ArrayList<Number>) fieldValue;
+                for (Number arrayItem : arrayValues) {
+                    enumeration.add(arrayItem);
+                }
+                jsonSchema.add("enum", enumeration);
+            }
+        }
+    }
+
+    /**
+     * To be done.
+     *
+     * @param field      Field
+     * @param jsonSchema Json schema
+     * @param fieldValue Simple way to avoid code duplication
+     */
+    public void checkTemplateField(String field, JsonObject jsonSchema, Object fieldValue) {
+        if (jsonTemplate.hasFields(field)) {
+            String typeField = fieldValue.getClass().getSimpleName();
+            switch (typeField) {
+                case "String":
+                    jsonSchema.addProperty(field, (String) fieldValue);
+                    break;
+                case "Integer":
+                    jsonSchema.addProperty(field, (Integer) fieldValue);
+                    break;
+                case "Number":
+                    jsonSchema.addProperty(field, (Number) fieldValue);
+                    break;
+                case "Boolean":
+                    jsonSchema.addProperty(field, (Boolean) fieldValue);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
index 0c531e9d0..0c531e9d0 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
index 4db8b0356..4db8b0356 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
index 5fac9a213..5fac9a213 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
index a1275229d..a1275229d 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java
index 0ffd86f47..0ffd86f47 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
index c80c91170..c80c91170 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
index 74fd8e5fd..74fd8e5fd 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
index a3dd9c3e1..a3dd9c3e1 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
index b2568b79f..b2568b79f 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
index 4e55263fb..4e55263fb 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
index 5c96f2c4a..5c96f2c4a 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
index d9fd11de2..d9fd11de2 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
index 1813d0786..1813d0786 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
index 0890615d9..0890615d9 100644
--- a/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
index fd5079c47..fd5079c47 100644
--- a/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
index 676206e0f..676206e0f 100644
--- a/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
index 4145844a2..4145844a2 100644
--- a/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
index 78b16f1a0..78b16f1a0 100644
--- a/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
diff --git a/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
index d6184c656..d6184c656 100644
--- a/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
diff --git a/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java b/runtime/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
index 6479cf767..6479cf767 100644
--- a/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
diff --git a/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
index db024e07a..db024e07a 100644
--- a/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
diff --git a/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
index 7208a472c..7208a472c 100644
--- a/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
diff --git a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
index d3aaa32a9..d3aaa32a9 100644
--- a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
diff --git a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
index ed8464b14..ed8464b14 100644
--- a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
diff --git a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
index 4a7b65bb4..4a7b65bb4 100644
--- a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
diff --git a/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java b/runtime/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
index d54b23b21..d54b23b21 100644
--- a/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java b/runtime/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
index f46f4227b..f46f4227b 100644
--- a/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/Loop.java b/runtime/src/main/java/org/onap/policy/clamp/loop/Loop.java
index 99d8d1e69..99d8d1e69 100644
--- a/src/main/java/org/onap/policy/clamp/loop/Loop.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/Loop.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopController.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopController.java
index 98459c909..98459c909 100644
--- a/src/main/java/org/onap/policy/clamp/loop/LoopController.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopController.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopService.java
index 975011669..975011669 100644
--- a/src/main/java/org/onap/policy/clamp/loop/LoopService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopService.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopState.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopState.java
index 48d4487f0..48d4487f0 100644
--- a/src/main/java/org/onap/policy/clamp/loop/LoopState.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopState.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
index 7b92ed584..7b92ed584 100644
--- a/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java b/runtime/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
index 68adb3887..68adb3887 100644
--- a/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java b/runtime/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
index 92c795e90..92c795e90 100644
--- a/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
index 6a935d011..6a935d011 100644
--- a/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
index ce7efe494..ce7efe494 100644
--- a/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
index a57800025..a57800025 100644
--- a/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
index 27e8e1a13..27e8e1a13 100644
--- a/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java b/runtime/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
index 1a1414611..1a1414611 100644
--- a/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LogType.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
index 50f6571d6..50f6571d6 100644
--- a/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
index 00f7e1f41..00f7e1f41 100644
--- a/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
index df1f3919e..df1f3919e 100644
--- a/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
index a2f133f2f..a2f133f2f 100644
--- a/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java b/runtime/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
index 1429d73c2..1429d73c2 100644
--- a/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/service/Service.java b/runtime/src/main/java/org/onap/policy/clamp/loop/service/Service.java
index b7442abc5..b7442abc5 100644
--- a/src/main/java/org/onap/policy/clamp/loop/service/Service.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/service/Service.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
index 62596a08e..62596a08e 100644
--- a/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
index 6eb3c7195..6eb3c7195 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
index d9b879d0f..d9b879d0f 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
index ab7367aaf..ab7367aaf 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
index c0b0c7d24..c0b0c7d24 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
index 9da8272bd..9da8272bd 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
index 3993dee34..3993dee34 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
index 974cf3b5c..974cf3b5c 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
index eacfecb5e..eacfecb5e 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
index 81ca18d57..81ca18d57 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
index 2414377d7..2414377d7 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
index 2591bd174..2591bd174 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
index 6ff7e3d0c..6ff7e3d0c 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
index 2d31b3b10..2d31b3b10 100644
--- a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/Policy.java b/runtime/src/main/java/org/onap/policy/clamp/policy/Policy.java
index f8bdab6c2..f8bdab6c2 100644
--- a/src/main/java/org/onap/policy/clamp/policy/Policy.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/Policy.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java
index 4142841e2..4142841e2 100644
--- a/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java
index d2c860150..d2c860150 100644
--- a/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/PolicyService.java b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
index 35ffa2443..35ffa2443 100644
--- a/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java b/runtime/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
index 81775e5da..81775e5da 100644
--- a/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
index be5e7917c..be5e7917c 100644
--- a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
index 2ce2c4f17..2ce2c4f17 100644
--- a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
index b9871049e..b9871049e 100644
--- a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
index 1646a7cc7..1646a7cc7 100644
--- a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
index b0a33669a..b0a33669a 100644
--- a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 6718475ca..6718475ca 100644
--- a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
index 3f3f39b45..3f3f39b45 100644
--- a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java
index c6b44076f..c6b44076f 100644
--- a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java
index 4ce0721b2..4ce0721b2 100644
--- a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java
index 6098d0f63..6098d0f63 100644
--- a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java
diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java
index 6775eb0c6..6775eb0c6 100644
--- a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java
diff --git a/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
index 4b01d6902..4b01d6902 100644
--- a/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
index ecf4b876c..ecf4b876c 100644
--- a/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
index 0bc50fe1a..0bc50fe1a 100644
--- a/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
index a2f417d17..a2f417d17 100644
--- a/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
index 849d4baae..849d4baae 100644
--- a/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
diff --git a/src/main/java/org/onap/policy/clamp/util/PassDecoder.java b/runtime/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
index b8e90e3d0..b8e90e3d0 100644
--- a/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
diff --git a/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java b/runtime/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
index 58367193f..58367193f 100644
--- a/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
+++ b/runtime/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
diff --git a/src/main/resources/META-INF/resources/swagger.html b/runtime/src/main/resources/META-INF/resources/swagger.html
index feb3b6edb..f7fbeb039 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/runtime/src/main/resources/META-INF/resources/swagger.html
@@ -742,7 +742,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_version_information"><a class="anchor" href="#_version_information"></a><a class="link" href="#_version_information">1.1. Version information</a></h3>
 <div class="paragraph">
-<p><em>Version</em> : 6.1.1-SNAPSHOT</p>
+<p><em>Version</em> : 6.1.2-SNAPSHOT</p>
 </div>
 </div>
 <div class="sect2">
@@ -4501,8 +4501,8 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-12-10 09:38:32 CET
+Last updated 2021-05-10 12:05:55 IST
 </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson b/runtime/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson
index 04caffa99..04caffa99 100644
--- a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson
+++ b/runtime/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson
diff --git a/src/main/resources/application-noaaf.properties b/runtime/src/main/resources/application-noaaf.properties
index 1145b393d..1145b393d 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/runtime/src/main/resources/application-noaaf.properties
diff --git a/src/main/resources/application.properties b/runtime/src/main/resources/application.properties
index 3cbb7e8af..3cbb7e8af 100644
--- a/src/main/resources/application.properties
+++ b/runtime/src/main/resources/application.properties
diff --git a/src/main/resources/asciidoc/swagger.adoc b/runtime/src/main/resources/asciidoc/swagger.adoc
index 6896747fd..6896747fd 100644
--- a/src/main/resources/asciidoc/swagger.adoc
+++ b/runtime/src/main/resources/asciidoc/swagger.adoc
diff --git a/src/main/resources/boot-message.txt b/runtime/src/main/resources/boot-message.txt
index 5a6cf1824..5a6cf1824 100644
--- a/src/main/resources/boot-message.txt
+++ b/runtime/src/main/resources/boot-message.txt
diff --git a/src/main/resources/clds-version.properties b/runtime/src/main/resources/clds-version.properties
index a0dbcdead..a0dbcdead 100644
--- a/src/main/resources/clds-version.properties
+++ b/runtime/src/main/resources/clds-version.properties
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.keyfile b/runtime/src/main/resources/clds/aaf/org.onap.clamp.keyfile
index c2521fc81..c2521fc81 100644
--- a/src/main/resources/clds/aaf/org.onap.clamp.keyfile
+++ b/runtime/src/main/resources/clds/aaf/org.onap.clamp.keyfile
diff --git a/src/main/resources/clds/aaf/ssl/ca-certs.pem b/runtime/src/main/resources/clds/aaf/ssl/ca-certs.pem
index 70bb844b7..70bb844b7 100644
--- a/src/main/resources/clds/aaf/ssl/ca-certs.pem
+++ b/runtime/src/main/resources/clds/aaf/ssl/ca-certs.pem
diff --git a/src/main/resources/clds/aaf/ssl/clamp.key b/runtime/src/main/resources/clds/aaf/ssl/clamp.key
index bcbb9f17e..bcbb9f17e 100644
--- a/src/main/resources/clds/aaf/ssl/clamp.key
+++ b/runtime/src/main/resources/clds/aaf/ssl/clamp.key
diff --git a/src/main/resources/clds/aaf/ssl/clamp.pem b/runtime/src/main/resources/clds/aaf/ssl/clamp.pem
index a01b587a5..a01b587a5 100644
--- a/src/main/resources/clds/aaf/ssl/clamp.pem
+++ b/runtime/src/main/resources/clds/aaf/ssl/clamp.pem
diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/runtime/src/main/resources/clds/aaf/truststoreONAPall.jks
index ff844b109..ff844b109 100644
--- a/src/main/resources/clds/aaf/truststoreONAPall.jks
+++ b/runtime/src/main/resources/clds/aaf/truststoreONAPall.jks
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 4659a90bf..4659a90bf 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/runtime/src/main/resources/clds/camel/rest/clds-services.xml
index aa4c3cbee..aa4c3cbee 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/runtime/src/main/resources/clds/camel/rest/clds-services.xml
diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/runtime/src/main/resources/clds/camel/routes/cds-flows.xml
index 10fcb091e..10fcb091e 100644
--- a/src/main/resources/clds/camel/routes/cds-flows.xml
+++ b/runtime/src/main/resources/clds/camel/routes/cds-flows.xml
diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml
index d74bd91bf..d74bd91bf 100644
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ b/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/runtime/src/main/resources/clds/camel/routes/loop-flows.xml
index 4a3cc84b2..4a3cc84b2 100644
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/runtime/src/main/resources/clds/camel/routes/loop-flows.xml
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/runtime/src/main/resources/clds/camel/routes/policy-flows.xml
index 01862692c..01862692c 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/runtime/src/main/resources/clds/camel/routes/policy-flows.xml
diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/runtime/src/main/resources/clds/camel/routes/utils-flows.xml
index 90900f842..90900f842 100644
--- a/src/main/resources/clds/camel/routes/utils-flows.xml
+++ b/runtime/src/main/resources/clds/camel/routes/utils-flows.xml
diff --git a/src/main/resources/clds/clds-users.json b/runtime/src/main/resources/clds/clds-users.json
index 5a7f43841..5a7f43841 100644
--- a/src/main/resources/clds/clds-users.json
+++ b/runtime/src/main/resources/clds/clds-users.json
diff --git a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json b/runtime/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
index 973028316..973028316 100644
--- a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
+++ b/runtime/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
diff --git a/src/main/resources/clds/sdc-controllers-config.json b/runtime/src/main/resources/clds/sdc-controllers-config.json
index be9d02c8d..be9d02c8d 100644
--- a/src/main/resources/clds/sdc-controllers-config.json
+++ b/runtime/src/main/resources/clds/sdc-controllers-config.json
diff --git a/src/main/resources/clds/tosca-converter/default-tosca-types.yaml b/runtime/src/main/resources/clds/tosca-converter/default-tosca-types.yaml
index a11a73698..a11a73698 100644
--- a/src/main/resources/clds/tosca-converter/default-tosca-types.yaml
+++ b/runtime/src/main/resources/clds/tosca-converter/default-tosca-types.yaml
diff --git a/src/main/resources/clds/tosca-converter/templates.json b/runtime/src/main/resources/clds/tosca-converter/templates.json
index f709e2f6d..f709e2f6d 100644
--- a/src/main/resources/clds/tosca-converter/templates.json
+++ b/runtime/src/main/resources/clds/tosca-converter/templates.json
diff --git a/src/main/resources/logback-default.xml b/runtime/src/main/resources/logback-default.xml
index 5397eab04..5397eab04 100644
--- a/src/main/resources/logback-default.xml
+++ b/runtime/src/main/resources/logback-default.xml
diff --git a/src/main/resources/logback-spring.xml b/runtime/src/main/resources/logback-spring.xml
index ffa497f1d..ffa497f1d 100644
--- a/src/main/resources/logback-spring.xml
+++ b/runtime/src/main/resources/logback-spring.xml
diff --git a/src/main/resources/logmessages.properties b/runtime/src/main/resources/logmessages.properties
index fc9f74a36..fc9f74a36 100644
--- a/src/main/resources/logmessages.properties
+++ b/runtime/src/main/resources/logmessages.properties
diff --git a/src/main/resources/system.properties b/runtime/src/main/resources/system.properties
index f95fc7009..f95fc7009 100644
--- a/src/main/resources/system.properties
+++ b/runtime/src/main/resources/system.properties
diff --git a/src/main/script/SelectNpmRepo.groovy b/runtime/src/main/script/SelectNpmRepo.groovy
index 797d2d003..797d2d003 100644
--- a/src/main/script/SelectNpmRepo.groovy
+++ b/runtime/src/main/script/SelectNpmRepo.groovy
diff --git a/src/main/script/TagVersion.groovy b/runtime/src/main/script/TagVersion.groovy
index 271e2967f..271e2967f 100644
--- a/src/main/script/TagVersion.groovy
+++ b/runtime/src/main/script/TagVersion.groovy
diff --git a/src/main/script/checkLibIndex.sh b/runtime/src/main/script/checkLibIndex.sh
index 9a28e7df9..fef9c1b7a 100755..100644
--- a/src/main/script/checkLibIndex.sh
+++ b/runtime/src/main/script/checkLibIndex.sh
@@ -31,9 +31,9 @@ then
 fi
 
 tmpSrcFileList=/tmp/upldateLibIndex.$$.list
-reactUiBaseDir="${baseDir}/ui-react"
-reactLibIndexFile="ui-react-lib/libIndex.js"
-exclusionList="ui-react-lib/libExportExclusions.dat"
+reactUiBaseDir="${baseDir}/runtime/ui-react"
+reactLibIndexFile="runtime/ui-react-lib/libIndex.js"
+exclusionList="runtime/ui-react-lib/libExportExclusions.dat"
 
 
 if [[ ! -d "$reactUiBaseDir" ]]
diff --git a/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
index 6e5300e23..6e5300e23 100644
--- a/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
index 605ab99ae..605ab99ae 100644
--- a/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
index 7390b65ba..7390b65ba 100644
--- a/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
index 557a2e96c..557a2e96c 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
index 52da63952..52da63952 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
index 1a4a2ec5f..1a4a2ec5f 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
index 017881ba7..017881ba7 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
index c8b9932cc..c8b9932cc 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
index 70aeccf59..70aeccf59 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
index 787118902..787118902 100644
--- a/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
index f406e5ed2..f406e5ed2 100644
--- a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
index a246e0efa..a246e0efa 100644
--- a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
index 7999709c2..7999709c2 100644
--- a/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
index 085b3d187..085b3d187 100644
--- a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
index d7a3b3823..d7a3b3823 100644
--- a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
index 08e425abf..08e425abf 100644
--- a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
index f70e74cd6..f70e74cd6 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
index 6f6f5c104..6f6f5c104 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
index 493ee992c..493ee992c 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
index 3eaa0ce51..3eaa0ce51 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
index 2c8744f33..2c8744f33 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
index dc27d8aaa..dc27d8aaa 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
index 658419d4c..658419d4c 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
index 5652fa9cd..5652fa9cd 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
index 7b17adeec..0ea2146b4 100644
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
@@ -1,52 +1,52 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2020 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.policy.clamp.clds.tosca.update;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Arrays;

-import junit.framework.TestCase;

-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;

-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;

-import org.onap.policy.clamp.clds.util.ResourceFileUtils;

-

-public class ToscaElementTest extends TestCase {

-

-    /**

-     * Test propertiesName.

-     *

-     * @throws IOException In case of failure

-     */

-    public void testPropertiesNames() throws IOException {

-        ArrayList<String> reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload"));

-        JsonTemplateManager jsonTemplateManager =

-                new JsonTemplateManager(

-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),

-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),

-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));

-        ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor");

-        assertEquals(reference, toscaElement.propertiesNames());

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 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.policy.clamp.clds.tosca.update;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import junit.framework.TestCase;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+
+public class ToscaElementTest extends TestCase {
+
+    /**
+     * Test propertiesName.
+     *
+     * @throws IOException In case of failure
+     */
+    public void testPropertiesNames() throws IOException {
+        ArrayList<String> reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload"));
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
+                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
+        ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor");
+        assertEquals(reference, toscaElement.propertiesNames());
+    }
+
+}
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
index b2c6d282a..b2c6d282a 100644
--- a/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
index ab6a41bca..ab6a41bca 100644
--- a/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
index 02cabd270..02cabd270 100644
--- a/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
index d5abf41d0..d5abf41d0 100644
--- a/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
diff --git a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java b/runtime/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
index 622fd5999..622fd5999 100644
--- a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
index b0abf832b..b0abf832b 100644
--- a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
index c95725457..c95725457 100644
--- a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
index 4d02b10dc..4d02b10dc 100644
--- a/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
index a73b2784b..a73b2784b 100644
--- a/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
index 6728d292c..6728d292c 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
index 7b0ab8614..7b0ab8614 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
index e18dd2475..e18dd2475 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
index 74092727c..74092727c 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
index 9dcd71ef1..9dcd71ef1 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
index d608075fc..dba7c39a9 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
@@ -1,146 +1,146 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2020 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.policy.clamp.loop;

-

-import static org.assertj.core.api.Assertions.assertThat;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.jupiter.api.Assertions.assertEquals;

-

-import java.util.List;

-import java.util.SortedSet;

-import javax.transaction.Transactional;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.onap.policy.clamp.clds.Application;

-import org.onap.policy.clamp.loop.template.LoopElementModel;

-import org.onap.policy.clamp.loop.template.LoopTemplate;

-import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;

-import org.onap.policy.clamp.loop.template.LoopTemplatesService;

-import org.onap.policy.clamp.loop.template.LoopType;

-import org.onap.policy.clamp.loop.template.PolicyModel;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.boot.test.context.SpringBootTest;

-import org.springframework.test.context.junit4.SpringRunner;

-

-@RunWith(SpringRunner.class)

-@SpringBootTest(classes = Application.class)

-public class LoopTemplatesServiceItCase {

-

-    @Autowired

-    LoopTemplatesService loopTemplatesService;

-

-    private static final String POLICY_MODEL_TYPE_1 = "org.onap.test";

-    private static final String VERSION = "1.0.0";

-

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

-                                                 String createdBy, PolicyModel policyModel) {

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

-        model.setBlueprint("");

-        model.setDcaeBlueprintId("");

-        model.addPolicyModel(policyModel);

-        return model;

-    }

-

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

-                                       String policyAcronym, String createdBy) {

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

-    }

-

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

-        LoopTemplate template =

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

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

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

-        template.setAllowedLoopType(LoopType.OPEN);

-        return template;

-    }

-

-    @Test

-    @Transactional

-    public void shouldSaveOrUpdateLoopTemplate() {

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

-        LoopTemplate actualLoopTemplate =

-                loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-

-        assertNotNull(actualLoopTemplate);

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

-        assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN);

-    }

-

-    @Test

-    @Transactional

-    public void shouldReturnAllLoopTemplates() {

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

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

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

-

-        assertNotNull(loopTemplateList);

-    }

-

-    @Test

-    @Transactional

-    public void shouldReturnLoopTemplateNames() {

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

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

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

-

-        assertNotNull(loopTemplateNames);

-        assertEquals("TemplateName", loopTemplateNames.get(0));

-    }

-

-    @Test

-    @Transactional

-    public void shouldReturnLoopTemplate() {

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

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

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

-

-        assertNotNull(actualLoopTemplate);

-        assertThat(loopTemplate).isEqualTo(actualLoopTemplate);

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

-        assertThat(loopTemplate.getMaximumInstancesAllowed())

-                .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());

-        SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =

-                loopTemplate.getLoopElementModelsUsed();

-        LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();

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

-                .isEqualTo("microService1");

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

-                .isEqualTo("TemplateName");

-        assertNull(actualLoopTemplate.getBlueprint());

-        assertNull(actualLoopTemplate.getModelService());

-    }

-

-    @Test

-    @Transactional

-    public void shouldDeleteLoopTemplate() {

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

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-        loopTemplatesService.deleteLoopTemplate("TemplateName");

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

-        assertNull(actualLoopTemplate);

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 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.policy.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+import java.util.SortedSet;
+import javax.transaction.Transactional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplatesService;
+import org.onap.policy.clamp.loop.template.LoopType;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class LoopTemplatesServiceItCase {
+
+    @Autowired
+    LoopTemplatesService loopTemplatesService;
+
+    private static final String POLICY_MODEL_TYPE_1 = "org.onap.test";
+    private static final String VERSION = "1.0.0";
+
+    private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType,
+                                                 String createdBy, PolicyModel policyModel) {
+        LoopElementModel model = new LoopElementModel(name, loopElementType, yaml);
+        model.setBlueprint("");
+        model.setDcaeBlueprintId("");
+        model.addPolicyModel(policyModel);
+        return model;
+    }
+
+    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,
+                                       String policyAcronym, String createdBy) {
+        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
+    }
+
+    private LoopTemplate getLoopTemplate(String name, String blueprint, String createdBy, Integer maxInstancesAllowed) {
+        LoopTemplate template =
+                new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
+        template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService",
+                createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));
+        template.setAllowedLoopType(LoopType.OPEN);
+        return template;
+    }
+
+    @Test
+    @Transactional
+    public void shouldSaveOrUpdateLoopTemplate() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);
+        LoopTemplate actualLoopTemplate =
+                loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+
+        assertNotNull(actualLoopTemplate);
+        assertThat(loopTemplate.getName()).isEqualTo("TemplateName");
+        assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN);
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnAllLoopTemplates() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        List<LoopTemplate> loopTemplateList = loopTemplatesService.getAllLoopTemplates();
+
+        assertNotNull(loopTemplateList);
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnLoopTemplateNames() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        List<String> loopTemplateNames = loopTemplatesService.getLoopTemplateNames();
+
+        assertNotNull(loopTemplateNames);
+        assertEquals("TemplateName", loopTemplateNames.get(0));
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnLoopTemplate() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");
+
+        assertNotNull(actualLoopTemplate);
+        assertThat(loopTemplate).isEqualTo(actualLoopTemplate);
+        assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName());
+        assertThat(loopTemplate.getMaximumInstancesAllowed())
+                .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());
+        SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =
+                loopTemplate.getLoopElementModelsUsed();
+        LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();
+        assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName())
+                .isEqualTo("microService1");
+        assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())
+                .isEqualTo("TemplateName");
+        assertNull(actualLoopTemplate.getBlueprint());
+        assertNull(actualLoopTemplate.getModelService());
+    }
+
+    @Test
+    @Transactional
+    public void shouldDeleteLoopTemplate() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        loopTemplatesService.deleteLoopTemplate("TemplateName");
+        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");
+        assertNull(actualLoopTemplate);
+    }
+
+}
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
index 0fc4b0b5c..0fc4b0b5c 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
index 5b4e405bb..5b4e405bb 100644
--- a/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
index a2563b8d3..a2563b8d3 100644
--- a/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
index 8f28299fd..8f28299fd 100644
--- a/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
diff --git a/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
index f7f6baa0c..f7f6baa0c 100644
--- a/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
index 657adf1d1..657adf1d1 100644
--- a/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
index 4bb850c35..4bb850c35 100644
--- a/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
index 136430c8f..136430c8f 100644
--- a/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java
index 30d4ebe28..30d4ebe28 100644
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java
index f3c3fc6cd..f3c3fc6cd 100644
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java
index 34674e3ec..34674e3ec 100644
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java
index be7a9d674..be7a9d674 100644
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java
diff --git a/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
index fdde53a21..fdde53a21 100644
--- a/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
diff --git a/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java b/runtime/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
index 7fd0cb91d..7fd0cb91d 100644
--- a/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
diff --git a/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java b/runtime/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
index 604ce55db..604ce55db 100644
--- a/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
+++ b/runtime/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
diff --git a/src/test/resources/application.properties b/runtime/src/test/resources/application.properties
index bc513e9e4..bc513e9e4 100644
--- a/src/test/resources/application.properties
+++ b/runtime/src/test/resources/application.properties
diff --git a/src/test/resources/clds/blueprint-with-microservice-chain.yaml b/runtime/src/test/resources/clds/blueprint-with-microservice-chain.yaml
index 0e9e4bc8c..0e9e4bc8c 100644
--- a/src/test/resources/clds/blueprint-with-microservice-chain.yaml
+++ b/runtime/src/test/resources/clds/blueprint-with-microservice-chain.yaml
diff --git a/src/test/resources/clds/clds-parse-exception.json b/runtime/src/test/resources/clds/clds-parse-exception.json
index 1c06a3947..1c06a3947 100644
--- a/src/test/resources/clds/clds-parse-exception.json
+++ b/runtime/src/test/resources/clds/clds-parse-exception.json
diff --git a/src/test/resources/clds/clds-users-incomplete-permissions.json b/runtime/src/test/resources/clds/clds-users-incomplete-permissions.json
index 9e3534ff4..9e3534ff4 100644
--- a/src/test/resources/clds/clds-users-incomplete-permissions.json
+++ b/runtime/src/test/resources/clds/clds-users-incomplete-permissions.json
diff --git a/src/test/resources/clds/clds-users-no-permission.json b/runtime/src/test/resources/clds/clds-users-no-permission.json
index ac91540f2..ac91540f2 100644
--- a/src/test/resources/clds/clds-users-no-permission.json
+++ b/runtime/src/test/resources/clds/clds-users-no-permission.json
diff --git a/src/test/resources/clds/clds-users-two-users.json b/runtime/src/test/resources/clds/clds-users-two-users.json
index b3721946a..b3721946a 100644
--- a/src/test/resources/clds/clds-users-two-users.json
+++ b/runtime/src/test/resources/clds/clds-users-two-users.json
diff --git a/src/test/resources/clds/new-microservice.yaml b/runtime/src/test/resources/clds/new-microservice.yaml
index 70c1eda46..70c1eda46 100644
--- a/src/test/resources/clds/new-microservice.yaml
+++ b/runtime/src/test/resources/clds/new-microservice.yaml
diff --git a/src/test/resources/clds/policy-merger.json b/runtime/src/test/resources/clds/policy-merger.json
index 5c6bd5b6b..5c6bd5b6b 100644
--- a/src/test/resources/clds/policy-merger.json
+++ b/runtime/src/test/resources/clds/policy-merger.json
diff --git a/src/test/resources/clds/sdc-controller-config-NULL.json b/runtime/src/test/resources/clds/sdc-controller-config-NULL.json
index bf310c706..bf310c706 100644
--- a/src/test/resources/clds/sdc-controller-config-NULL.json
+++ b/runtime/src/test/resources/clds/sdc-controller-config-NULL.json
diff --git a/src/test/resources/clds/sdc-controller-config-TLS.json b/runtime/src/test/resources/clds/sdc-controller-config-TLS.json
index 4d5f02945..4d5f02945 100644
--- a/src/test/resources/clds/sdc-controller-config-TLS.json
+++ b/runtime/src/test/resources/clds/sdc-controller-config-TLS.json
diff --git a/src/test/resources/clds/sdc-controller-config-bad.json b/runtime/src/test/resources/clds/sdc-controller-config-bad.json
index 194ff5f4b..194ff5f4b 100644
--- a/src/test/resources/clds/sdc-controller-config-bad.json
+++ b/runtime/src/test/resources/clds/sdc-controller-config-bad.json
diff --git a/src/test/resources/clds/sdc-controller-config-empty-encrypted.json b/runtime/src/test/resources/clds/sdc-controller-config-empty-encrypted.json
index 2a70b9edc..2a70b9edc 100644
--- a/src/test/resources/clds/sdc-controller-config-empty-encrypted.json
+++ b/runtime/src/test/resources/clds/sdc-controller-config-empty-encrypted.json
diff --git a/src/test/resources/clds/sdc-controllers-config-bad.json b/runtime/src/test/resources/clds/sdc-controllers-config-bad.json
index 0b417b745..0b417b745 100644
--- a/src/test/resources/clds/sdc-controllers-config-bad.json
+++ b/runtime/src/test/resources/clds/sdc-controllers-config-bad.json
diff --git a/src/test/resources/clds/sdc-controllers-config-missing-param.json b/runtime/src/test/resources/clds/sdc-controllers-config-missing-param.json
index d99ed5801..d99ed5801 100644
--- a/src/test/resources/clds/sdc-controllers-config-missing-param.json
+++ b/runtime/src/test/resources/clds/sdc-controllers-config-missing-param.json
diff --git a/src/test/resources/clds/sdc-controllers-config.json b/runtime/src/test/resources/clds/sdc-controllers-config.json
index aafd7d61d..aafd7d61d 100644
--- a/src/test/resources/clds/sdc-controllers-config.json
+++ b/runtime/src/test/resources/clds/sdc-controllers-config.json
diff --git a/src/test/resources/clds/single-microservice-fragment-invalid.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-invalid.yaml
index 2c1680717..2c1680717 100644
--- a/src/test/resources/clds/single-microservice-fragment-invalid.yaml
+++ b/runtime/src/test/resources/clds/single-microservice-fragment-invalid.yaml
diff --git a/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml
index ae31fb16a..ae31fb16a 100644
--- a/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml
+++ b/runtime/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml
diff --git a/src/test/resources/clds/single-microservice-fragment-without-name.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-without-name.yaml
index f9ac53cac..f9ac53cac 100644
--- a/src/test/resources/clds/single-microservice-fragment-without-name.yaml
+++ b/runtime/src/test/resources/clds/single-microservice-fragment-without-name.yaml
diff --git a/src/test/resources/clds/single-microservice-fragment-without-properties.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-without-properties.yaml
index a34ccc6d4..a34ccc6d4 100644
--- a/src/test/resources/clds/single-microservice-fragment-without-properties.yaml
+++ b/runtime/src/test/resources/clds/single-microservice-fragment-without-properties.yaml
diff --git a/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml
index 0354acd69..0354acd69 100644
--- a/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml
+++ b/runtime/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml
diff --git a/src/test/resources/clds/templates/dcae-deployment-template.json b/runtime/src/test/resources/clds/templates/dcae-deployment-template.json
index d4891747e..d4891747e 100644
--- a/src/test/resources/clds/templates/dcae-deployment-template.json
+++ b/runtime/src/test/resources/clds/templates/dcae-deployment-template.json
diff --git a/src/test/resources/clds/templates/dcae-template.json b/runtime/src/test/resources/clds/templates/dcae-template.json
index b76baf2d4..b76baf2d4 100644
--- a/src/test/resources/clds/templates/dcae-template.json
+++ b/runtime/src/test/resources/clds/templates/dcae-template.json
diff --git a/src/test/resources/clds/templates/globalProperties.json b/runtime/src/test/resources/clds/templates/globalProperties.json
index 067063ea2..067063ea2 100644
--- a/src/test/resources/clds/templates/globalProperties.json
+++ b/runtime/src/test/resources/clds/templates/globalProperties.json
diff --git a/src/test/resources/clds/templates/sdc-decode-service_ids.json b/runtime/src/test/resources/clds/templates/sdc-decode-service_ids.json
index 9e26dfeeb..9e26dfeeb 100644
--- a/src/test/resources/clds/templates/sdc-decode-service_ids.json
+++ b/runtime/src/test/resources/clds/templates/sdc-decode-service_ids.json
diff --git a/src/test/resources/clds/templates/sdc-template.json b/runtime/src/test/resources/clds/templates/sdc-template.json
index 9e26dfeeb..9e26dfeeb 100644
--- a/src/test/resources/clds/templates/sdc-template.json
+++ b/runtime/src/test/resources/clds/templates/sdc-template.json
diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/runtime/src/test/resources/clds/templates/tca-policy-template.json
index 559aacb29..559aacb29 100644
--- a/src/test/resources/clds/templates/tca-policy-template.json
+++ b/runtime/src/test/resources/clds/templates/tca-policy-template.json
diff --git a/src/test/resources/clds/templates/tca-template.json b/runtime/src/test/resources/clds/templates/tca-template.json
index 892fc0d62..892fc0d62 100644
--- a/src/test/resources/clds/templates/tca-template.json
+++ b/runtime/src/test/resources/clds/templates/tca-template.json
diff --git a/src/test/resources/clds/templates/tca-thresholds-template.json b/runtime/src/test/resources/clds/templates/tca-thresholds-template.json
index b67e96321..b67e96321 100644
--- a/src/test/resources/clds/templates/tca-thresholds-template.json
+++ b/runtime/src/test/resources/clds/templates/tca-thresholds-template.json
diff --git a/src/test/resources/clds/templates/ui-location-default.json b/runtime/src/test/resources/clds/templates/ui-location-default.json
index c0043d988..c0043d988 100644
--- a/src/test/resources/clds/templates/ui-location-default.json
+++ b/runtime/src/test/resources/clds/templates/ui-location-default.json
diff --git a/src/test/resources/clds/util/file.xml b/runtime/src/test/resources/clds/util/file.xml
index 81560bab4..81560bab4 100644
--- a/src/test/resources/clds/util/file.xml
+++ b/runtime/src/test/resources/clds/util/file.xml
diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
index 2b6493176..2b6493176 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
+++ b/runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
index 115d79b1f..115d79b1f 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
+++ b/runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
index 07d851f38..07d851f38 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
+++ b/runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
index 7f76c6cae..7f76c6cae 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
+++ b/runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
diff --git a/src/test/resources/example/dcae/inventory-response.json b/runtime/src/test/resources/example/dcae/inventory-response.json
index 1ebf068b8..1ebf068b8 100644
--- a/src/test/resources/example/dcae/inventory-response.json
+++ b/runtime/src/test/resources/example/dcae/inventory-response.json
diff --git a/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json b/runtime/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json
index 3b4a0eafc..3b4a0eafc 100644
--- a/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json
+++ b/runtime/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json
diff --git a/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json b/runtime/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json
index 0040052f2..0040052f2 100644
--- a/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json
+++ b/runtime/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json
diff --git a/src/test/resources/example/policy/pdp-group-multi-policies-payload.json b/runtime/src/test/resources/example/policy/pdp-group-multi-policies-payload.json
index 5e9c77f45..5e9c77f45 100644
--- a/src/test/resources/example/policy/pdp-group-multi-policies-payload.json
+++ b/runtime/src/test/resources/example/policy/pdp-group-multi-policies-payload.json
diff --git a/src/test/resources/example/policy/pdp-group-policy-payload.json b/runtime/src/test/resources/example/policy/pdp-group-policy-payload.json
index 897fb43be..897fb43be 100644
--- a/src/test/resources/example/policy/pdp-group-policy-payload.json
+++ b/runtime/src/test/resources/example/policy/pdp-group-policy-payload.json
diff --git a/src/test/resources/example/policy/policy-merger.json b/runtime/src/test/resources/example/policy/policy-merger.json
index c3291ef71..c3291ef71 100644
--- a/src/test/resources/example/policy/policy-merger.json
+++ b/runtime/src/test/resources/example/policy/policy-merger.json
diff --git a/src/test/resources/example/policy/single-policy-enriched.json b/runtime/src/test/resources/example/policy/single-policy-enriched.json
index 66355e589..66355e589 100644
--- a/src/test/resources/example/policy/single-policy-enriched.json
+++ b/runtime/src/test/resources/example/policy/single-policy-enriched.json
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml
index bea4d2710..bea4d2710 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml
+++ b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
index e7d967a26..e7d967a26 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
+++ b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
index 0cb9cdb68..0cb9cdb68 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
+++ b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
index 00ebfe7fe..00ebfe7fe 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
+++ b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
index 929f36367..929f36367 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
+++ b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json b/runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json
index 58f4cf3b2..58f4cf3b2 100644
--- a/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json
+++ b/runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json
diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json b/runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json
index 7140a4748..7140a4748 100644
--- a/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json
+++ b/runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json
diff --git a/src/test/resources/example/sdc/expected-result/policy-data.yaml b/runtime/src/test/resources/example/sdc/expected-result/policy-data.yaml
index 3cf5e975c..3cf5e975c 100644
--- a/src/test/resources/example/sdc/expected-result/policy-data.yaml
+++ b/runtime/src/test/resources/example/sdc/expected-result/policy-data.yaml
diff --git a/src/test/resources/example/sdc/service-Simsfoimap0112.csar b/runtime/src/test/resources/example/sdc/service-Simsfoimap0112.csar
index 8c16d31ee..8c16d31ee 100644
--- a/src/test/resources/example/sdc/service-Simsfoimap0112.csar
+++ b/runtime/src/test/resources/example/sdc/service-Simsfoimap0112.csar
diff --git a/src/test/resources/example/sdc/service-without-policy.csar b/runtime/src/test/resources/example/sdc/service-without-policy.csar
index 20c4eef65..20c4eef65 100644
--- a/src/test/resources/example/sdc/service-without-policy.csar
+++ b/runtime/src/test/resources/example/sdc/service-without-policy.csar
diff --git a/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar b/runtime/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar
index ff337993a..ff337993a 100644
--- a/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar
+++ b/runtime/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar
diff --git a/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar b/runtime/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar
index 3330dd1e8..3330dd1e8 100644
--- a/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar
+++ b/runtime/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
index 9e616dfea..9e616dfea 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
+++ b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
index 5464a754d..5464a754d 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
+++ b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
index 58975d86a..58975d86a 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policies/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.file
index 91c3c87de..91c3c87de 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policies/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policies/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policies/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
index 50fcf9135..50fcf9135 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file
index a00692971..a00692971 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
index 79e79f0fe..79e79f0fe 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
index 163027e46..163027e46 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
index 778efae9e..778efae9e 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
index 78bdde746..78bdde746 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
index 5464a754d..5464a754d 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
index 14ae7acd8..14ae7acd8 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
index af7a61ef7..af7a61ef7 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
index 3c17c9004..3c17c9004 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file
index 367d2b5a4..367d2b5a4 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file b/runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
index 467409f47..467409f47 100644
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
+++ b/runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header b/runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
index b11784a21..b11784a21 100644
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
+++ b/runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
diff --git a/src/test/resources/http-cache/start_http_cache.sh b/runtime/src/test/resources/http-cache/start_http_cache.sh
index 1f84b56f5..1f84b56f5 100755
--- a/src/test/resources/http-cache/start_http_cache.sh
+++ b/runtime/src/test/resources/http-cache/start_http_cache.sh
diff --git a/src/test/resources/http-cache/third_party_proxy.py b/runtime/src/test/resources/http-cache/third_party_proxy.py
index 7fe316852..7fe316852 100755..100644
--- a/src/test/resources/http-cache/third_party_proxy.py
+++ b/runtime/src/test/resources/http-cache/third_party_proxy.py
diff --git a/src/test/resources/https/https-test.properties b/runtime/src/test/resources/https/https-test.properties
index 14079a78e..14079a78e 100644
--- a/src/test/resources/https/https-test.properties
+++ b/runtime/src/test/resources/https/https-test.properties
diff --git a/src/test/resources/https/keystore-test.jks b/runtime/src/test/resources/https/keystore-test.jks
index 04ad3b114..04ad3b114 100644
--- a/src/test/resources/https/keystore-test.jks
+++ b/runtime/src/test/resources/https/keystore-test.jks
diff --git a/src/test/resources/logback.xml b/runtime/src/test/resources/logback.xml
index 97a8982a9..97a8982a9 100644
--- a/src/test/resources/logback.xml
+++ b/runtime/src/test/resources/logback.xml
diff --git a/src/test/resources/robotframework/Dockerfile b/runtime/src/test/resources/robotframework/Dockerfile
index 03d180c5e..e93b7b9d1 100644
--- a/src/test/resources/robotframework/Dockerfile
+++ b/runtime/src/test/resources/robotframework/Dockerfile
@@ -2,4 +2,5 @@ FROM  ppodgorsek/robot-framework:3.8.0
 
 USER root
 COPY requirements.txt .
-RUN pip3 install --no-cache-dir -r requirements.txt
\ No newline at end of file
+RUN pip3 install --no-cache-dir -r requirements.txt
+
diff --git a/src/test/resources/robotframework/requirements.txt b/runtime/src/test/resources/robotframework/requirements.txt
index 2ae8f4500..2ae8f4500 100644
--- a/src/test/resources/robotframework/requirements.txt
+++ b/runtime/src/test/resources/robotframework/requirements.txt
diff --git a/src/test/resources/robotframework/robotframework-test.properties b/runtime/src/test/resources/robotframework/robotframework-test.properties
index fed074198..fed074198 100644
--- a/src/test/resources/robotframework/robotframework-test.properties
+++ b/runtime/src/test/resources/robotframework/robotframework-test.properties
diff --git a/src/test/resources/robotframework/tests/01_healthcheck.robot b/runtime/src/test/resources/robotframework/tests/01_healthcheck.robot
index f19266781..f19266781 100644
--- a/src/test/resources/robotframework/tests/01_healthcheck.robot
+++ b/runtime/src/test/resources/robotframework/tests/01_healthcheck.robot
diff --git a/src/test/resources/robotframework/tests/02_policy_queries.robot b/runtime/src/test/resources/robotframework/tests/02_policy_queries.robot
index 713a39f52..713a39f52 100644
--- a/src/test/resources/robotframework/tests/02_policy_queries.robot
+++ b/runtime/src/test/resources/robotframework/tests/02_policy_queries.robot
diff --git a/src/test/resources/tosca/micro-service-policy-payload.json b/runtime/src/test/resources/tosca/micro-service-policy-payload.json
index 2533a5410..2533a5410 100644
--- a/src/test/resources/tosca/micro-service-policy-payload.json
+++ b/runtime/src/test/resources/tosca/micro-service-policy-payload.json
diff --git a/src/test/resources/tosca/micro-service-policy-properties.json b/runtime/src/test/resources/tosca/micro-service-policy-properties.json
index 04fe0cc7f..04fe0cc7f 100644
--- a/src/test/resources/tosca/micro-service-policy-properties.json
+++ b/runtime/src/test/resources/tosca/micro-service-policy-properties.json
diff --git a/src/test/resources/tosca/model-properties-cds.json b/runtime/src/test/resources/tosca/model-properties-cds.json
index fea658431..fea658431 100644
--- a/src/test/resources/tosca/model-properties-cds.json
+++ b/runtime/src/test/resources/tosca/model-properties-cds.json
diff --git a/src/test/resources/tosca/model-properties-operational-policy.json b/runtime/src/test/resources/tosca/model-properties-operational-policy.json
index 2a6568528..2a6568528 100644
--- a/src/test/resources/tosca/model-properties-operational-policy.json
+++ b/runtime/src/test/resources/tosca/model-properties-operational-policy.json
diff --git a/src/test/resources/tosca/model-properties.json b/runtime/src/test/resources/tosca/model-properties.json
index 1c0fe24b4..1c0fe24b4 100644
--- a/src/test/resources/tosca/model-properties.json
+++ b/runtime/src/test/resources/tosca/model-properties.json
diff --git a/src/test/resources/tosca/new-converter/constraints.yaml b/runtime/src/test/resources/tosca/new-converter/constraints.yaml
index 7a94ca965..b711f35c8 100644
--- a/src/test/resources/tosca/new-converter/constraints.yaml
+++ b/runtime/src/test/resources/tosca/new-converter/constraints.yaml
@@ -1,60 +1,60 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-policy_types:

-    onap.policies.controlloop.operational.common.Drools:

-        derived_from: onap.policies.controlloop.operational.Common

-        type_version: 1.0.0

-        version: 1.0.0

-        description: Operational policies for Drools PDP

-        properties:

-            controllerName:

-                type: String

-                description: Drools controller properties

-                required: true

-data_types:

-    onap.datatype.controlloop.Operation:

-        derived_from: tosca.datatypes.Root

-        description: An operation supported by an actor

-        properties:

-            id:

-                type: String

-                description: Unique identifier for the operation

-                required: true

-                constraints:

-                - length: 8

-            description:

-                type: Array

-                description: A user-friendly description of the intent for the operation

-                required: false

-                constraints:

-                - min_length: 5

-                - max_length: 7

-            test:

-                type: Integer

-                description: |

-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total

-                    timeout for each operation listed.

-                required: true

-                constraints:

-                    - greater_than: 7

-                    - greater_or_equal: 1

-                    - less_than: 7

-                    - less_or_equal: 1

-            timeout:

-                type: Integer

-                description: The amount of time for the actor to perform the operation.

-                required: true

-                constraints:

-                - valid_values: [3,4,5.5,6,10]

-            retries:

-                type: Integer

-                description: The number of retries the actor should attempt to perform the operation.

-                required: true

-                default: 0

-                constraints:

-                - equal: 5

-            success:

-                type: String

-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.

-                required: false

-                constraints:

-                - valid_values: [VALID,TERMINATED]

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+policy_types:
+    onap.policies.controlloop.operational.common.Drools:
+        derived_from: onap.policies.controlloop.operational.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Operational policies for Drools PDP
+        properties:
+            controllerName:
+                type: String
+                description: Drools controller properties
+                required: true
+data_types:
+    onap.datatype.controlloop.Operation:
+        derived_from: tosca.datatypes.Root
+        description: An operation supported by an actor
+        properties:
+            id:
+                type: String
+                description: Unique identifier for the operation
+                required: true
+                constraints:
+                - length: 8
+            description:
+                type: Array
+                description: A user-friendly description of the intent for the operation
+                required: false
+                constraints:
+                - min_length: 5
+                - max_length: 7
+            test:
+                type: Integer
+                description: |
+                    Overall timeout for executing all the operations. This timeout should equal or exceed the total
+                    timeout for each operation listed.
+                required: true
+                constraints:
+                    - greater_than: 7
+                    - greater_or_equal: 1
+                    - less_than: 7
+                    - less_or_equal: 1
+            timeout:
+                type: Integer
+                description: The amount of time for the actor to perform the operation.
+                required: true
+                constraints:
+                - valid_values: [3,4,5.5,6,10]
+            retries:
+                type: Integer
+                description: The number of retries the actor should attempt to perform the operation.
+                required: true
+                default: 0
+                constraints:
+                - equal: 5
+            success:
+                type: String
+                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
+                required: false
+                constraints:
+                - valid_values: [VALID,TERMINATED]
diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
index c2afeccdc..1da17190e 100644
--- a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
+++ b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
@@ -1,160 +1,160 @@
-

-tosca_definitions_version: tosca_simple_yaml_1_0_0

-policy_types:

-    onap.policies.controlloop.operational.Common:

-        derived_from: tosca.policies.Root

-        version: 1.0.0

-        description: Operational Policy for Control Loop execution

-        properties:

-            id:

-                type: String

-                description: The unique control loop id.

-                required: true

-            timeout:

-                type: Integer

-                description: |

-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total

-                    timeout for each operation listed.

-                required: true

-            abatement:

-                type: Boolean

-                description: Whether an abatement event message will be expected for the control loop from DCAE.

-                required: true

-                default: false

-            trigger:

-                type: String

-                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.

-                required: true

-            operations:

-                type: List

-                description: List of operations to be performed when Control Loop is triggered.

-                required: true

-                entry_schema:

-                    type: onap.datatype.controlloop.Operation

-    onap.policies.controlloop.operational.common.Drools:

-        derived_from: onap.policies.controlloop.operational.Common

-        type_version: 1.0.0

-        version: 1.0.0

-        description: Operational policies for Drools PDP

-        properties:

-            controllerName:

-                type: String

-                description: Drools controller properties

-                required: false

-data_types:

-    # TBD if this is needed

-    onap.datatype.controlloop.operation.Failure:

-        derived_from: tosca.datatypes.Root

-        description: Captures information of an operational failure performed for control loop

-        properties:

-            messages:

-                type: String

-                description: error message

-                required: true

-            category:

-                type: String

-                description: |

-                    The category the error occurred in. Whether this is a general error from the actor, or the operation

-                    timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the

-                    operation from occuring, or an exception in the system caused the failure.

-                constraints:

-                - valid_values: [error, timeout, retries, guard, exception]

-    onap.datatype.controlloop.Target:

-        derived_from: tosca.datatypes.Root

-        description: Definition for a entity in A&AI to perform a control loop operation on

-        properties:

-            targetType:

-                type: String

-                description: Category for the target type

-                required: true

-                constraints:

-                - valid_values: [VNF, VM, VFMODULE, PNF]

-            entityIds:

-                type: Map

-                description: |

-                    Map of values that identify the resource. If none are provided, it is assumed that the

-                    entity that generated the ONSET event will be the target.

-                required: false

-                entry_schema:

-                    type: String

-    onap.datatype.controlloop.Actor:

-        derived_from: tosca.datatypes.Root

-        description: An actor/operation/target definition

-        properties:

-            actor:

-                type: String

-                description: The actor performing the operation.

-                required: true

-            operation:

-                type: String

-                description: The operation the actor is performing.

-                required: true

-            target:

-                type: String

-                description: The resource the operation should be performed on.

-                required: true

-                metadata:

-                    clamp_possible_values: <string:see clamp project for syntax>

-            payload:

-                type: Map

-                description: Name/value pairs of payload information passed by Policy to the actor

-                required: false

-                entry_schema:

-                    type: String

-    onap.datatype.controlloop.Operation:

-        derived_from: tosca.datatypes.Root

-        description: An operation supported by an actor

-        properties:

-            id:

-                type: String

-                description: Unique identifier for the operation

-                required: true

-            description:

-                type: String

-                description: A user-friendly description of the intent for the operation

-                required: false

-            operation:

-                type: onap.datatype.controlloop.Actor

-                description: The definition of the operation to be performed.

-                required: true

-                metadata:

-                    clamp_possible_values: <string:see clamp project for syntax>

-            timeout:

-                type: Integer

-                description: The amount of time for the actor to perform the operation.

-                required: true

-            retries:

-                type: Integer

-                description: The number of retries the actor should attempt to perform the operation.

-                required: true

-                default: 0

-            success:

-                type: String

-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.

-                required: false

-                default: final_success

-            failure:

-                type: String

-                description: Points to the operation to invoke on Actor operation failure.

-                required: false

-                default: final_failure

-            failure_timeout:

-                type: String

-                description: Points to the operation to invoke when the time out for the operation occurs.

-                required: false

-                default: final_failure_timeout

-            failure_retries:

-                type: String

-                description: Points to the operation to invoke when the current operation has exceeded its max retries.

-                required: false

-                default: final_failure_retries

-            failure_exception:

-                type: String

-                description: Points to the operation to invoke when the current operation causes an exception.

-                required: false

-                default: final_failure_exception

-            failure_guard:

-                type: String

-                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.

-                required: false

-                default: final_failure_guard

+
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+policy_types:
+    onap.policies.controlloop.operational.Common:
+        derived_from: tosca.policies.Root
+        version: 1.0.0
+        description: Operational Policy for Control Loop execution
+        properties:
+            id:
+                type: String
+                description: The unique control loop id.
+                required: true
+            timeout:
+                type: Integer
+                description: |
+                    Overall timeout for executing all the operations. This timeout should equal or exceed the total
+                    timeout for each operation listed.
+                required: true
+            abatement:
+                type: Boolean
+                description: Whether an abatement event message will be expected for the control loop from DCAE.
+                required: true
+                default: false
+            trigger:
+                type: String
+                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
+                required: true
+            operations:
+                type: List
+                description: List of operations to be performed when Control Loop is triggered.
+                required: true
+                entry_schema:
+                    type: onap.datatype.controlloop.Operation
+    onap.policies.controlloop.operational.common.Drools:
+        derived_from: onap.policies.controlloop.operational.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Operational policies for Drools PDP
+        properties:
+            controllerName:
+                type: String
+                description: Drools controller properties
+                required: false
+data_types:
+    # TBD if this is needed
+    onap.datatype.controlloop.operation.Failure:
+        derived_from: tosca.datatypes.Root
+        description: Captures information of an operational failure performed for control loop
+        properties:
+            messages:
+                type: String
+                description: error message
+                required: true
+            category:
+                type: String
+                description: |
+                    The category the error occurred in. Whether this is a general error from the actor, or the operation
+                    timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the
+                    operation from occuring, or an exception in the system caused the failure.
+                constraints:
+                - valid_values: [error, timeout, retries, guard, exception]
+    onap.datatype.controlloop.Target:
+        derived_from: tosca.datatypes.Root
+        description: Definition for a entity in A&AI to perform a control loop operation on
+        properties:
+            targetType:
+                type: String
+                description: Category for the target type
+                required: true
+                constraints:
+                - valid_values: [VNF, VM, VFMODULE, PNF]
+            entityIds:
+                type: Map
+                description: |
+                    Map of values that identify the resource. If none are provided, it is assumed that the
+                    entity that generated the ONSET event will be the target.
+                required: false
+                entry_schema:
+                    type: String
+    onap.datatype.controlloop.Actor:
+        derived_from: tosca.datatypes.Root
+        description: An actor/operation/target definition
+        properties:
+            actor:
+                type: String
+                description: The actor performing the operation.
+                required: true
+            operation:
+                type: String
+                description: The operation the actor is performing.
+                required: true
+            target:
+                type: String
+                description: The resource the operation should be performed on.
+                required: true
+                metadata:
+                    clamp_possible_values: <string:see clamp project for syntax>
+            payload:
+                type: Map
+                description: Name/value pairs of payload information passed by Policy to the actor
+                required: false
+                entry_schema:
+                    type: String
+    onap.datatype.controlloop.Operation:
+        derived_from: tosca.datatypes.Root
+        description: An operation supported by an actor
+        properties:
+            id:
+                type: String
+                description: Unique identifier for the operation
+                required: true
+            description:
+                type: String
+                description: A user-friendly description of the intent for the operation
+                required: false
+            operation:
+                type: onap.datatype.controlloop.Actor
+                description: The definition of the operation to be performed.
+                required: true
+                metadata:
+                    clamp_possible_values: <string:see clamp project for syntax>
+            timeout:
+                type: Integer
+                description: The amount of time for the actor to perform the operation.
+                required: true
+            retries:
+                type: Integer
+                description: The number of retries the actor should attempt to perform the operation.
+                required: true
+                default: 0
+            success:
+                type: String
+                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
+                required: false
+                default: final_success
+            failure:
+                type: String
+                description: Points to the operation to invoke on Actor operation failure.
+                required: false
+                default: final_failure
+            failure_timeout:
+                type: String
+                description: Points to the operation to invoke when the time out for the operation occurs.
+                required: false
+                default: final_failure_timeout
+            failure_retries:
+                type: String
+                description: Points to the operation to invoke when the current operation has exceeded its max retries.
+                required: false
+                default: final_failure_retries
+            failure_exception:
+                type: String
+                description: Points to the operation to invoke when the current operation causes an exception.
+                required: false
+                default: final_failure_exception
+            failure_guard:
+                type: String
+                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
+                required: false
+                default: final_failure_guard
diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
index 780acadc2..780acadc2 100644
--- a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
+++ b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.json b/runtime/src/test/resources/tosca/new-converter/tca-with-metadata.json
index 3a700c8ee..3a700c8ee 100644
--- a/src/test/resources/tosca/new-converter/tca-with-metadata.json
+++ b/runtime/src/test/resources/tosca/new-converter/tca-with-metadata.json
diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/runtime/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
index 4519d5c9f..4519d5c9f 100644
--- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
+++ b/runtime/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
diff --git a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml b/runtime/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
index 7fe9d5398..7fe9d5398 100644
--- a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
+++ b/runtime/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
diff --git a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json b/runtime/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
index 9a9308e3b..9a9308e3b 100644
--- a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
+++ b/runtime/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/runtime/src/test/resources/tosca/operational-policy-json-schema.json
index dc6c32fa7..dc6c32fa7 100644
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ b/runtime/src/test/resources/tosca/operational-policy-json-schema.json
diff --git a/src/test/resources/tosca/operational-policy-no-guard-properties.json b/runtime/src/test/resources/tosca/operational-policy-no-guard-properties.json
index fdb1906a4..fdb1906a4 100644
--- a/src/test/resources/tosca/operational-policy-no-guard-properties.json
+++ b/runtime/src/test/resources/tosca/operational-policy-no-guard-properties.json
diff --git a/src/test/resources/tosca/operational-policy-properties.json b/runtime/src/test/resources/tosca/operational-policy-properties.json
index a38334b55..a38334b55 100644
--- a/src/test/resources/tosca/operational-policy-properties.json
+++ b/runtime/src/test/resources/tosca/operational-policy-properties.json
diff --git a/src/test/resources/tosca/resource-details-cds.json b/runtime/src/test/resources/tosca/resource-details-cds.json
index d972d0cb9..d972d0cb9 100644
--- a/src/test/resources/tosca/resource-details-cds.json
+++ b/runtime/src/test/resources/tosca/resource-details-cds.json
diff --git a/src/test/resources/tosca/resource-details.json b/runtime/src/test/resources/tosca/resource-details.json
index b55adbf52..b55adbf52 100644
--- a/src/test/resources/tosca/resource-details.json
+++ b/runtime/src/test/resources/tosca/resource-details.json
diff --git a/src/test/resources/tosca/service-details.json b/runtime/src/test/resources/tosca/service-details.json
index f41eec107..f41eec107 100644
--- a/src/test/resources/tosca/service-details.json
+++ b/runtime/src/test/resources/tosca/service-details.json
diff --git a/src/test/resources/tosca/tca_hi_lo.json b/runtime/src/test/resources/tosca/tca_hi_lo.json
index cb3ed893f..cb3ed893f 100644
--- a/src/test/resources/tosca/tca_hi_lo.json
+++ b/runtime/src/test/resources/tosca/tca_hi_lo.json
diff --git a/src/test/resources/tosca/tosca_example.yaml b/runtime/src/test/resources/tosca/tosca_example.yaml
index b0119f887..b0119f887 100644
--- a/src/test/resources/tosca/tosca_example.yaml
+++ b/runtime/src/test/resources/tosca/tosca_example.yaml
diff --git a/src/test/resources/tosca/tosca_with_date_time_json_schema.json b/runtime/src/test/resources/tosca/tosca_with_date_time_json_schema.json
index e15942cc5..e15942cc5 100644
--- a/src/test/resources/tosca/tosca_with_date_time_json_schema.json
+++ b/runtime/src/test/resources/tosca/tosca_with_date_time_json_schema.json
diff --git a/src/test/resources/tosca/tosca_with_metadata.yaml b/runtime/src/test/resources/tosca/tosca_with_metadata.yaml
index 5967d1569..5967d1569 100644
--- a/src/test/resources/tosca/tosca_with_metadata.yaml
+++ b/runtime/src/test/resources/tosca/tosca_with_metadata.yaml
diff --git a/ui-react-lib/libExportExclusions.dat b/runtime/ui-react-lib/libExportExclusions.dat
index 7194fc2ad..7194fc2ad 100644
--- a/ui-react-lib/libExportExclusions.dat
+++ b/runtime/ui-react-lib/libExportExclusions.dat
diff --git a/ui-react-lib/libIndex.js b/runtime/ui-react-lib/libIndex.js
index 75d1bc9df..75d1bc9df 100755
--- a/ui-react-lib/libIndex.js
+++ b/runtime/ui-react-lib/libIndex.js
diff --git a/ui-react-lib/package.json b/runtime/ui-react-lib/package.json
index b1efe2f8e..b1efe2f8e 100755
--- a/ui-react-lib/package.json
+++ b/runtime/ui-react-lib/package.json
diff --git a/ui-react-lib/rollup.config.js b/runtime/ui-react-lib/rollup.config.js
index c671779c0..c671779c0 100755
--- a/ui-react-lib/rollup.config.js
+++ b/runtime/ui-react-lib/rollup.config.js
diff --git a/ui-react/package.json b/runtime/ui-react/package.json
index fd3dc0ad3..fd3dc0ad3 100644
--- a/ui-react/package.json
+++ b/runtime/ui-react/package.json
diff --git a/ui-react/public/index.html b/runtime/ui-react/public/index.html
index bab3e7ab6..bab3e7ab6 100644
--- a/ui-react/public/index.html
+++ b/runtime/ui-react/public/index.html
diff --git a/ui-react/public/manifest.json b/runtime/ui-react/public/manifest.json
index 8210c4ee5..8210c4ee5 100644
--- a/ui-react/public/manifest.json
+++ b/runtime/ui-react/public/manifest.json
diff --git a/ui-react/public/onap.ico b/runtime/ui-react/public/onap.ico
index 85e168ae2..85e168ae2 100644
--- a/ui-react/public/onap.ico
+++ b/runtime/ui-react/public/onap.ico
diff --git a/ui-react/src/LoopUI.js b/runtime/ui-react/src/LoopUI.js
index 8dc3bdb03..8dc3bdb03 100644
--- a/ui-react/src/LoopUI.js
+++ b/runtime/ui-react/src/LoopUI.js
diff --git a/ui-react/src/LoopUI.test.js b/runtime/ui-react/src/LoopUI.test.js
index bfd6376e3..bfd6376e3 100644
--- a/ui-react/src/LoopUI.test.js
+++ b/runtime/ui-react/src/LoopUI.test.js
diff --git a/ui-react/src/NotFound.js b/runtime/ui-react/src/NotFound.js
index d4b53fd71..d4b53fd71 100644
--- a/ui-react/src/NotFound.js
+++ b/runtime/ui-react/src/NotFound.js
diff --git a/ui-react/src/NotFound.test.js b/runtime/ui-react/src/NotFound.test.js
index 3a5fc107d..3a5fc107d 100644
--- a/ui-react/src/NotFound.test.js
+++ b/runtime/ui-react/src/NotFound.test.js
diff --git a/ui-react/src/OnapClamp.js b/runtime/ui-react/src/OnapClamp.js
index 506f6e09d..506f6e09d 100644
--- a/ui-react/src/OnapClamp.js
+++ b/runtime/ui-react/src/OnapClamp.js
diff --git a/ui-react/src/OnapClamp.test.js b/runtime/ui-react/src/OnapClamp.test.js
index c3336a9ab..c3336a9ab 100644
--- a/ui-react/src/OnapClamp.test.js
+++ b/runtime/ui-react/src/OnapClamp.test.js
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/runtime/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 322c93155..322c93155 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/runtime/ui-react/src/__snapshots__/LoopUI.test.js.snap
diff --git a/ui-react/src/__snapshots__/NotFound.test.js.snap b/runtime/ui-react/src/__snapshots__/NotFound.test.js.snap
index 86bcfd1c4..86bcfd1c4 100644
--- a/ui-react/src/__snapshots__/NotFound.test.js.snap
+++ b/runtime/ui-react/src/__snapshots__/NotFound.test.js.snap
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/runtime/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 353bc1173..353bc1173 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/runtime/ui-react/src/__snapshots__/OnapClamp.test.js.snap
diff --git a/ui-react/src/api/LoopActionService.js b/runtime/ui-react/src/api/LoopActionService.js
index bff812a2f..bff812a2f 100644
--- a/ui-react/src/api/LoopActionService.js
+++ b/runtime/ui-react/src/api/LoopActionService.js
diff --git a/ui-react/src/api/LoopCache.js b/runtime/ui-react/src/api/LoopCache.js
index 3e19b4fc7..3e19b4fc7 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/runtime/ui-react/src/api/LoopCache.js
diff --git a/ui-react/src/api/LoopCache.test.js b/runtime/ui-react/src/api/LoopCache.test.js
index 76f819c69..76f819c69 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/runtime/ui-react/src/api/LoopCache.test.js
diff --git a/ui-react/src/api/LoopCacheMockFile.json b/runtime/ui-react/src/api/LoopCacheMockFile.json
index cb9ed87b0..cb9ed87b0 100644
--- a/ui-react/src/api/LoopCacheMockFile.json
+++ b/runtime/ui-react/src/api/LoopCacheMockFile.json
diff --git a/ui-react/src/api/LoopService.js b/runtime/ui-react/src/api/LoopService.js
index 96bb8a0a7..96bb8a0a7 100644
--- a/ui-react/src/api/LoopService.js
+++ b/runtime/ui-react/src/api/LoopService.js
diff --git a/ui-react/src/api/PoliciesListCacheMockFile.json b/runtime/ui-react/src/api/PoliciesListCacheMockFile.json
index 5c6bd5b6b..5c6bd5b6b 100644
--- a/ui-react/src/api/PoliciesListCacheMockFile.json
+++ b/runtime/ui-react/src/api/PoliciesListCacheMockFile.json
diff --git a/ui-react/src/api/PolicyService.js b/runtime/ui-react/src/api/PolicyService.js
index f2886b30a..f2886b30a 100644
--- a/ui-react/src/api/PolicyService.js
+++ b/runtime/ui-react/src/api/PolicyService.js
diff --git a/ui-react/src/api/PolicyToscaService.js b/runtime/ui-react/src/api/PolicyToscaService.js
index e2a1f45e4..e2a1f45e4 100644
--- a/ui-react/src/api/PolicyToscaService.js
+++ b/runtime/ui-react/src/api/PolicyToscaService.js
diff --git a/ui-react/src/api/TemplateService.js b/runtime/ui-react/src/api/TemplateService.js
index 08436f2b8..08436f2b8 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/runtime/ui-react/src/api/TemplateService.js
diff --git a/ui-react/src/api/UserService.js b/runtime/ui-react/src/api/UserService.js
index 5fb4aa6b4..5fb4aa6b4 100644
--- a/ui-react/src/api/UserService.js
+++ b/runtime/ui-react/src/api/UserService.js
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index 5663360a0..5663360a0 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
index 8ef53b412..8ef53b412 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 803cfa9cb..803cfa9cb 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
index 84dbfd1f6..84dbfd1f6 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js b/runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
index acd0acade..acd0acade 100644
--- a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js
index 5bbefe228..5bbefe228 100644
--- a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index f6c0d2ede..f6c0d2ede 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js
index 055ad0e68..055ad0e68 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index b45df6502..b45df6502 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
index 1865869df..1865869df 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
index 1ba9dbaf1..1ba9dbaf1 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
index 33f8faa77..33f8faa77 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
index 3baaa5798..3baaa5798 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
index 581fd0ec0..581fd0ec0 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 90bbc887c..90bbc887c 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
index a4c1335d8..a4c1335d8 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/runtime/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
index 6b583632f..6b583632f 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
diff --git a/ui-react/src/components/dialogs/PerformActions.js b/runtime/ui-react/src/components/dialogs/PerformActions.js
index f6001e21f..f6001e21f 100644
--- a/ui-react/src/components/dialogs/PerformActions.js
+++ b/runtime/ui-react/src/components/dialogs/PerformActions.js
diff --git a/ui-react/src/components/dialogs/PerformActions.test.js b/runtime/ui-react/src/components/dialogs/PerformActions.test.js
index c91c2f675..c91c2f675 100644
--- a/ui-react/src/components/dialogs/PerformActions.test.js
+++ b/runtime/ui-react/src/components/dialogs/PerformActions.test.js
diff --git a/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js b/runtime/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js
index 9c2f102b4..9c2f102b4 100644
--- a/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js
diff --git a/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js
index 57d61600a..57d61600a 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js
diff --git a/ui-react/src/components/dialogs/Policy/PolicyEditor.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.js
index be77f14e9..be77f14e9 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyEditor.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.js
diff --git a/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js
index 0b734430a..0b734430a 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 4a883fffa..4a883fffa 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PolicyModal.js
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
index 1e6fac0a0..1e6fac0a0 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
diff --git a/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js
index 9cd3d4172..9cd3d4172 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js
diff --git a/ui-react/src/components/dialogs/Policy/ToscaViewer.js b/runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.js
index fa83aa245..fa83aa245 100644
--- a/ui-react/src/components/dialogs/Policy/ToscaViewer.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.js
diff --git a/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js b/runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js
index cc8c59a03..cc8c59a03 100644
--- a/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js
diff --git a/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js b/runtime/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js
index 04965352b..04965352b 100644
--- a/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js
+++ b/runtime/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js
diff --git a/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap
index 959b52a36..959b52a36 100644
--- a/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap
diff --git a/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap
index 8b1261b1c..8b1261b1c 100644
--- a/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap
diff --git a/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap
index 61fb4850d..61fb4850d 100644
--- a/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap
diff --git a/ui-react/src/components/dialogs/Policy/toscaData.test.json b/runtime/ui-react/src/components/dialogs/Policy/toscaData.test.json
index 3b001b384..3b001b384 100644
--- a/ui-react/src/components/dialogs/Policy/toscaData.test.json
+++ b/runtime/ui-react/src/components/dialogs/Policy/toscaData.test.json
diff --git a/ui-react/src/components/dialogs/Policy/toscaData.test.yaml b/runtime/ui-react/src/components/dialogs/Policy/toscaData.test.yaml
index 15a3cec35..15a3cec35 100644
--- a/ui-react/src/components/dialogs/Policy/toscaData.test.yaml
+++ b/runtime/ui-react/src/components/dialogs/Policy/toscaData.test.yaml
diff --git a/ui-react/src/components/dialogs/RefreshStatus.js b/runtime/ui-react/src/components/dialogs/RefreshStatus.js
index bb0939152..bb0939152 100644
--- a/ui-react/src/components/dialogs/RefreshStatus.js
+++ b/runtime/ui-react/src/components/dialogs/RefreshStatus.js
diff --git a/ui-react/src/components/dialogs/RefreshStatus.test.js b/runtime/ui-react/src/components/dialogs/RefreshStatus.test.js
index e08c50d2e..e08c50d2e 100644
--- a/ui-react/src/components/dialogs/RefreshStatus.test.js
+++ b/runtime/ui-react/src/components/dialogs/RefreshStatus.test.js
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index 4796b8d73..4796b8d73 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
index 7680ec4b9..7680ec4b9 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
index 73f659606..73f659606 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
diff --git a/ui-react/src/components/dialogs/UserInfoModal.js b/runtime/ui-react/src/components/dialogs/UserInfoModal.js
index 96eabb4c2..96eabb4c2 100644
--- a/ui-react/src/components/dialogs/UserInfoModal.js
+++ b/runtime/ui-react/src/components/dialogs/UserInfoModal.js
diff --git a/ui-react/src/components/dialogs/UserInfoModal.test.js b/runtime/ui-react/src/components/dialogs/UserInfoModal.test.js
index f5ed0ae10..f5ed0ae10 100644
--- a/ui-react/src/components/dialogs/UserInfoModal.test.js
+++ b/runtime/ui-react/src/components/dialogs/UserInfoModal.test.js
diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap b/runtime/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
index 548a2d938..548a2d938 100644
--- a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
+++ b/runtime/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.js
index e3d9f601f..e3d9f601f 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js
+++ b/runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.js
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
index 3b7fd413a..3b7fd413a 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
+++ b/runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
diff --git a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap b/runtime/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
index 996c67457..996c67457 100644
--- a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
+++ b/runtime/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.js b/runtime/ui-react/src/components/loop_viewer/status/LoopStatus.js
index 4b35b48e1..4b35b48e1 100644
--- a/ui-react/src/components/loop_viewer/status/LoopStatus.js
+++ b/runtime/ui-react/src/components/loop_viewer/status/LoopStatus.js
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.test.js b/runtime/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
index 8d0448796..8d0448796 100644
--- a/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
+++ b/runtime/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
diff --git a/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap b/runtime/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap
index 24d879de9..24d879de9 100644
--- a/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap
+++ b/runtime/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap
diff --git a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js b/runtime/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
index 6d3cd7a21..6d3cd7a21 100644
--- a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
+++ b/runtime/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
diff --git a/ui-react/src/components/menu/MenuBar.js b/runtime/ui-react/src/components/menu/MenuBar.js
index 995db9e16..995db9e16 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/runtime/ui-react/src/components/menu/MenuBar.js
diff --git a/ui-react/src/components/menu/MenuBar.test.js b/runtime/ui-react/src/components/menu/MenuBar.test.js
index 3e96dbf38..3e96dbf38 100644
--- a/ui-react/src/components/menu/MenuBar.test.js
+++ b/runtime/ui-react/src/components/menu/MenuBar.test.js
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/runtime/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index ba19097e5..ba19097e5 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/runtime/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
diff --git a/ui-react/src/index.js b/runtime/ui-react/src/index.js
index dd83096ea..dd83096ea 100644
--- a/ui-react/src/index.js
+++ b/runtime/ui-react/src/index.js
diff --git a/ui-react/src/logo.png b/runtime/ui-react/src/logo.png
index c6f6857a5..c6f6857a5 100644
--- a/ui-react/src/logo.png
+++ b/runtime/ui-react/src/logo.png
diff --git a/ui-react/src/setupTests.js b/runtime/ui-react/src/setupTests.js
index 30ce019ea..30ce019ea 100644
--- a/ui-react/src/setupTests.js
+++ b/runtime/ui-react/src/setupTests.js
diff --git a/ui-react/src/theme/globalStyle.js b/runtime/ui-react/src/theme/globalStyle.js
index 1e316d20b..1e316d20b 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/runtime/ui-react/src/theme/globalStyle.js
diff --git a/ui-react/src/utils/CsvToJson.js b/runtime/ui-react/src/utils/CsvToJson.js
index 5ec19c9e2..5ec19c9e2 100644
--- a/ui-react/src/utils/CsvToJson.js
+++ b/runtime/ui-react/src/utils/CsvToJson.js
diff --git a/ui-react/src/utils/CsvToJson.test.js b/runtime/ui-react/src/utils/CsvToJson.test.js
index 88fa7a472..88fa7a472 100644
--- a/ui-react/src/utils/CsvToJson.test.js
+++ b/runtime/ui-react/src/utils/CsvToJson.test.js
diff --git a/ui-react/src/utils/OnapConstants.js b/runtime/ui-react/src/utils/OnapConstants.js
index 8460340d1..8460340d1 100644
--- a/ui-react/src/utils/OnapConstants.js
+++ b/runtime/ui-react/src/utils/OnapConstants.js
diff --git a/ui-react/src/utils/OnapUtils.js b/runtime/ui-react/src/utils/OnapUtils.js
index 316a0d65f..316a0d65f 100644
--- a/ui-react/src/utils/OnapUtils.js
+++ b/runtime/ui-react/src/utils/OnapUtils.js
diff --git a/version.properties b/version.properties
index 6b0d72384..063474d7e 100644
--- a/version.properties
+++ b/version.properties
@@ -27,10 +27,10 @@
 
 major=6
 minor=1
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins
 release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
+snapshot_version=${base_version}-SNAPSHOT