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>

18 files changed, 0 insertions, 1469 deletions

diff --git a/controlloop/common/model-impl/vfc/pom.xml b/controlloop/common/model-impl/vfc/pom.xml
deleted file mode 100644
index 1df42831b..000000000
--- a/controlloop/common/model-impl/vfc/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2017 Intel Corp. All rights reserved.
-  Modifications Copyright (C) 2018 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=========================================================
-  -->
-
-<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.drools-applications.controlloop.common.model-impl</groupId>
-    <artifactId>model-impl</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>vfc</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.13.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>rest</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-core</artifactId>
-      <version>6.5.0.Final</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.common</groupId>
-      <artifactId>policy-endpoints</artifactId>
-      <version>${version.policy.common}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-pdp</groupId>
-      <artifactId>policy-management</artifactId>
-      <version>${version.policy.drools-pdp}</version>
-      <scope>provided</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 -->
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <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/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java
deleted file mode 100644
index c154f7226..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java
+++ /dev/null
@@ -1,55 +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 com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class VfcHealActionVmInfo implements Serializable {
-
-    private static final long serialVersionUID = 3208673205100673119L;
-
-    @SerializedName("vmid")
-    private String vmid;
-
-    @SerializedName("vmname")
-    private String vmname;
-
-    public VfcHealActionVmInfo() {
-        // Default constructor
-    }
-
-    public String getVmid() {
-        return vmid;
-    }
-
-    public void setVmid(String vmid) {
-        this.vmid = vmid;
-    }
-
-    public String getVmname() {
-        return vmname;
-    }
-
-    public void setVmname(String vmname) {
-        this.vmname = vmname;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java
deleted file mode 100644
index 2c5de3a22..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java
+++ /dev/null
@@ -1,55 +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 com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class VfcHealAdditionalParams implements Serializable {
-
-    private static final long serialVersionUID = 2656694137285096191L;
-
-    @SerializedName("action")
-    private String action;
-
-    @SerializedName("actionvminfo")
-    private VfcHealActionVmInfo actionInfo;
-
-    public VfcHealAdditionalParams() {
-        // Default constructor
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public VfcHealActionVmInfo getActionInfo() {
-        return actionInfo;
-    }
-
-    public void setActionInfo(VfcHealActionVmInfo actionInfo) {
-        this.actionInfo = actionInfo;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java
deleted file mode 100644
index 55ca4ac5c..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java
+++ /dev/null
@@ -1,66 +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 com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class VfcHealRequest implements Serializable {
-
-    private static final long serialVersionUID = -7341931593089709247L;
-
-    @SerializedName("vnfInstanceId")
-    private String vnfInstanceId;
-
-    @SerializedName("cause")
-    private String cause;
-
-    @SerializedName("additionalParams")
-    private VfcHealAdditionalParams additionalParams;
-
-    public VfcHealRequest() {
-        // Default constructor
-    }
-
-    public String getVnfInstanceId() {
-        return vnfInstanceId;
-    }
-
-    public void setVnfInstanceId(String vnfInstanceId) {
-        this.vnfInstanceId = vnfInstanceId;
-    }
-
-    public String getCause() {
-        return cause;
-    }
-
-    public void setCause(String cause) {
-        this.cause = cause;
-    }
-
-    public VfcHealAdditionalParams getAdditionalParams() {
-        return additionalParams;
-    }
-
-    public void setAdditionalParams(VfcHealAdditionalParams additionalParams) {
-        this.additionalParams = additionalParams;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
deleted file mode 100644
index 7cea2f181..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2017-2018 Intel Corp, AT&T. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. All rights reserved.
- * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd.
- * ================================================================================
- * 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 com.google.gson.JsonSyntaxException;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.drools.core.WorkingMemory;
-import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
-import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
-import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
-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;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class VfcManager implements Runnable {
-
-    private String vfcUrlBase;
-    private String username;
-    private String password;
-    private VfcRequest vfcRequest;
-    private WorkingMemory workingMem;
-    private static final Logger logger = LoggerFactory.getLogger(VfcManager.class);
-
-    // The REST manager used for processing REST calls for this VFC manager
-    private RestManager restManager;
-
-    /**
-     * Constructor.
-     *
-     * @param wm Drools working memory
-     * @param request request
-     */
-    public VfcManager(WorkingMemory wm, VfcRequest request) {
-        if (wm == null || request == null) {
-            throw new IllegalArgumentException(
-                    "the parameters \"wm\" and \"request\" on the VfcManager constructor may not be null");
-        }
-        workingMem = wm;
-        vfcRequest = request;
-
-        restManager = new RestManager();
-
-        // use getPEManagerEnvProperty() for required properties; others are optional
-        setVfcParams(getPeManagerEnvProperty("vfc.url"), PolicyEngine.manager.getEnvironmentProperty("vfc.username"),
-                PolicyEngine.manager.getEnvironmentProperty("vfc.password"));
-    }
-
-    /**
-     * Set the parameters.
-     *
-     * @param baseUrl base URL
-     * @param name username
-     * @param pwd password
-     */
-    public void setVfcParams(String baseUrl, String name, String pwd) {
-        vfcUrlBase = baseUrl + "/api/nslcm/v1";
-        username = name;
-        password = pwd;
-    }
-
-    @Override
-    public void run() {
-        Map<String, String> headers = new HashMap<>();
-        Pair<Integer, String> httpDetails;
-
-        VfcResponse responseError = new VfcResponse();
-        responseError.setResponseDescriptor(new VfcResponseDescriptor());
-        responseError.getResponseDescriptor().setStatus("error");
-
-        headers.put("Accept", "application/json");
-        String vfcUrl = vfcUrlBase + "/ns/" + vfcRequest.getNsInstanceId() + "/heal";
-        try {
-            String vfcRequestJson = Serialization.gsonPretty.toJson(vfcRequest);
-            NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, vfcUrl, vfcRequestJson);
-
-            httpDetails = restManager.post(vfcUrl, username, password, headers, "application/json", vfcRequestJson);
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            workingMem.insert(responseError);
-            return;
-        }
-
-        if (httpDetails == null) {
-            workingMem.insert(responseError);
-            return;
-        }
-
-        if (httpDetails.first != 202) {
-            logger.warn("VFC Heal Restcall failed");
-            return;
-        }
-
-        try {
-            VfcResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, VfcResponse.class);
-            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, vfcUrl, httpDetails.second);
-            String body = Serialization.gsonPretty.toJson(response);
-            logger.debug("Response to VFC Heal post:");
-            logger.debug(body);
-
-            String jobId = response.getJobId();
-            int attemptsLeft = 20;
-
-            String urlGet = vfcUrlBase + "/jobs/" + jobId;
-            VfcResponse responseGet = null;
-
-            while (attemptsLeft-- > 0) {
-                NetLoggerUtil.getNetworkLogger().info("[OUT|{}|{}|]", "VFC", urlGet);
-                Pair<Integer, String> httpDetailsGet = restManager.get(urlGet, username, password, headers);
-                responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.second, VfcResponse.class);
-                NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, vfcUrl, httpDetailsGet.second);
-                responseGet.setRequestId(vfcRequest.getRequestId().toString());
-                body = Serialization.gsonPretty.toJson(responseGet);
-                logger.debug("Response to VFC Heal get:");
-                logger.debug(body);
-
-                String responseStatus = responseGet.getResponseDescriptor().getStatus();
-                if (httpDetailsGet.first == 200
-                        && ("finished".equalsIgnoreCase(responseStatus) || "error".equalsIgnoreCase(responseStatus))) {
-                    logger.debug("VFC Heal Status {}", responseGet.getResponseDescriptor().getStatus());
-                    workingMem.insert(responseGet);
-                    break;
-                }
-                Thread.sleep(20000);
-            }
-            if ((attemptsLeft <= 0) && (responseGet != null) && (responseGet.getResponseDescriptor() != null)
-                    && (responseGet.getResponseDescriptor().getStatus() != null)
-                    && (!responseGet.getResponseDescriptor().getStatus().isEmpty())) {
-                logger.debug("VFC timeout. Status: ({})", responseGet.getResponseDescriptor().getStatus());
-                workingMem.insert(responseGet);
-            }
-        } catch (JsonSyntaxException e) {
-            logger.error("Failed to deserialize into VfcResponse {}", e.getLocalizedMessage(), e);
-        } catch (InterruptedException e) {
-            logger.error("Interrupted exception: {}", e.getLocalizedMessage(), e);
-            Thread.currentThread().interrupt();
-        } catch (Exception e) {
-            logger.error("Unknown error deserializing into VfcResponse {}", e.getLocalizedMessage(), e);
-        }
-    }
-
-    /**
-     * Protected setter for rest manager to allow mocked rest manager to be used for testing.
-     *
-     * @param restManager the test REST manager
-     */
-    protected void setRestManager(final RestManager restManager) {
-        this.restManager = restManager;
-    }
-
-    /**
-     * This method reads and validates environmental properties coming from the policy engine. Null
-     * properties cause an {@link IllegalArgumentException} runtime exception to be thrown
-     *
-     * @param string the name of the parameter to retrieve
-     * @return the property value
-     */
-
-    private String getPeManagerEnvProperty(String enginePropertyName) {
-        String enginePropertyValue = PolicyEngine.manager.getEnvironmentProperty(enginePropertyName);
-        if (enginePropertyValue == null) {
-            throw new IllegalArgumentException("The value of policy engine manager environment property \""
-                    + enginePropertyName + "\" may not be null");
-        }
-        return enginePropertyValue;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java
deleted file mode 100644
index c4473e7f1..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java
+++ /dev/null
@@ -1,64 +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 com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-public class VfcRequest implements Serializable {
-
-    private static final long serialVersionUID = 3736300970326332512L;
-    // These fields are not serialized and not part of JSON
-    private transient String nsInstanceId;
-    private transient UUID requestId;
-
-    @SerializedName("healVnfData")
-    private VfcHealRequest healRequest;
-
-    public VfcRequest() {
-        // Default constructor
-    }
-
-    public String getNsInstanceId() {
-        return nsInstanceId;
-    }
-
-    public void setNsInstanceId(String nsInstanceId) {
-        this.nsInstanceId = nsInstanceId;
-    }
-
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(UUID requestId) {
-        this.requestId = requestId;
-    }
-
-    public VfcHealRequest getHealRequest() {
-        return healRequest;
-    }
-
-    public void setHealRequest(VfcHealRequest healRequest) {
-        this.healRequest = healRequest;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java
deleted file mode 100644
index 2183be71b..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java
+++ /dev/null
@@ -1,65 +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 com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class VfcResponse implements Serializable {
-
-    private static final long serialVersionUID = 9151443891238218455L;
-
-    @SerializedName("jobId")
-    private String jobId;
-
-    @SerializedName("responseDescriptor")
-    private VfcResponseDescriptor responseDescriptor;
-
-    private transient String requestId;
-
-    public VfcResponse() {
-        // Default constructor
-    }
-
-    public String getJobId() {
-        return jobId;
-    }
-
-    public void setJobId(String jobId) {
-        this.jobId = jobId;
-    }
-
-    public VfcResponseDescriptor getResponseDescriptor() {
-        return responseDescriptor;
-    }
-
-    public void setResponseDescriptor(VfcResponseDescriptor responseDescriptor) {
-        this.responseDescriptor = responseDescriptor;
-    }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java
deleted file mode 100644
index 147b937dc..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java
+++ /dev/null
@@ -1,100 +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 com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class VfcResponseDescriptor implements Serializable {
-
-    private static final long serialVersionUID = 6827782899144150158L;
-
-    @SerializedName("progress")
-    private String progress;
-
-    @SerializedName("status")
-    private String status;
-
-    @SerializedName("statusDescription")
-    private String statusDescription;
-
-    @SerializedName("errorCode")
-    private String errorCode;
-
-    @SerializedName("responseId")
-    private String responseId;
-
-    @SerializedName("responseHistoryList")
-    private List<VfcResponseDescriptor> responseHistoryList;
-
-    public VfcResponseDescriptor() {
-        // Default constructor
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public String getProgress() {
-        return progress;
-    }
-
-    public void setProgress(String progress) {
-        this.progress = progress;
-    }
-
-    public String getStatusDescription() {
-        return statusDescription;
-    }
-
-    public void setStatusDescription(String statusDescription) {
-        this.statusDescription = statusDescription;
-    }
-
-    public String getErrorCode() {
-        return errorCode;
-    }
-
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public String getResponseId() {
-        return responseId;
-    }
-
-    public void setResponseId(String responseId) {
-        this.responseId = responseId;
-    }
-
-    public List<VfcResponseDescriptor> getResponseHistoryList() {
-        return responseHistoryList;
-    }
-
-    public void setResponseHistoryList(List<VfcResponseDescriptor> responseHistoryList) {
-        this.responseHistoryList = responseHistoryList;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java
deleted file mode 100644
index 19aca3aae..000000000
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2017-2018 Intel Corp. All rights reserved.
- * Modifications Copyright (C) 2018 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.vfc.util;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-public final class Serialization {
-    public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
-            .setPrettyPrinting()
-            .create();
-
-    private Serialization() {
-    }
-
-}
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);
-    }
-}