Remove deprecated SDC and Model-yaml

Deprecated as we now use TOSCA and the SDC catalog objects
isn't useful for control loop design and implementation.

Issue-ID: POLICY-2428
Change-Id: Ib4adfbf25ba70c3cad47a8494333a1f20a5c4e23
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

16 files changed, 0 insertions, 1205 deletions

diff --git a/models-interactions/model-impl/pom.xml b/models-interactions/model-impl/pom.xml
index 33231ecb9..912e8f022 100644
--- a/models-interactions/model-impl/pom.xml
+++ b/models-interactions/model-impl/pom.xml
@@ -45,7 +45,6 @@
       <module>events</module>
       <module>guard</module>
       <module>rest</module>
-      <module>sdc</module>
       <module>sdnc</module>
       <module>sdnr</module>
       <module>so</module>
diff --git a/models-interactions/model-impl/sdc/checkstyle-suppressions.xml b/models-interactions/model-impl/sdc/checkstyle-suppressions.xml
deleted file mode 100644
index fd73d24e3..000000000
--- a/models-interactions/model-impl/sdc/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 AT&T Technologies. 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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<!DOCTYPE suppressions PUBLIC
-     "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-     "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
- 
-<suppressions>
-  <suppress checks="AbbreviationAsWordInName"
-    files="ResourceInstance.java|ServiceInstance.java|Service.java"
-    lines="1-9999"/>
-</suppressions>
diff --git a/models-interactions/model-impl/sdc/pom.xml b/models-interactions/model-impl/sdc/pom.xml
deleted file mode 100644
index 2cf04bfd9..000000000
--- a/models-interactions/model-impl/sdc/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  sdc
-  ================================================================================
-  Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2019 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.models.policy-models-interactions.model-impl</groupId>
-        <artifactId>model-impl</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>sdc</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>onap-java-style</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <!-- Use Google Java Style Guide:
-                            https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                            with minor changes -->
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <suppressionsLocation>${project.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
-                            <consoleOutput>true</consoleOutput>
-                            <failsOnViolation>true</failsOnViolation>
-                            <violationSeverity>warning</violationSeverity>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${oparent.version}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java
deleted file mode 100644
index 79f8161d3..000000000
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import java.io.Serializable;
-import java.util.UUID;
-import lombok.Data;
-
-@Data
-public class Resource implements Serializable {
-
-    private static final long serialVersionUID = -913729158733348027L;
-
-    private UUID resourceUuid;
-    private UUID resourceInvariantUuid;
-    private String resourceName;
-    private String resourceVersion;
-    private String resourceType;
-
-    public Resource() {
-        // Empty Constructor
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param resource copy object
-     */
-    public Resource(Resource resource) {
-        this.resourceUuid = resource.resourceUuid;
-        this.resourceInvariantUuid = resource.resourceInvariantUuid;
-        this.resourceName = resource.resourceName;
-        this.resourceVersion = resource.resourceVersion;
-        this.resourceType = resource.resourceType;
-    }
-
-    public Resource(UUID uuid) {
-        this.resourceUuid = uuid;
-    }
-
-    public Resource(String name, String type) {
-        this.resourceName = name;
-        this.resourceType = type;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param uuid uuid
-     * @param invariantUuid invariant uuid
-     * @param name name
-     * @param version version
-     * @param type type
-     */
-    public Resource(UUID uuid, UUID invariantUuid, String name, String version, String type) {
-        this.resourceUuid = uuid;
-        this.resourceInvariantUuid = invariantUuid;
-        this.resourceName = name;
-        this.resourceVersion = version;
-        this.resourceType = type;
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java
deleted file mode 100644
index 4fbafcae0..000000000
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import java.util.UUID;
-import lombok.Data;
-
-@Data
-public class ResourceInstance implements Serializable {
-
-    private static final long serialVersionUID = -5506162340393802424L;
-
-    @SerializedName("ResourceUUID")
-    private UUID resourceUuid;
-
-    private String resourceInstanceName;
-    private String resourceName;
-    private String resourceVersion;
-    private String resourceType;
-
-    @SerializedName("ResourceInvariantUUID")
-    private UUID resourceInvariantUuid;
-
-    public ResourceInstance() {
-        // Empty Constructor
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param instance copy object
-     */
-    public ResourceInstance(ResourceInstance instance) {
-        if (instance == null) {
-            return;
-        }
-        this.resourceInstanceName = instance.resourceInstanceName;
-        this.resourceName = instance.resourceName;
-        this.resourceInvariantUuid = instance.resourceInvariantUuid;
-        this.resourceVersion = instance.resourceVersion;
-        this.resourceType = instance.resourceType;
-        this.resourceUuid = instance.resourceUuid;
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceType.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceType.java
deleted file mode 100644
index 34cefa1ab..000000000
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-public class ResourceType {
-    public static final String VF = "VF";
-    public static final String VFC = "VFC";
-    public static final String VL = "VL";
-    public static final String CP = "CP";
-
-    private ResourceType() {
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java
deleted file mode 100644
index 3327b78b0..000000000
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import java.io.Serializable;
-import java.util.UUID;
-import lombok.Data;
-
-@Data
-public class Service implements Serializable {
-
-    private static final long serialVersionUID = -1249276698549996806L;
-
-    /*
-     * Note the field names ending in "UUID" may not be changed without breaking the
-     * interface, due to limitations in the YAML encoder/decoder.
-     */
-    private UUID serviceUUID;
-    private UUID serviceInvariantUUID;
-    private String serviceName;
-    private String serviceVersion;
-
-    public Service() {
-        // Empty Constructor
-    }
-
-    public Service(UUID uuid) {
-        this.serviceUUID = uuid;
-    }
-
-    public Service(String name) {
-        this.serviceName = name;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param uuid service id
-     * @param invariantUuid service invariant id
-     * @param name name
-     * @param version version
-     */
-    public Service(UUID uuid, UUID invariantUuid, String name, String version) {
-        this.serviceUUID = uuid;
-        this.serviceInvariantUUID = invariantUuid;
-        this.serviceName = name;
-        this.serviceVersion = version;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param service copy object
-     */
-    public Service(Service service) {
-        this.serviceUUID = service.serviceUUID;
-        this.serviceInvariantUUID = service.serviceInvariantUUID;
-        this.serviceName = service.serviceName;
-        this.serviceVersion = service.serviceVersion;
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java
deleted file mode 100644
index 6eac319fd..000000000
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import java.io.Serializable;
-import java.util.UUID;
-import lombok.Data;
-
-@Data
-public class ServiceInstance implements Serializable {
-
-    private static final long serialVersionUID = 6285260780966679625L;
-
-    /*
-     * Note the field names ending in "UUID" may not be changed without breaking the
-     * interface, due to limitations in the YAML encoder/decoder.
-     */
-    private UUID personaModelUUID;
-    private UUID serviceUUID;
-    private UUID serviceInstanceUUID;
-    private UUID widgetModelUUID;
-
-    private String widgetModelVersion;
-    private String serviceName;
-    private String serviceInstanceName;
-
-    public ServiceInstance() {
-        // Empty Constructor
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param instance copy object
-     */
-    public ServiceInstance(ServiceInstance instance) {
-        if (instance == null) {
-            return;
-        }
-        this.personaModelUUID = instance.personaModelUUID;
-        this.serviceUUID = instance.serviceUUID;
-        this.serviceInstanceUUID = instance.serviceInstanceUUID;
-        this.widgetModelUUID = instance.widgetModelUUID;
-        this.widgetModelVersion = instance.widgetModelVersion;
-        this.serviceName = instance.serviceName;
-        this.serviceInstanceName = instance.serviceInstanceName;
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/main/resources/definitions.yaml b/models-interactions/model-impl/sdc/src/main/resources/definitions.yaml
deleted file mode 100644
index 16fff309c..000000000
--- a/models-interactions/model-impl/sdc/src/main/resources/definitions.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 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.
-Service:
-  type: Object
-  properties:
-    serviceUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    serviceInvariantUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    serviceName:
-      type: string
-    serviceVersion:
-      type: string
-Resource:
-  type: Object
-  properties:
-    resourceUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    resourceInvariantUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    resourceName:
-      type: string
-    resourceVersion:
-      type: string
-    resourceType:
-      type: string
-      valid_values:
-        - VF
-        - VFC
-        - CP
-        - VL
-ServiceInstance:
-  type: Object
-  properties:
-    personaModelUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    serviceUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    serviceInstanceUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    widgetModelUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    widgetModelVersion:
-      type: string
-    serviceName:
-      type: string
-    serviceInstanceName:
-      type: string
-ResourceInstance:
-  type: object
-  properties:
-    resourceInstanceName:
-      type: string
-    resourceName:
-      type: string
-    resourceInvariantUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    resourceVersion:
-      type: string
-    resourceType:
-      type: string
-      valid_values:
-        - VF
-        - VFC
-        - CP
-        - VL
-    resourceUUID:
-      type: string
-      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
deleted file mode 100644
index fd05affb5..000000000
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.UUID;
-import org.junit.Test;
-
-public class ResourceInstanceTest {
-
-    private static final String RESOURCE = "resource";
-    private static final String INSTANCE = "instance";
-    private static final String VERSION_000 = "0.0.0";
-
-    @Test
-    public void testConstructors() {
-        ResourceInstance ri = new ResourceInstance();
-        assertEquals(null, ri.getResourceInstanceName());
-        assertEquals(null, ri.getResourceUuid());
-        assertEquals(null, ri.getResourceInvariantUuid());
-        assertEquals(null, ri.getResourceName());
-        assertEquals(null, ri.getResourceType());
-        assertEquals(null, ri.getResourceVersion());
-
-        ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null);
-        assertEquals(null, ri2.getResourceInstanceName());
-        assertEquals(null, ri2.getResourceUuid());
-        assertEquals(null, ri2.getResourceInvariantUuid());
-        assertEquals(null, ri2.getResourceName());
-        assertEquals(null, ri2.getResourceType());
-        assertEquals(null, ri2.getResourceVersion());
-
-        ri2 = new ResourceInstance(ri);
-        assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName());
-        assertEquals(ri2.getResourceUuid(), ri.getResourceUuid());
-        assertEquals(ri2.getResourceInvariantUuid(), ri.getResourceInvariantUuid());
-        assertEquals(ri2.getResourceName(), ri.getResourceName());
-        assertEquals(ri2.getResourceType(), ri.getResourceType());
-        assertEquals(ri2.getResourceVersion(), ri.getResourceVersion());
-    }
-
-    @Test
-    public void testInstanceName() {
-        ResourceInstance ri = new ResourceInstance();
-        String name = "nameTestInstance";
-        ri.setResourceInstanceName(name);
-        ;
-        assertEquals(name, ri.getResourceInstanceName());
-    }
-
-    @Test
-    public void testUuid() {
-        ResourceInstance ri = new ResourceInstance();
-        UUID uuid = UUID.randomUUID();
-        ri.setResourceUuid(uuid);
-        assertEquals(uuid, ri.getResourceUuid());
-    }
-
-    @Test
-    public void testInvariantUuid() {
-        ResourceInstance ri = new ResourceInstance();
-        UUID uuid = UUID.randomUUID();
-        ri.setResourceInvariantUuid(uuid);
-        assertEquals(uuid, ri.getResourceInvariantUuid());
-    }
-
-    @Test
-    public void testName() {
-        ResourceInstance ri = new ResourceInstance();
-        String name = "nameTest";
-        ri.setResourceName(name);
-        assertEquals(name, ri.getResourceName());
-    }
-
-    @Test
-    public void testVersion() {
-        ResourceInstance ri = new ResourceInstance();
-        String version = "versionTest";
-        ri.setResourceVersion(version);
-        assertEquals(version, ri.getResourceVersion());
-    }
-
-    @Test
-    public void testType() {
-        ResourceInstance ri = new ResourceInstance();
-        ri.setResourceType(ResourceType.CP);
-        assertEquals(ResourceType.CP, ri.getResourceType());
-    }
-
-    @Test
-    public void testEquals() {
-        ResourceInstance ri1 = new ResourceInstance();
-        ResourceInstance ri2 = new ResourceInstance(ri1);
-        assertEquals(ri1, ri2);
-        assertEquals(ri2, ri1);
-
-        ri1.setResourceInstanceName(INSTANCE);
-        ri1.setResourceName(RESOURCE);
-        ri1.setResourceInvariantUuid(UUID.randomUUID());
-        ri1.setResourceInvariantUuid(UUID.randomUUID());
-        ri1.setResourceVersion(VERSION_000);
-        ri1.setResourceType(ResourceType.VL);
-        ri2 = new ResourceInstance(ri1);
-        assertEquals(ri1, ri2);
-        assertEquals(ri2, ri1);
-    }
-
-    @Test
-    public void testToString() {
-        ResourceInstance ri1 = new ResourceInstance();
-        ResourceInstance ri2 = new ResourceInstance(ri1);
-        assertEquals(ri1.toString(), ri2.toString());
-
-        ri1.setResourceInstanceName(INSTANCE);
-        ri1.setResourceName(RESOURCE);
-        ri1.setResourceInvariantUuid(UUID.randomUUID());
-        ri1.setResourceInvariantUuid(UUID.randomUUID());
-        ri1.setResourceVersion(VERSION_000);
-        ri1.setResourceType(ResourceType.VL);
-        ri2 = new ResourceInstance(ri1);
-        assertEquals(ri1.toString(), ri2.toString());
-    }
-
-    @Test
-    public void testHashCode() {
-        ResourceInstance ri1 = new ResourceInstance();
-        ResourceInstance ri2 = new ResourceInstance(ri1);
-        assertEquals(ri1.hashCode(), ri2.hashCode());
-
-        ri1.setResourceInstanceName(INSTANCE);
-        ri1.setResourceName(RESOURCE);
-        ri1.setResourceInvariantUuid(UUID.randomUUID());
-        ri1.setResourceInvariantUuid(UUID.randomUUID());
-        ri1.setResourceVersion(VERSION_000);
-        ri1.setResourceType(ResourceType.VL);
-        ri2 = new ResourceInstance(ri1);
-        assertEquals(ri1.hashCode(), ri2.hashCode());
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java
deleted file mode 100644
index 10e26bd9c..000000000
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.UUID;
-import org.junit.Test;
-
-public class ResourceTest {
-
-    private static final String EQUALS_TEST = "equalsTest";
-    private static final String VERSION_111 = "1.1.1";
-
-    @Test
-    public void testConstructors() {
-        Resource res = new Resource();
-        assertEquals(null, res.getResourceUuid());
-        assertEquals(null, res.getResourceInvariantUuid());
-        assertEquals(null, res.getResourceName());
-        assertEquals(null, res.getResourceType());
-        assertEquals(null, res.getResourceVersion());
-
-        UUID uuid = UUID.randomUUID();
-        res = new Resource(uuid);
-        assertEquals(uuid, res.getResourceUuid());
-        assertEquals(null, res.getResourceInvariantUuid());
-        assertEquals(null, res.getResourceName());
-        assertEquals(null, res.getResourceType());
-        assertEquals(null, res.getResourceVersion());
-
-        String name = "constTest";
-        res = new Resource(name, ResourceType.CP);
-        assertEquals(null, res.getResourceUuid());
-        assertEquals(name, res.getResourceName());
-        assertEquals(ResourceType.CP, res.getResourceType());
-        assertEquals(null, res.getResourceInvariantUuid());
-        assertEquals(null, res.getResourceVersion());
-
-        uuid = UUID.randomUUID();
-        UUID uuidInvariant = UUID.randomUUID();
-        name = "constTestUUID";
-        String version = "0.0.1";
-        res = new Resource(uuid, uuidInvariant, name, version, ResourceType.VF);
-        assertEquals(uuid, res.getResourceUuid());
-        assertEquals(uuidInvariant, res.getResourceInvariantUuid());
-        assertEquals(name, res.getResourceName());
-        assertEquals(ResourceType.VF, res.getResourceType());
-        assertEquals(version, res.getResourceVersion());
-
-        Resource r2 = new Resource(res);
-        assertEquals(uuid, r2.getResourceUuid());
-        assertEquals(uuidInvariant, r2.getResourceInvariantUuid());
-        assertEquals(name, r2.getResourceName());
-        assertEquals(ResourceType.VF, r2.getResourceType());
-        assertEquals(version, r2.getResourceVersion());
-    }
-
-    @Test
-    public void testUuid() {
-        Resource res = new Resource();
-        UUID uuid = UUID.randomUUID();
-        res.setResourceUuid(uuid);
-        assertEquals(uuid, res.getResourceUuid());
-    }
-
-    @Test
-    public void testInvariantUuid() {
-        Resource res = new Resource();
-        UUID uuid = UUID.randomUUID();
-        res.setResourceInvariantUuid(uuid);
-        assertEquals(uuid, res.getResourceInvariantUuid());
-    }
-
-    @Test
-    public void testName() {
-        Resource res = new Resource();
-        String name = "nameTest";
-        res.setResourceName(name);
-        assertEquals(name, res.getResourceName());
-    }
-
-    @Test
-    public void testVersion() {
-        Resource res = new Resource();
-        String version = "versionTest";
-        res.setResourceVersion(version);
-        assertEquals(version, res.getResourceVersion());
-    }
-
-    @Test
-    public void testType() {
-        Resource res = new Resource();
-        res.setResourceType(ResourceType.CP);
-        assertEquals(ResourceType.CP, res.getResourceType());
-    }
-
-    @Test
-    public void testEquals() {
-        Resource r1 = new Resource();
-        Resource r2 = new Resource(r1);
-        assertEquals(r1, r2);
-        assertEquals(r2, r1);
-
-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111,
-                ResourceType.VFC);
-        r2 = new Resource(r1);
-        assertEquals(r1, r2);
-        assertEquals(r2, r1);
-    }
-
-    @Test
-    public void testToString() {
-        Resource r1 = new Resource();
-        Resource r2 = new Resource(r1);
-        assertEquals(r1.toString(), r2.toString());
-
-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111,
-                ResourceType.VFC);
-        r2 = new Resource(r1);
-        assertEquals(r1.toString(), r2.toString());
-    }
-
-    @Test
-    public void testHashCode() {
-        Resource r1 = new Resource();
-        Resource r2 = new Resource(r1);
-        assertEquals(r1.hashCode(), r2.hashCode());
-
-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111,
-                ResourceType.VFC);
-        r2 = new Resource(r1);
-        assertEquals(r1.hashCode(), r2.hashCode());
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
deleted file mode 100644
index ecd0bb323..000000000
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.UUID;
-import org.junit.Test;
-
-public class ServiceInstanceTest {
-
-    private static final String SERVICE = "service";
-    private static final String INSTANCE = "instance";
-    private static final String VERSION_333 = "3.3.3";
-
-    @Test
-    public void testConstructors() {
-        ServiceInstance si = new ServiceInstance();
-        assertEquals(null, si.getServiceInstanceName());
-        assertEquals(null, si.getServiceUUID());
-        assertEquals(null, si.getServiceInstanceUUID());
-        assertEquals(null, si.getServiceName());
-        assertEquals(null, si.getPersonaModelUUID());
-        assertEquals(null, si.getWidgetModelUUID());
-        assertEquals(null, si.getWidgetModelVersion());
-
-        ServiceInstance si2 = new ServiceInstance((ServiceInstance) null);
-        assertEquals(null, si2.getServiceInstanceName());
-        assertEquals(null, si2.getServiceUUID());
-        assertEquals(null, si2.getServiceInstanceUUID());
-        assertEquals(null, si2.getServiceName());
-        assertEquals(null, si2.getPersonaModelUUID());
-        assertEquals(null, si2.getWidgetModelUUID());
-        assertEquals(null, si2.getWidgetModelVersion());
-
-        si2 = new ServiceInstance(si);
-        assertEquals(si2.getServiceInstanceName(), si.getServiceInstanceName());
-        assertEquals(si2.getServiceUUID(), si.getServiceUUID());
-        assertEquals(si2.getServiceInstanceUUID(), si.getServiceInstanceUUID());
-        assertEquals(si2.getServiceName(), si.getServiceName());
-        assertEquals(si2.getPersonaModelUUID(), si.getPersonaModelUUID());
-        assertEquals(si2.getWidgetModelUUID(), si.getWidgetModelUUID());
-        assertEquals(si2.getWidgetModelVersion(), si.getWidgetModelVersion());
-    }
-
-    @Test
-    public void testInstanceName() {
-        ServiceInstance si = new ServiceInstance();
-        String name = "nameTestInstance";
-        si.setServiceInstanceName(name);
-        ;
-        assertEquals(name, si.getServiceInstanceName());
-    }
-
-    @Test
-    public void testUuid() {
-        ServiceInstance si = new ServiceInstance();
-        UUID uuid = UUID.randomUUID();
-        si.setServiceUUID(uuid);
-        assertEquals(uuid, si.getServiceUUID());
-    }
-
-    @Test
-    public void testInstanceUuid() {
-        ServiceInstance si = new ServiceInstance();
-        UUID uuid = UUID.randomUUID();
-        si.setServiceInstanceUUID(uuid);
-        assertEquals(uuid, si.getServiceInstanceUUID());
-    }
-
-    @Test
-    public void testName() {
-        ServiceInstance si = new ServiceInstance();
-        String name = "nameTest";
-        si.setServiceName(name);
-        assertEquals(name, si.getServiceName());
-    }
-
-    @Test
-    public void testPersonaModelUuid() {
-        ServiceInstance si = new ServiceInstance();
-        UUID uuid = UUID.randomUUID();
-        si.setPersonaModelUUID(uuid);
-        assertEquals(uuid, si.getPersonaModelUUID());
-    }
-
-    @Test
-    public void testWidgetModelUuid() {
-        ServiceInstance si = new ServiceInstance();
-        UUID uuid = UUID.randomUUID();
-        si.setWidgetModelUUID(uuid);
-        assertEquals(uuid, si.getWidgetModelUUID());
-    }
-
-    @Test
-    public void testWidgetModelVersion() {
-        ServiceInstance si = new ServiceInstance();
-        String version = "2.2.2";
-        si.setWidgetModelVersion(version);
-        ;
-        assertEquals(version, si.getWidgetModelVersion());
-    }
-
-    @Test
-    public void testEquals() {
-        ServiceInstance si1 = new ServiceInstance();
-        ServiceInstance si2 = new ServiceInstance(si1);
-        assertEquals(si1, si2);
-        assertEquals(si2, si1);
-
-        si1.setServiceInstanceName(INSTANCE);
-        si1.setServiceName(SERVICE);
-        si1.setServiceInstanceUUID(UUID.randomUUID());
-        si1.setServiceUUID(UUID.randomUUID());
-        si1.setPersonaModelUUID(UUID.randomUUID());
-        si1.setWidgetModelUUID(UUID.randomUUID());
-        si1.setWidgetModelVersion(VERSION_333);
-        si2 = new ServiceInstance(si1);
-        assertEquals(si1, si2);
-        assertEquals(si2, si1);
-    }
-
-    @Test
-    public void testToString() {
-        ServiceInstance si1 = new ServiceInstance();
-        ServiceInstance si2 = new ServiceInstance(si1);
-        assertEquals(si1.toString(), si2.toString());
-
-        si1.setServiceInstanceName(INSTANCE);
-        si1.setServiceName(SERVICE);
-        si1.setServiceInstanceUUID(UUID.randomUUID());
-        si1.setServiceUUID(UUID.randomUUID());
-        si1.setPersonaModelUUID(UUID.randomUUID());
-        si1.setWidgetModelUUID(UUID.randomUUID());
-        si1.setWidgetModelVersion(VERSION_333);
-        si2 = new ServiceInstance(si1);
-        assertEquals(si1.toString(), si2.toString());
-    }
-
-    @Test
-    public void testHashCode() {
-        ServiceInstance si1 = new ServiceInstance();
-        ServiceInstance si2 = new ServiceInstance(si1);
-        assertEquals(si1.hashCode(), si2.hashCode());
-
-        si1.setServiceInstanceName(INSTANCE);
-        si1.setServiceName(SERVICE);
-        si1.setServiceInstanceUUID(UUID.randomUUID());
-        si1.setServiceUUID(UUID.randomUUID());
-        si1.setPersonaModelUUID(UUID.randomUUID());
-        si1.setWidgetModelUUID(UUID.randomUUID());
-        si1.setWidgetModelVersion(VERSION_333);
-        si2 = new ServiceInstance(si1);
-        assertEquals(si1.hashCode(), si2.hashCode());
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
deleted file mode 100644
index 1e6c6f917..000000000
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdc
- * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 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=========================================================
- */
-
-package org.onap.policy.sdc;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.UUID;
-import org.junit.Test;
-
-public class ServiceTest {
-
-    private static final String EQUALS_TEST = "equalsTest";
-    private static final String VERSION_111 = "1.1.1";
-
-    @Test
-    public void testConstructors() {
-        Service svc = new Service();
-        assertEquals(null, svc.getServiceUUID());
-        assertEquals(null, svc.getServiceInvariantUUID());
-        assertEquals(null, svc.getServiceName());
-        assertEquals(null, svc.getServiceVersion());
-
-        UUID uuid = UUID.randomUUID();
-        svc = new Service(uuid);
-        assertEquals(uuid, svc.getServiceUUID());
-        assertEquals(null, svc.getServiceInvariantUUID());
-        assertEquals(null, svc.getServiceName());
-        assertEquals(null, svc.getServiceVersion());
-
-        String name = "constTest";
-        svc = new Service(name);
-        assertEquals(null, svc.getServiceUUID());
-        assertEquals(name, svc.getServiceName());
-        assertEquals(null, svc.getServiceInvariantUUID());
-        assertEquals(null, svc.getServiceVersion());
-
-        uuid = UUID.randomUUID();
-        UUID uuidInvariant = UUID.randomUUID();
-        name = "constTestUUID";
-        String version = "0.0.1";
-        svc = new Service(uuid, uuidInvariant, name, version);
-        assertEquals(uuid, svc.getServiceUUID());
-        assertEquals(uuidInvariant, svc.getServiceInvariantUUID());
-        assertEquals(name, svc.getServiceName());
-        assertEquals(version, svc.getServiceVersion());
-
-        Service s2 = new Service(svc);
-        assertEquals(uuid, s2.getServiceUUID());
-        assertEquals(uuidInvariant, s2.getServiceInvariantUUID());
-        assertEquals(name, s2.getServiceName());
-        assertEquals(version, s2.getServiceVersion());
-    }
-
-    @Test
-    public void testUuid() {
-        Service svc = new Service();
-        UUID uuid = UUID.randomUUID();
-        svc.setServiceUUID(uuid);
-        assertEquals(uuid, svc.getServiceUUID());
-    }
-
-    @Test
-    public void testInvariantUuid() {
-        Service svc = new Service();
-        UUID uuid = UUID.randomUUID();
-        svc.setServiceInvariantUUID(uuid);
-        assertEquals(uuid, svc.getServiceInvariantUUID());
-    }
-
-    @Test
-    public void testName() {
-        Service svc = new Service();
-        String name = "nameTest";
-        svc.setServiceName(name);
-        assertEquals(name, svc.getServiceName());
-    }
-
-    @Test
-    public void testVersion() {
-        Service svc = new Service();
-        String version = "versionTest";
-        svc.setServiceVersion(version);
-        assertEquals(version, svc.getServiceVersion());
-    }
-
-    @Test
-    public void testEquals() {
-        Service s1 = new Service();
-        Service s2 = new Service(s1);
-        assertEquals(s1, s2);
-        assertEquals(s2, s1);
-
-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
-        s2 = new Service(s1);
-        assertEquals(s1, s2);
-        assertEquals(s2, s1);
-    }
-
-    @Test
-    public void testToString() {
-        Service s1 = new Service();
-        Service s2 = new Service(s1);
-        assertEquals(s1.toString(), s2.toString());
-
-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
-        s2 = new Service(s1);
-        assertEquals(s1.toString(), s2.toString());
-    }
-
-    @Test
-    public void testHashCode() {
-        Service s1 = new Service();
-        Service s2 = new Service(s1);
-        assertEquals(s1.hashCode(), s2.hashCode());
-
-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
-        s2 = new Service(s1);
-        assertEquals(s1.hashCode(), s2.hashCode());
-    }
-}
diff --git a/models-interactions/model-impl/sdc/src/test/resources/service_trinity.yaml b/models-interactions/model-impl/sdc/src/test/resources/service_trinity.yaml
deleted file mode 100644
index 391dc0328..000000000
--- a/models-interactions/model-impl/sdc/src/test/resources/service_trinity.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 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.
-Service:
-  serviceName: trinity
-  
\ No newline at end of file
diff --git a/models-interactions/model-impl/sdc/src/test/resources/service_vSCP.yaml b/models-interactions/model-impl/sdc/src/test/resources/service_vSCP.yaml
deleted file mode 100644
index 1c377c9c5..000000000
--- a/models-interactions/model-impl/sdc/src/test/resources/service_vSCP.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 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.
-Service:
-  serviceName: vSCP
\ No newline at end of file
diff --git a/models-interactions/model-impl/sdc/src/test/resources/service_vUSP.yaml b/models-interactions/model-impl/sdc/src/test/resources/service_vUSP.yaml
deleted file mode 100644
index 6d6f9f1e1..000000000
--- a/models-interactions/model-impl/sdc/src/test/resources/service_vUSP.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 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.
-Service:
-  serviceName: vUSP