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>

3 files changed, 0 insertions, 270 deletions

diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
deleted file mode 100644
index 098f1b791..000000000
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2017-2018 Intel Corp. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.controlloop.actor.vfc;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-
-import org.onap.policy.aai.AaiGetVnfResponse;
-import org.onap.policy.aai.AaiManager;
-import org.onap.policy.controlloop.ControlLoopOperation;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
-import org.onap.policy.controlloop.policy.Policy;
-import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RestManager;
-import org.onap.policy.vfc.VfcHealActionVmInfo;
-import org.onap.policy.vfc.VfcHealAdditionalParams;
-import org.onap.policy.vfc.VfcHealRequest;
-import org.onap.policy.vfc.VfcRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VfcActorServiceProvider implements Actor {
-    private static final Logger logger = LoggerFactory.getLogger(VfcActorServiceProvider.class);
-
-    // Strings for VFC Actor
-    private static final String VFC_ACTOR = "VFC";
-
-    // Strings for targets
-    private static final String TARGET_VM = "VM";
-
-    // Strings for recipes
-    private static final String RECIPE_RESTART = "Restart";
-
-    private static final ImmutableList<String> recipes = ImmutableList.of(RECIPE_RESTART);
-    private static final ImmutableMap<String, List<String>> targets =
-            new ImmutableMap.Builder<String, List<String>>().put(RECIPE_RESTART, ImmutableList.of(TARGET_VM)).build();
-
-    @Override
-    public String actor() {
-        return VFC_ACTOR;
-    }
-
-    @Override
-    public List<String> recipes() {
-        return ImmutableList.copyOf(recipes);
-    }
-
-    @Override
-    public List<String> recipeTargets(String recipe) {
-        return ImmutableList.copyOf(targets.getOrDefault(recipe, Collections.emptyList()));
-    }
-
-    @Override
-    public List<String> recipePayloads(String recipe) {
-        return Collections.emptyList();
-    }
-
-    /**
-     * Construct a request.
-     * 
-     * @param onset the onset event
-     * @param operation the control loop operation
-     * @param policy the policy
-     * @param vnfResponse the VNF response
-     * @return the constructed request
-     */
-    public static VfcRequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation,
-            Policy policy, AaiGetVnfResponse vnfResponse) {
-
-        // Construct an VFC request
-        VfcRequest request = new VfcRequest();
-        String serviceInstance = onset.getAai().get("service-instance.service-instance-id");
-        if (serviceInstance == null || "".equals(serviceInstance)) {
-            AaiGetVnfResponse tempVnfResp = vnfResponse;
-            if (tempVnfResp == null) { // if the response is null, we haven't queried
-                // This does the AAI query since we haven't already
-                tempVnfResp = getAaiServiceInstance(onset);
-                if (tempVnfResp == null) {
-                    return null;
-                }
-            }
-            serviceInstance = tempVnfResp.getServiceId();
-        }
-        request.setNsInstanceId(serviceInstance);
-        request.setRequestId(onset.getRequestId());
-        request.setHealRequest(new VfcHealRequest());
-        request.getHealRequest().setVnfInstanceId(onset.getAai().get("generic-vnf.vnf-id"));
-        request.getHealRequest().setCause(operation.getMessage());
-        request.getHealRequest().setAdditionalParams(new VfcHealAdditionalParams());
-
-        if (policy.getRecipe().toLowerCase().equalsIgnoreCase(RECIPE_RESTART)) {
-            request.getHealRequest().getAdditionalParams().setAction("restartvm");
-            request.getHealRequest().getAdditionalParams().setActionInfo(new VfcHealActionVmInfo());
-            request.getHealRequest().getAdditionalParams().getActionInfo()
-                    .setVmid(onset.getAai().get("vserver.vserver-id"));
-            request.getHealRequest().getAdditionalParams().getActionInfo()
-                    .setVmname(onset.getAai().get("vserver.vserver-name"));
-        } else {
-            return null;
-        }
-        return request;
-    }
-
-    private static AaiGetVnfResponse getAaiServiceInstance(VirtualControlLoopEvent event) {
-        AaiGetVnfResponse response = null;
-        UUID requestId = event.getRequestId();
-        String vnfName = event.getAai().get("generic-vnf.vnf-name");
-        String vnfId = event.getAai().get("generic-vnf.vnf-id");
-        String aaiUrl = PolicyEngine.manager.getEnvironmentProperty("aai.url");
-        String aaiUsername = PolicyEngine.manager.getEnvironmentProperty("aai.username");
-        String aaiPassword = PolicyEngine.manager.getEnvironmentProperty("aai.password");
-        try {
-            if (vnfName != null) {
-                String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf?vnf-name=";
-                response = new AaiManager(new RestManager()).getQueryByVnfName(url, aaiUsername, aaiPassword, requestId,
-                        vnfName);
-            } else if (vnfId != null) {
-                String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf/";
-                response = new AaiManager(new RestManager()).getQueryByVnfId(url, aaiUsername, aaiPassword, requestId,
-                        vnfId);
-            } else {
-                logger.error("getAAIServiceInstance failed");
-            }
-        } catch (Exception e) {
-            logger.error("getAAIServiceInstance exception: ", e);
-        }
-        return response;
-    }
-}
diff --git a/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor b/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
deleted file mode 100644
index e43c726cf..000000000
--- a/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
+++ /dev/null
@@ -1 +0,0 @@
-org.onap.policy.controlloop.actor.vfc.VfcActorServiceProvider
diff --git a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java
deleted file mode 100644
index 9e6b5b827..000000000
--- a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - Policy Drools Applications
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Corp. 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.controlloop.actor.vfc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.util.Objects;
-import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.aai.AaiGetVnfResponse;
-import org.onap.policy.common.endpoints.http.server.HttpServletServer;
-import org.onap.policy.controlloop.ControlLoopOperation;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.controlloop.policy.Policy;
-import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.simulators.Util;
-import org.onap.policy.vfc.VfcRequest;
-
-public class VfcActorServiceProviderTest {
-
-    /**
-     * Set up for test class.
-     */
-    @BeforeClass
-    public static void setUpSimulator() {
-        try {
-            Util.buildAaiSim();
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @AfterClass
-    public static void tearDownSimulator() {
-        HttpServletServer.factory.destroy();
-    }
-
-    @Test
-    public void testConstructRequest() {
-        VirtualControlLoopEvent onset = new VirtualControlLoopEvent();
-        ControlLoopOperation operation = new ControlLoopOperation();
-
-        Policy policy = new Policy();
-        policy.setRecipe("GoToOz");
-
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        onset.getAai().put("generic-vnf.vnf-id", "dorothy.gale.1939");
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        PolicyEngine.manager.setEnvironmentProperty("aai.url", "http://localhost:6666");
-        PolicyEngine.manager.setEnvironmentProperty("aai.username", "AAI");
-        PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        UUID requestId = UUID.randomUUID();
-        onset.setRequestId(requestId);
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        onset.getAai().put("generic-vnf.vnf-name", "Dorothy");
-        PolicyEngine.manager.getEnvironment().remove("aai.password");
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        onset.getAai().put("service-instance.service-instance-id", "");
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
-
-        assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
-
-        policy.setRecipe("Restart");
-        assertNotNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
-
-        VfcRequest request =
-                VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse());
-
-        assertEquals(requestId, Objects.requireNonNull(request).getRequestId());
-        assertEquals("dorothy.gale.1939", request.getHealRequest().getVnfInstanceId());
-        assertEquals("restartvm", request.getHealRequest().getAdditionalParams().getAction());
-    }
-
-    @Test
-    public void testMethods() {
-        VfcActorServiceProvider sp = new VfcActorServiceProvider();
-
-        assertEquals("VFC", sp.actor());
-        assertEquals(1, sp.recipes().size());
-        assertEquals("Restart", sp.recipes().get(0));
-        assertEquals("VM", sp.recipeTargets("Restart").get(0));
-        assertEquals(0, sp.recipePayloads("Restart").size());
-    }
-}