Remove hpa decoder from policy/distribution

Issue-ID: POLICY-2477
Change-Id: Iff4158e2322724265007d5a90459c3ebf62d3fc2
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>

12 files changed, 3 insertions, 706 deletions

diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestAttribute.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestAttribute.java
deleted file mode 100644
index b4e2ed43..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestAttribute.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2020 AT&T Inc.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Class to perform unit test for Attribute 0f {@link Attribute}.
- *
- */
-public class TestAttribute {
-
-    @Test
-    public void testAttribute() {
-        final String attributeName = "dummyName";
-        final String attributeValue = "dummyValue";
-
-        final Attribute attribute = new Attribute();
-        attribute.setAttributeName(attributeName);
-        attribute.setAttributeValue(attributeValue);
-
-        validateReport(attributeName, attributeValue, attribute);
-    }
-
-    private void validateReport(final String name, final String value, final Attribute attribute) {
-        assertEquals(name, attribute.getAttributeName());
-        assertEquals(value, attribute.getAttributeValue());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestContent.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestContent.java
deleted file mode 100644
index bc8f4d5c..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestContent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2020 AT&T Inc.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Class to perform unit test for Content 0f {@link Content}.
- *
- */
-public class TestContent {
-
-    @Test
-    public void testContent() {
-        final String identity = "dummyidentity";
-        final String policyType = "optimization";
-
-        final Content content = new Content();
-        content.setIdentity(identity);
-        content.setPolicyType(policyType);
-
-        validateReport(identity, policyType, content);
-    }
-
-    private void validateReport(final String identity, final String policyType,
-            final Content content) {
-        assertEquals(0, content.getScope().size());
-        assertEquals(0, content.getGeography().size());
-        assertEquals(identity, content.getIdentity());
-        assertEquals(policyType, content.getPolicyType());
-        assertEquals(0, content.getPolicyScope().size());
-        content.getPolicyScope().add("vFW");
-        assertEquals(1, content.getPolicyScope().size());
-        content.getPolicyScope().remove("vFW");
-        assertEquals(0, content.getPolicyScope().size());
-        assertEquals(0, content.getServices().size());
-        content.getServices().add("vCPE");
-        assertEquals(1, content.getServices().size());
-        content.getServices().remove("vCPE");
-        assertEquals(0, content.getServices().size());
-        assertEquals(0, content.getFlavorFeatures().size());
-        FlavorFeature flavorFeature = new FlavorFeature();
-        content.getFlavorFeatures().add(flavorFeature);
-        assertEquals(1, content.getFlavorFeatures().size());
-        content.getFlavorFeatures().remove(flavorFeature);
-        assertEquals(0, content.getFlavorFeatures().size());
-        assertEquals(0, content.getResources().size());
-        content.getResources().add("vGW");
-        assertEquals(1, content.getResources().size());
-        content.getResources().remove("vGW");
-        assertEquals(0, content.getResources().size());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestDirective.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestDirective.java
deleted file mode 100644
index 7429fe7a..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestDirective.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2020 AT&T Inc.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Class to perform unit test for Directive 0f {@link Directive}.
- *
- */
-public class TestDirective {
-
-    @Test
-    public void testDirective() {
-        final String type = "dummytype";
-
-        final Directive directive = new Directive();
-        directive.setType(type);
-
-        validateReport(type, directive);
-    }
-
-    private void validateReport(final String type, final Directive directive) {
-        assertEquals(type, directive.getType());
-        assertEquals(0, directive.getAttributes().size());
-        Attribute attribute = new Attribute();
-        directive.getAttributes().add(attribute);
-        assertEquals(1, directive.getAttributes().size());
-        directive.getAttributes().remove(attribute);
-        assertEquals(0, directive.getAttributes().size());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorFeature.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorFeature.java
deleted file mode 100644
index b9fee589..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorFeature.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2020 AT&T Inc.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Class to perform unit test for FlavorFeature 0f {@link FlavorFeature}.
- *
- */
-public class TestFlavorFeature {
-
-    @Test
-    public void testFlavorFeature() {
-        final String id = "dummyid";
-        final String type = "dummytype";
-
-        final FlavorFeature flavorFeature = new FlavorFeature();
-        flavorFeature.setId(id);
-        flavorFeature.setType(type);
-
-        validateReport(id, type, flavorFeature);
-    }
-
-    private void validateReport(final String id, final String type, final FlavorFeature flavorFeature) {
-        assertEquals(id, flavorFeature.getId());
-        assertEquals(type, flavorFeature.getType());
-
-        assertEquals(0, flavorFeature.getDirectives().size());
-        Directive directive = new Directive();
-        flavorFeature.getDirectives().add(directive);
-        assertEquals(1, flavorFeature.getDirectives().size());
-        flavorFeature.getDirectives().remove(directive);
-        assertEquals(0, flavorFeature.getDirectives().size());
-
-        assertEquals(0, flavorFeature.getFlavorProperties().size());
-        FlavorProperty flavorProperty = new FlavorProperty();
-        flavorFeature.getFlavorProperties().add(flavorProperty);
-        assertEquals(1, flavorFeature.getFlavorProperties().size());
-        flavorFeature.getFlavorProperties().remove(flavorProperty);
-        assertEquals(0, flavorFeature.getFlavorProperties().size());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorProperty.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorProperty.java
deleted file mode 100644
index af6600c8..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorProperty.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2020 AT&T Inc.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Class to perform unit test for FlavorProperty 0f {@link FlavorProperty}.
- *
- */
-public class TestFlavorProperty {
-
-    @Test
-    public void testFlavorProperty() {
-        final String hpaFeature = "dummyid";
-        final String mandatory = "false";
-        final String architecture = "generic";
-        final String hpaVersion = "v1";
-
-        final FlavorProperty flavorProperty = new FlavorProperty();
-        flavorProperty.setHpaFeature(hpaFeature);
-        flavorProperty.setMandatory(mandatory);
-        flavorProperty.setArchitecture(architecture);
-        flavorProperty.setHpaVersion(hpaVersion);
-
-        validateReport(hpaFeature, mandatory, architecture, hpaVersion, flavorProperty);
-    }
-
-    private void validateReport(final String hpaFeature, final String mandatory, final String architecture,
-            final String hpaVersion, final FlavorProperty flavorProperty) {
-        assertEquals(hpaFeature, flavorProperty.getHpaFeature());
-        assertEquals(mandatory, flavorProperty.getMandatory());
-        assertEquals(architecture, flavorProperty.getArchitecture());
-        assertEquals(hpaVersion, flavorProperty.getHpaVersion());
-
-        assertEquals(0, flavorProperty.getDirectives().size());
-        Directive directive = new Directive();
-        flavorProperty.getDirectives().add(directive);
-        assertEquals(1, flavorProperty.getDirectives().size());
-        flavorProperty.getDirectives().remove(directive);
-        assertEquals(0, flavorProperty.getDirectives().size());
-
-        assertEquals(0, flavorProperty.getHpaFeatureAttributes().size());
-        HpaFeatureAttribute hpaFeatureAttribute = new HpaFeatureAttribute();
-        flavorProperty.getHpaFeatureAttributes().add(hpaFeatureAttribute);
-        assertEquals(1, flavorProperty.getHpaFeatureAttributes().size());
-        flavorProperty.getHpaFeatureAttributes().remove(hpaFeatureAttribute);
-        assertEquals(0, flavorProperty.getHpaFeatureAttributes().size());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestHpaFeatureAttribute.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestHpaFeatureAttribute.java
deleted file mode 100644
index 3c6531db..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestHpaFeatureAttribute.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2020 AT&T Inc.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Class to perform unit test for HpaFeatureAttribute 0f {@link HpaFeatureAttribute}.
- *
- */
-public class TestHpaFeatureAttribute {
-
-    @Test
-    public void testHpaFeatureAttribute() {
-        final String hpaAttributeKey = "dummykey";
-        final String hpaAttributeValue = "4096";
-        final String operator = ">=";
-        final String unit = "MB";
-
-        final HpaFeatureAttribute hpaFeatureAttribute = new HpaFeatureAttribute();
-        hpaFeatureAttribute.setHpaAttributeKey(hpaAttributeKey);
-        hpaFeatureAttribute.setHpaAttributeValue(hpaAttributeValue);
-        hpaFeatureAttribute.setOperator(operator);
-        hpaFeatureAttribute.setUnit(unit);
-
-        validateReport(hpaAttributeKey, hpaAttributeValue, operator, unit, hpaFeatureAttribute);
-    }
-
-    private void validateReport(final String hpaAttributeKey, final String hpaAttributeValue, final String operator,
-            final String unit, final HpaFeatureAttribute hpaFeatureAttribute) {
-        assertEquals(hpaAttributeKey, hpaFeatureAttribute.getHpaAttributeKey());
-        assertEquals(hpaAttributeValue, hpaFeatureAttribute.getHpaAttributeValue());
-        assertEquals(operator, hpaFeatureAttribute.getOperator());
-        assertEquals(unit, hpaFeatureAttribute.getUnit());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpa.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpa.java
deleted file mode 100644
index 552f430e..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpa.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2020 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.common.parameters.ParameterGroup;
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.common.utils.coder.StandardCoder;
-import org.onap.policy.distribution.model.Csar;
-import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
-
-/**
- * Class to perform unit test of {@link PolicyDecoderCsarHpa}.
- */
-public class TestPolicyDecoderCsarHpa {
-
-    private final StandardCoder encoder = new StandardCoder();
-
-    /**
-     * Set up for test cases.
-     */
-    @BeforeClass
-    public static void setUp() {
-        final ParameterGroup parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/HpaPolicyDecoderParameters.json",
-                PolicyDecoderCsarHpaParameters.class);
-        parameterGroup.setName(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-        ParameterService.register(parameterGroup);
-    }
-
-    /**
-     * Tear down.
-     */
-    @AfterClass
-    public static void tearDown() {
-        ParameterService.deregister(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-    }
-
-    @Test
-    public void testHpaPolicy2Vnf() throws IOException, PolicyDecodingException, CoderException {
-        final Csar csar = new Csar("src/test/resources/service-TestNs8-csar.csar");
-        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
-        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarHpa.decode(csar);
-
-        assertEquals(2, entities.size());
-        final ToscaServiceTemplate entity = entities.iterator().next();
-        ToscaTopologyTemplate topologyTemplate = entity.getToscaTopologyTemplate();
-        Map<String, ToscaPolicy> map = topologyTemplate.getPolicies().get(0);
-        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
-        Map<String, Object> props = policy.getProperties();
-        Object flavorFeatures =
-                      props.get(PolicyDecoderCsarHpa.TOSCA_POLICY_FLAVORFEATURES);
-        String features = encoder.encode(flavorFeatures);
-        assertTrue(features.contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(features.contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(features.contains("\"type\":\"flavor_directives\""));
-        assertTrue(features.contains("\"hpa-feature\":\"basicCapabilities\""));
-        assertTrue(features.contains("\"mandatory\":\"True\""));
-        assertTrue(features.contains("\"architecture\":\"generic\""));
-        assertTrue(features.contains("\"hpa-version\":\"v1\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"virtualMemSize\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"MB\""));
-    }
-
-    @Test
-    public void testHpaPolicySriov() throws IOException, PolicyDecodingException, CoderException {
-        final Csar csar = new Csar("src/test/resources/hpaPolicySriov.csar");
-        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
-        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarHpa.decode(csar);
-        final ToscaServiceTemplate entity = entities.iterator().next();
-        ToscaTopologyTemplate topologyTemplate = entity.getToscaTopologyTemplate();
-        Map<String, ToscaPolicy> map = topologyTemplate.getPolicies().get(0);
-        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
-        Map<String, Object> props = policy.getProperties();
-        Object flavorFeatures =
-                      props.get(PolicyDecoderCsarHpa.TOSCA_POLICY_FLAVORFEATURES);
-        String features = encoder.encode(flavorFeatures);
-        assertTrue(features.contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(features.contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(features.contains("\"type\":\"flavor_directives\""));
-        assertTrue(features.contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(features.contains("\"attribute_value\":\"\""));
-        assertTrue(features.contains("\"hpa-feature\":\"sriovNICNetwork\""));
-        assertTrue(features.contains("\"mandatory\":\"True\""));
-        assertTrue(features.contains("\"architecture\":\"generic\""));
-        assertTrue(features.contains("\"hpa-version\":\"v1\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciDeviceId\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"5678\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciNumDevices\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"1\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-    }
-
-    @Test
-    public void testHpaPolicyPciePassthrough() throws IOException, PolicyDecodingException, CoderException {
-        final Csar csar = new Csar("src/test/resources/hpaPolicyPciePassthrough.csar");
-        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
-        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarHpa.decode(csar);
-        assertEquals(2, entities.size());
-        final ToscaServiceTemplate entity = entities.iterator().next();
-        ToscaTopologyTemplate topologyTemplate = entity.getToscaTopologyTemplate();
-        Map<String, ToscaPolicy> map = topologyTemplate.getPolicies().get(0);
-        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
-        Map<String, Object> props = policy.getProperties();
-        Object flavorFeatures =
-                      props.get(PolicyDecoderCsarHpa.TOSCA_POLICY_FLAVORFEATURES);
-        String features = encoder.encode(flavorFeatures);
-        assertTrue(features.contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(features.contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(features.contains("\"type\":\"flavor_directives\""));
-        assertTrue(features.contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(features.contains("\"attribute_value\":\"\""));
-        assertTrue(features.contains("\"hpa-feature\":\"pciePassthrough\""));
-        assertTrue(features.contains("\"mandatory\":\"True\""));
-        assertTrue(features.contains("\"architecture\":\"generic\""));
-        assertTrue(features.contains("\"hpa-version\":\"v1\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciDeviceId\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"5678\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciNumDevices\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"1\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-    }
-
-    @Test
-    public void testHpaPolicyHugePage() throws IOException, PolicyDecodingException, CoderException {
-        final Csar csar = new Csar("src/test/resources/hpaPolicyHugePage.csar");
-        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
-        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarHpa.decode(csar);
-        assertEquals(2, entities.size());
-        final ToscaServiceTemplate entity = entities.iterator().next();
-        ToscaTopologyTemplate topologyTemplate = entity.getToscaTopologyTemplate();
-        Map<String, ToscaPolicy> map = topologyTemplate.getPolicies().get(0);
-        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
-        Map<String, Object> props = policy.getProperties();
-        Object flavorFeatures =
-                      props.get(PolicyDecoderCsarHpa.TOSCA_POLICY_FLAVORFEATURES);
-        String features = encoder.encode(flavorFeatures);
-        assertTrue(features.contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(features.contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(features.contains("\"type\":\"flavor_directives\""));
-        assertTrue(features.contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(features.contains("\"attribute_value\":\"\""));
-        assertTrue(features.contains("\"hpa-feature\":\"hugePages\""));
-        assertTrue(features.contains("\"mandatory\":\"true\""));
-        assertTrue(features.contains("\"architecture\":\"generic\""));
-        assertTrue(features.contains("\"hpa-version\":\"v1\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"memoryPageSize\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"2\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"MB\""));
-    }
-
-    @Test
-    public void testS3p0PciVendorId() throws IOException, PolicyDecodingException, CoderException {
-        final Csar csar = new Csar("src/test/resources/s3p_0_pciVendorId.csar");
-        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
-        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarHpa.decode(csar);
-        assertEquals(1, entities.size());
-        final ToscaServiceTemplate entity = entities.iterator().next();
-        ToscaTopologyTemplate topologyTemplate = entity.getToscaTopologyTemplate();
-        Map<String, ToscaPolicy> map = topologyTemplate.getPolicies().get(0);
-        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
-        Map<String, Object> props = policy.getProperties();
-        Object flavorFeatures =
-                      props.get(PolicyDecoderCsarHpa.TOSCA_POLICY_FLAVORFEATURES);
-        String features = encoder.encode(flavorFeatures);
-        assertTrue(features.contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(features.contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(features.contains("\"type\":\"flavor_directives\""));
-        assertTrue(features.contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(features.contains("\"attribute_value\":\"\""));
-        assertTrue(features.contains("\"hpa-feature\":\"pciePassthrough\""));
-        assertTrue(features.contains("\"mandatory\":\"True\""));
-        assertTrue(features.contains("\"architecture\":\"generic\""));
-        assertTrue(features.contains("\"hpa-version\":\"v1\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-    }
-
-    @Test
-    public void testserviceVcpeWithAll() throws IOException, PolicyDecodingException, CoderException {
-        final Csar csar = new Csar("src/test/resources/service-VcpeWithAll-csar.csar");
-        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
-        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
-
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarHpa.decode(csar);
-        assertEquals(5, entities.size());
-        final ToscaServiceTemplate entity = entities.iterator().next();
-        ToscaTopologyTemplate topologyTemplate = entity.getToscaTopologyTemplate();
-        Map<String, ToscaPolicy> map = topologyTemplate.getPolicies().get(0);
-        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
-        Map<String, Object> props = policy.getProperties();
-        Object flavorFeatures =
-                      props.get(PolicyDecoderCsarHpa.TOSCA_POLICY_FLAVORFEATURES);
-        String features = encoder.encode(flavorFeatures);
-        assertTrue(features.contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(features.contains("\"type\":\"flavor_directives\""));
-        assertTrue(features.contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(features.contains("\"attribute_value\":\"\""));
-        assertTrue(features.contains("\"hpa-feature\":\"sriovNICNetwork\""));
-        assertTrue(features.contains("\"mandatory\":\"True\""));
-        assertTrue(features.contains("\"architecture\":\"generic\""));
-        assertTrue(features.contains("\"hpa-version\":\"v1\""));
-        assertTrue(features.contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(features.contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(features.contains("\"operator\":\"=\""));
-        assertTrue(features.contains("\"unit\":\"\""));
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpaParameters.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpaParameters.java
deleted file mode 100644
index 1ca9e1a1..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpaParameters.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.reception.decoding.hpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.onap.policy.common.parameters.ValidationStatus;
-
-/**
- * Class to perform unit test of {@link PolicyDecoderCsarHpaParameters}.
- */
-public class TestPolicyDecoderCsarHpaParameters {
-
-    @Test
-    public void testValidParameters() {
-        final PolicyDecoderCsarHpaParameters parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/HpaPolicyDecoderParameters.json",
-                PolicyDecoderCsarHpaParameters.class);
-
-        assertEquals(PolicyDecoderCsarHpaParameters.class.getSimpleName(), parameterGroup.getName());
-        assertEquals("onapName", parameterGroup.getOnapName());
-        assertEquals("OOF", parameterGroup.getPolicyNamePrefix());
-        assertEquals("5", parameterGroup.getPriority());
-        assertEquals("2", parameterGroup.getRiskLevel());
-        assertEquals("Test", parameterGroup.getRiskType());
-        assertEquals("1.0", parameterGroup.getVersion());
-        assertEquals(ValidationStatus.CLEAN, parameterGroup.validate().getStatus());
-    }
-
-    @Test
-    public void testInvalidParameters() {
-        final PolicyDecoderCsarHpaParameters parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/HpaPolicyDecoderParametersInvalid.json",
-                PolicyDecoderCsarHpaParameters.class);
-
-        assertEquals(ValidationStatus.INVALID, parameterGroup.validate().getStatus());
-    }
-
-    @Test
-    public void testEmptyParameters() {
-        final PolicyDecoderCsarHpaParameters configurationParameters =
-                CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json",
-                        PolicyDecoderCsarHpaParameters.class);
-
-        assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus());
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java
index c3e69037..c3cf3f5b 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.distribution.reception.decoding.hpa.CommonTestData;
+import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
 
 /**
  * Class to perform unit test of {@link PolicyDecoderFileInCsarToPolicyParameterGroup}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java
index 05bd0780..812ef6d6 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java
@@ -35,7 +35,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.model.Csar;
 import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
-import org.onap.policy.distribution.reception.decoding.hpa.CommonTestData;
+import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 
 /**
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/CommonTestData.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/CommonTestData.java
index 79790317..e84e265b 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/CommonTestData.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/CommonTestData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.hpa;
+package org.onap.policy.distribution.reception.handling.sdc;
 
 import java.io.File;
 import org.onap.policy.common.utils.coder.Coder;
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
index d981369c..51298c1e 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
@@ -33,7 +33,6 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.onap.policy.common.parameters.GroupValidationResult;
 import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.distribution.reception.decoding.hpa.CommonTestData;
 
 /**
  * Class to perform unit test of {@link SdcConfiguration}.