Add payload to vFW policy yaml

Added new "streams" payload to vFW policy yaml files.
Removed references to pg-streams.
Also deleted directories that were moved to policy/models.
Also removed references to trafficgenerator.
Updated licenses.
Removed some trailing whitespace.

Change-Id: I6becaa573628eee677f0959fadf86f9a9f032f88
Issue-ID: POLICY-1752
Signed-off-by: Jim Hahn <jrh3@att.com>

9 files changed, 0 insertions, 729 deletions

diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
deleted file mode 100644
index d334d232f..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2017 Intel Corp. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import java.util.LinkedList;
-
-import org.junit.Test;
-import org.onap.policy.vfc.util.Serialization;
-
-public class DemoTest {
-
-    @Test
-    public void test() {
-        VfcRequest request = new VfcRequest();
-
-        request.setNsInstanceId("100");
-        request.setHealRequest(new VfcHealRequest());
-        request.getHealRequest().setVnfInstanceId("1");
-        request.getHealRequest().setCause("vm is down");
-
-        request.getHealRequest().setAdditionalParams(new VfcHealAdditionalParams());
-        request.getHealRequest().getAdditionalParams().setAction("restartvm");
-
-        request.getHealRequest().getAdditionalParams().setActionInfo(new VfcHealActionVmInfo());
-        request.getHealRequest().getAdditionalParams().getActionInfo().setVmid("33");
-        request.getHealRequest().getAdditionalParams().getActionInfo().setVmname("xgw-smp11");
-
-        String body = Serialization.gsonPretty.toJson(request);
-        System.out.println(body);
-
-        VfcResponse response = new VfcResponse();
-        response.setJobId("1");
-
-        body = Serialization.gsonPretty.toJson(response);
-        System.out.println(body);
-
-        response.setResponseDescriptor(new VfcResponseDescriptor());
-        response.getResponseDescriptor().setProgress("40");
-        response.getResponseDescriptor().setStatus("processing");
-        response.getResponseDescriptor().setStatusDescription("OMC VMs are decommissioned in VIM");
-        response.getResponseDescriptor().setErrorCode(null);
-        response.getResponseDescriptor().setResponseId("42");
-        body = Serialization.gsonPretty.toJson(response);
-        System.out.println(body);
-
-        VfcResponseDescriptor responseDescriptor = new VfcResponseDescriptor();
-        responseDescriptor.setProgress("20");
-        responseDescriptor.setStatus("processing");
-        responseDescriptor.setStatusDescription("OMC VMs are decommissioned in VIM");
-        responseDescriptor.setErrorCode(null);
-        responseDescriptor.setResponseId("11");
-
-        response.getResponseDescriptor().setResponseHistoryList(new LinkedList<>());
-        response.getResponseDescriptor().getResponseHistoryList().add(responseDescriptor);
-
-        body = Serialization.gsonPretty.toJson(response);
-        System.out.println(body);
-
-        response = Serialization.gsonPretty.fromJson(body, VfcResponse.class);
-        body = Serialization.gsonPretty.toJson(response);
-        System.out.println(body);
-
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealActionVmInfoTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealActionVmInfoTest.java
deleted file mode 100644
index 8b5b118d2..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealActionVmInfoTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class VfcHealActionVmInfoTest {
-
-    @Test
-    public void testVfcHealActionVmInfo() {
-        VfcHealActionVmInfo actionInfo = new VfcHealActionVmInfo();
-        assertNotNull(actionInfo);
-        assertNotEquals(0, actionInfo.hashCode());
-
-        String vmid = "ECity";
-        actionInfo.setVmid(vmid);
-        assertEquals(vmid, actionInfo.getVmid());
-
-        String vmName = "Emerald City";
-        actionInfo.setVmname(vmName);
-        assertEquals(vmName, actionInfo.getVmname());
-
-        assertNotEquals(0, actionInfo.hashCode());
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java
deleted file mode 100644
index e7cb79fef..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class VfcHealAdditionalParamsTest {
-
-    @Test
-    public void testVfcHealAdditionalParameters() {
-        VfcHealAdditionalParams additionalParams = new VfcHealAdditionalParams();
-        assertNotNull(additionalParams);
-        assertNotEquals(0, additionalParams.hashCode());
-
-        String action = "Go Home";
-        additionalParams.setAction(action);
-        assertEquals(action, additionalParams.getAction());
-
-        VfcHealActionVmInfo actionInfo = new VfcHealActionVmInfo();
-        additionalParams.setActionInfo(actionInfo );
-        assertEquals(actionInfo, additionalParams.getActionInfo());
-
-        assertNotEquals(0, additionalParams.hashCode());
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealRequestTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealRequestTest.java
deleted file mode 100644
index b67b9ac07..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealRequestTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class VfcHealRequestTest {
-
-    @Test
-    public void testVfcHealRequest() {
-        VfcHealRequest request = new VfcHealRequest();
-        assertNotNull(request);
-        assertNotEquals(0, request.hashCode());
-
-        String vnfInstanceId = "Go To Oz";
-        request.setVnfInstanceId(vnfInstanceId);
-        assertEquals(vnfInstanceId, request.getVnfInstanceId());
-
-        String cause = "West Witch";
-        request.setCause(cause);
-        assertEquals(cause, request.getCause());
-
-        VfcHealAdditionalParams additionalParams = new VfcHealAdditionalParams();
-        request.setAdditionalParams(additionalParams);
-        assertEquals(additionalParams, request.getAdditionalParams());
-
-        assertNotEquals(0, request.hashCode());
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
deleted file mode 100644
index f9e6e8260..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson, AT&T. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.endsWith;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.startsWith;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.drools.core.WorkingMemory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RestManager;
-import org.onap.policy.rest.RestManager.Pair;
-import org.onap.policy.vfc.util.Serialization;
-
-public class VfcManagerTest {
-    private static WorkingMemory mockedWorkingMemory;
-
-    private RestManager   mockedRestManager;
-
-    private Pair<Integer, String> httpResponsePutOk;
-    private Pair<Integer, String> httpResponseGetOk;
-    private Pair<Integer, String> httpResponseBadResponse;
-    private Pair<Integer, String> httpResponseErr;
-
-    private VfcRequest  request;
-    private VfcResponse response;
-
-    @BeforeClass
-    public static void beforeTestVfcManager() {
-        mockedWorkingMemory = mock(WorkingMemory.class);
-    }
-
-    /**
-     * Set up the mocked REST manager.
-     */
-    @Before
-    public void setupMockedRest() {
-        mockedRestManager   = mock(RestManager.class);
-
-        httpResponsePutOk       = mockedRestManager.new Pair<>(202, Serialization.gsonPretty.toJson(response));
-        httpResponseGetOk       = mockedRestManager.new Pair<>(200, Serialization.gsonPretty.toJson(response));
-        httpResponseBadResponse = mockedRestManager.new Pair<>(202, Serialization.gsonPretty.toJson(null));
-        httpResponseErr         = mockedRestManager.new Pair<>(200, null);
-    }
-
-    /**
-     * Create the request and response before.
-     */
-    @Before
-    public void createRequestAndResponse() {
-        VfcHealActionVmInfo actionInfo = new VfcHealActionVmInfo();
-        actionInfo.setVmid("TheWizard");
-        actionInfo.setVmname("The Wizard of Oz");
-
-        VfcHealAdditionalParams additionalParams = new VfcHealAdditionalParams();
-        additionalParams.setAction("Go Home");
-        additionalParams.setActionInfo(actionInfo);
-
-        VfcHealRequest healRequest = new VfcHealRequest();
-        healRequest.setAdditionalParams(additionalParams);
-        healRequest.setCause("WestWitch");
-        healRequest.setVnfInstanceId("EmeraldCity");
-
-        final UUID requestId = UUID.randomUUID();
-        request = new VfcRequest();
-        request.setHealRequest(healRequest);
-        request.setNsInstanceId("Dorothy");
-        request.setRequestId(requestId);
-
-        List<VfcResponseDescriptor> responseHistoryList = new ArrayList<>();;
-
-        VfcResponseDescriptor responseDescriptor = new VfcResponseDescriptor();
-        responseDescriptor.setErrorCode("1234");
-        responseDescriptor.setProgress("Follow The Yellow Brick Road");
-        responseDescriptor.setResponseHistoryList(responseHistoryList);
-        responseDescriptor.setResponseId(UUID.randomUUID().toString());
-        responseDescriptor.setStatus("finished");
-        responseDescriptor.setStatusDescription("There's no place like home");
-
-        response = new VfcResponse();
-        response.setJobId("1234");
-        response.setRequestId(request.getRequestId().toString());
-        response.setResponseDescriptor(responseDescriptor);
-    }
-
-    /**
-     * Remove the environnment.
-     */
-    @After
-    public void tearDown() {
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-
-    @Test
-    public void testVfcInitiation() {
-        try {
-            new VfcManager(null, null);
-            fail("test should throw an exception here");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("the parameters \"wm\" and \"request\" on the VfcManager constructor may not be null", 
-                    e.getMessage());
-        }
-
-        try {
-            new VfcManager(mockedWorkingMemory, null);
-            fail("test should throw an exception here");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("the parameters \"wm\" and \"request\" on the VfcManager constructor may not be null", 
-                    e.getMessage());
-        }
-
-        try {
-            new VfcManager(mockedWorkingMemory, request);
-            fail("test should throw an exception here");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("The value of policy engine manager environment property \"vfc.url\" may not be null", 
-                    e.getMessage());
-        }
-
-        // add url; username & password are not required
-        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        new VfcManager(mockedWorkingMemory, request);
-
-        // url & username, but no password
-        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-
-        // url, username, and password
-        PolicyEngine.manager.getEnvironment().put("vfc.password", "Toto");
-        new VfcManager(mockedWorkingMemory, request);
-    }
-
-    @Test
-    public void testVfcExecutionException() throws InterruptedException {
-        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-        PolicyEngine.manager.getEnvironment().put("vfc.password", "Exception");
-
-        VfcManager manager = new VfcManager(mockedWorkingMemory, request);
-        manager.setRestManager(mockedRestManager);
-
-        Thread managerThread = new Thread(manager);
-        managerThread.start();
-
-        when(mockedRestManager.post(
-            startsWith("http://somewhere.over.the.rainbow"),
-            eq("Dorothy"),
-            eq("Exception"),
-            anyMap(),
-            anyString(),
-            anyString()))
-            .thenThrow(new RuntimeException("OzException"));
-
-        managerThread.join();
-
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-
-    @Test
-    public void testVfcExecutionNull() throws InterruptedException {
-        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-        PolicyEngine.manager.getEnvironment().put("vfc.password", "Null");
-
-        VfcManager manager = new VfcManager(mockedWorkingMemory, request);
-        manager.setRestManager(mockedRestManager);
-
-        Thread managerThread = new Thread(manager);
-        managerThread.start();
-
-        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
-                eq("Dorothy"), eq("Null"), anyMap(), anyString(), anyString()))
-                .thenReturn(null);
-
-        managerThread.join();
-
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-
-    @Test
-    public void testVfcExecutionError0() throws InterruptedException {
-        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-        PolicyEngine.manager.getEnvironment().put("vfc.password", "Error0");
-
-        VfcManager manager = new VfcManager(mockedWorkingMemory, request);
-        manager.setRestManager(mockedRestManager);
-
-        Thread managerThread = new Thread(manager);
-        managerThread.start();
-
-        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
-                eq("Dorothy"), eq("Error0"), anyMap(), anyString(), anyString()))
-                .thenReturn(httpResponseErr);
-
-        managerThread.join();
-
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-
-    @Test
-    public void testVfcExecutionBadResponse() throws InterruptedException {
-        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-        PolicyEngine.manager.getEnvironment().put("vfc.password", "BadResponse");
-
-        VfcManager manager = new VfcManager(mockedWorkingMemory, request);
-        manager.setRestManager(mockedRestManager);
-
-        Thread managerThread = new Thread(manager);
-        managerThread.start();
-
-        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
-                eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
-                .thenReturn(httpResponseBadResponse);
-
-        managerThread.join();
-
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-
-    @Test
-    public void testVfcExecutionOk() throws InterruptedException {
-        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-        PolicyEngine.manager.getEnvironment().put("vfc.password", "OK");
-
-        VfcManager manager = new VfcManager(mockedWorkingMemory, request);
-        manager.setRestManager(mockedRestManager);
-
-        Thread managerThread = new Thread(manager);
-        managerThread.start();
-
-        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
-                eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
-                .thenReturn(httpResponsePutOk);
-
-        when(mockedRestManager.get(endsWith("1234"), eq("Dorothy"), eq("OK"), anyMap()))
-            .thenReturn(httpResponseGetOk);
-
-        managerThread.join();
-
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java
deleted file mode 100644
index 7dede1b7b..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.UUID;
-
-import org.junit.Test;
-
-public class VfcRequestTest {
-
-    @Test
-    public void testVfcRequest() {
-        VfcRequest request = new VfcRequest();
-        assertNotNull(request);
-        assertNotEquals(0, request.hashCode());
-
-        String nsInstanceId = "Dorothy";
-        request.setNsInstanceId(nsInstanceId);
-        assertEquals(nsInstanceId, request.getNsInstanceId());
-
-        UUID requestId = UUID.randomUUID();
-        request.setRequestId(requestId);
-        assertEquals(requestId, request.getRequestId());
-
-        VfcHealRequest healRequest = new VfcHealRequest();
-        request.setHealRequest(healRequest);
-        assertEquals(healRequest, request.getHealRequest());
-
-        assertNotEquals(0, request.hashCode());
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java
deleted file mode 100644
index b4dc81b44..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-public class VfcResponseDescriptorTest {
-
-    @Test
-    public void testVfcResponseDescriptor() {
-        VfcResponseDescriptor descriptor = new VfcResponseDescriptor();
-        assertNotNull(descriptor);
-        assertNotEquals(0, descriptor.hashCode());
-
-        String errorCode = "WitchIsDead";
-        descriptor.setErrorCode(errorCode);
-        assertEquals(errorCode, descriptor.getErrorCode());
-
-        String progress = "Visited Wizard";
-        descriptor.setProgress(progress);
-        assertEquals(progress, descriptor.getProgress());
-
-        List<VfcResponseDescriptor> responseHistoryList = new ArrayList<>();
-        descriptor.setResponseHistoryList(responseHistoryList);
-        assertEquals(responseHistoryList, descriptor.getResponseHistoryList());
-
-        String responseId = "WishHard";
-        descriptor.setResponseId(responseId);
-        assertEquals(responseId, descriptor.getResponseId());
-
-        String status = "Back in Kansas";
-        descriptor.setStatus(status);
-        assertEquals(status, descriptor.getStatus());
-
-        String statusDescription = "Back on the prairie";
-        descriptor.setStatusDescription(statusDescription);
-        assertEquals(statusDescription, descriptor.getStatusDescription());
-
-        assertNotEquals(0, descriptor.hashCode());
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseTest.java
deleted file mode 100644
index 15ba6f520..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. 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.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class VfcResponseTest {
-
-    @Test
-    public void testVfcResponse() {
-        VfcResponse response = new VfcResponse();
-        assertNotNull(response);
-        assertNotEquals(0, response.hashCode());
-
-        String jobId = "GetToOz";
-        response.setJobId(jobId);
-        assertEquals(jobId, response.getJobId());
-
-        String requestId = "Get Home";
-        response.setRequestId(requestId);
-        assertEquals(requestId, response.getRequestId());
-
-        VfcResponseDescriptor responseDescriptor = new VfcResponseDescriptor();
-        response.setResponseDescriptor(responseDescriptor);
-        assertEquals(responseDescriptor, response.getResponseDescriptor());
-
-        assertNotEquals(0, response.hashCode());
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/SerializationTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/SerializationTest.java
deleted file mode 100644
index beceb045a..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/SerializationTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Corporation. 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.vfc.util;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class SerializationTest {
-
-    @Test
-    public void test() {
-        assertNotNull(Serialization.gsonPretty);
-    }
-}