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>

4 files changed, 0 insertions, 397 deletions

diff --git a/controlloop/common/actors/actor.sdnc/pom.xml b/controlloop/common/actors/actor.sdnc/pom.xml
deleted file mode 100644
index 8c26ce8c4..000000000
--- a/controlloop/common/actors/actor.sdnc/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  drools-pdp-apps
-  ================================================================================
-  Copyright (C) 2018 Huawei 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.actors</groupId>
-    <artifactId>actors</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>actor.sdnc</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-      <artifactId>actorServiceProvider</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>sdnc</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>events</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>aai</artifactId>
-      <version>${project.version}</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>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>simulators</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/controlloop/common/actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProvider.java b/controlloop/common/actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProvider.java
deleted file mode 100644
index 9d7660c5d..000000000
--- a/controlloop/common/actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProvider.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SdncActorServiceProvider
- * ================================================================================
- * Copyright (C) 2018-2019 Huawei Technologies Co., Ltd. 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.sdnc;
-
-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.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.sdnc.SdncHealNetworkInfo;
-import org.onap.policy.sdnc.SdncHealRequest;
-import org.onap.policy.sdnc.SdncHealRequestHeaderInfo;
-import org.onap.policy.sdnc.SdncHealRequestInfo;
-import org.onap.policy.sdnc.SdncHealServiceInfo;
-import org.onap.policy.sdnc.SdncHealVfModuleParameter;
-import org.onap.policy.sdnc.SdncHealVfModuleParametersInfo;
-import org.onap.policy.sdnc.SdncHealVfModuleRequestInput;
-import org.onap.policy.sdnc.SdncHealVnfInfo;
-
-import org.onap.policy.sdnc.SdncRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SdncActorServiceProvider implements Actor {
-    private static final Logger logger = LoggerFactory.getLogger(SdncActorServiceProvider.class);
-
-    // Strings for Sdnc Actor
-    private static final String SDNC_ACTOR = "SDNC";
-
-    // Strings for targets
-    private static final String TARGET_VM = "VM";
-
-    // Strings for recipes
-    private static final String RECIPE_REROUTE = "Reroute";
-
-    // Strings for recipes
-    private static final String RECIPE_BW_ON_DEMAND = "BandwidthOnDemand";
-
-    private static final ImmutableList<String> recipes = ImmutableList.of(RECIPE_REROUTE);
-    private static final ImmutableMap<String, List<String>> targets =
-            new ImmutableMap.Builder<String, List<String>>().put(RECIPE_REROUTE, ImmutableList.of(TARGET_VM)).build();
-
-    @Override
-    public String actor() {
-        return SDNC_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
-     * @return the constructed request
-     */
-    public SdncRequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation,
-            Policy policy) {
-        switch (policy.getRecipe()) {
-            case RECIPE_REROUTE:
-                return constructReOptimizeRequest(onset);
-            case RECIPE_BW_ON_DEMAND:
-                logger.info("Construct request for receipe {}" , RECIPE_BW_ON_DEMAND);
-                return constructBwOnDemandRequest(onset);
-            default:
-                logger.info("Unsupported recipe {} " + policy.getRecipe());
-                return null;
-        }
-    }
-
-    private SdncRequest constructBwOnDemandRequest(VirtualControlLoopEvent onset) {
-        // Construct an Sdnc request
-        String serviceInstance = onset.getAai().get("service-instance.service-instance-id");
-        if (serviceInstance == null || serviceInstance.isEmpty()) {
-            // This indicates that AAI Enrichment needs to be done by event producer.
-            return null;
-        }
-        SdncHealVfModuleParameter bandwidth = new SdncHealVfModuleParameter();
-        bandwidth.setName("bandwidth");
-        bandwidth.setValue(onset.getAai().get("bandwidth"));
-
-        SdncHealVfModuleParameter timeStamp = new SdncHealVfModuleParameter();
-        timeStamp.setName("bandwidth-change-time");
-        timeStamp.setValue(onset.getAai().get("bandwidth-change-time"));
-
-        SdncHealVfModuleParametersInfo vfParametersInfo = new SdncHealVfModuleParametersInfo();
-        vfParametersInfo.addParameters(bandwidth);
-        vfParametersInfo.addParameters(timeStamp);
-
-        SdncHealVfModuleRequestInput vfRequestInfo = new SdncHealVfModuleRequestInput();
-        vfRequestInfo.setVfModuleParametersInfo(vfParametersInfo);
-
-        SdncHealServiceInfo serviceInfo = new SdncHealServiceInfo();
-        serviceInfo.setServiceInstanceId(serviceInstance);
-
-        SdncHealRequestInfo requestInfo = new SdncHealRequestInfo();
-        requestInfo.setRequestAction("SdwanBandwidthChange");
-
-        SdncHealRequestHeaderInfo headerInfo = new SdncHealRequestHeaderInfo();
-        headerInfo.setSvcAction("update");
-        headerInfo.setSvcRequestId(UUID.randomUUID().toString());
-
-        SdncRequest request = new SdncRequest();
-        request.setNsInstanceId(serviceInstance);
-        request.setRequestId(onset.getRequestId());
-        request.setUrl("/GENERIC-RESOURCE-API:vnf-topology-operation");
-
-        SdncHealVnfInfo vnfInfo = new SdncHealVnfInfo();
-        vnfInfo.setVnfId(onset.getAai().get("vnfId"));
-
-        SdncHealRequest healRequest = new SdncHealRequest();
-        healRequest.setVnfInfo(vnfInfo);
-        healRequest.setRequestHeaderInfo(headerInfo);
-        healRequest.setVfModuleRequestInput(vfRequestInfo);
-        healRequest.setRequestInfo(requestInfo);
-        healRequest.setServiceInfo(serviceInfo);
-        request.setHealRequest(healRequest);
-        return request;
-    }
-
-    private SdncRequest constructReOptimizeRequest(VirtualControlLoopEvent onset) {
-        // Construct an Sdnc request
-        String serviceInstance = onset.getAai().get("service-instance.service-instance-id");
-        if (serviceInstance == null || serviceInstance.isEmpty()) {
-            // This indicates that AAI Enrichment needs to be done by event producer.
-            return null;
-        }
-        SdncHealServiceInfo serviceInfo = new SdncHealServiceInfo();
-        serviceInfo.setServiceInstanceId(serviceInstance);
-
-        String networkId = onset.getAai().get("network-information.network-id");
-        if (networkId == null || networkId.isEmpty()) {
-            // This indicates that AAI Enrichment needs to be done by event producer.
-            return null;
-        }
-        SdncHealNetworkInfo networkInfo = new SdncHealNetworkInfo();
-        networkInfo.setNetworkId(networkId);
-
-        SdncHealRequestInfo requestInfo = new SdncHealRequestInfo();
-        requestInfo.setRequestAction("ReoptimizeSOTNInstance");
-
-        SdncHealRequestHeaderInfo headerInfo = new SdncHealRequestHeaderInfo();
-        headerInfo.setSvcAction("reoptimize");
-        headerInfo.setSvcRequestId(UUID.randomUUID().toString());
-
-        SdncRequest request = new SdncRequest();
-        request.setNsInstanceId(serviceInstance);
-        request.setRequestId(onset.getRequestId());
-        request.setUrl("/GENERIC-RESOURCE-API:network-topology-operation");
-
-        SdncHealRequest healRequest = new SdncHealRequest();
-        healRequest.setRequestHeaderInfo(headerInfo);
-        healRequest.setNetworkInfo(networkInfo);
-        healRequest.setRequestInfo(requestInfo);
-        healRequest.setServiceInfo(serviceInfo);
-        request.setHealRequest(healRequest);
-        return request;
-    }
-}
\ No newline at end of file
diff --git a/controlloop/common/actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor b/controlloop/common/actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
deleted file mode 100644
index f4d1e975e..000000000
--- a/controlloop/common/actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
+++ /dev/null
@@ -1 +0,0 @@
-org.onap.policy.controlloop.actor.sdnc.SdncActorServiceProvider
\ No newline at end of file
diff --git a/controlloop/common/actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProviderTest.java b/controlloop/common/actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProviderTest.java
deleted file mode 100644
index f968f8609..000000000
--- a/controlloop/common/actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProviderTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * TestSdncActorServiceProvider
- * ================================================================================
- * Copyright (C) 2018-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Modifications Copyright (C) 2018 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.sdnc;
-
-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.sdnc.SdncRequest;
-import org.onap.policy.simulators.Util;
-
-public class SdncActorServiceProviderTest {
-
-    /**
-     * 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("Reroute");
-
-        SdncActorServiceProvider provider = new SdncActorServiceProvider();
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        onset.getAai().put("network-information.network-id", "network-5555");
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        PolicyEngine.manager.setEnvironmentProperty("aai.url", "http://localhost:6666");
-        PolicyEngine.manager.setEnvironmentProperty("aai.username", "AAI");
-        PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        UUID requestId = UUID.randomUUID();
-        onset.setRequestId(requestId);
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        onset.getAai().put("service-instance.service-instance-id", "service-instance-01");
-        assertNotNull(provider.constructRequest(onset, operation, policy));
-
-        policy.setRecipe("Reroute");
-        assertNotNull(provider.constructRequest(onset, operation, policy));
-
-        SdncRequest request =
-                provider.constructRequest(onset, operation, policy);
-
-        assertEquals(requestId, Objects.requireNonNull(request).getRequestId());
-        assertEquals("reoptimize", request.getHealRequest().getRequestHeaderInfo().getSvcAction());
-        assertEquals("ReoptimizeSOTNInstance", request.getHealRequest().getRequestInfo().getRequestAction());
-        assertEquals("network-5555", request.getHealRequest().getNetworkInfo().getNetworkId());
-        assertEquals("service-instance-01", request.getHealRequest().getServiceInfo().getServiceInstanceId());
-    }
-
-    @Test
-    public void testMethods() {
-        SdncActorServiceProvider sp = new SdncActorServiceProvider();
-
-        assertEquals("SDNC", sp.actor());
-        assertEquals(1, sp.recipes().size());
-        assertEquals("Reroute", sp.recipes().get(0));
-        assertEquals("VM", sp.recipeTargets("Reroute").get(0));
-        assertEquals(0, sp.recipePayloads("Reroute").size());
-    }
-}