Remove policy/engine & apex dependency from distribution

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

48 files changed, 133 insertions, 2074 deletions

diff --git a/plugins/forwarding-plugins/pom.xml b/plugins/forwarding-plugins/pom.xml
index cdb45f72..19dee4b7 100644
--- a/plugins/forwarding-plugins/pom.xml
+++ b/plugins/forwarding-plugins/pom.xml
@@ -42,22 +42,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.engine</groupId>
-            <artifactId>PolicyEngineAPI</artifactId>
-            <version>${policy.engine.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-deployment</artifactId>
-            <version>${policy.apex-pdp.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarder.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarder.java
deleted file mode 100644
index 996b887d..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarder.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Copyright (C) 2019 Intel 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.forwarding.apex.pdp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-
-import org.apache.commons.io.IOUtils;
-import org.onap.policy.apex.core.deployment.EngineServiceFacade;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.distribution.forwarding.PolicyForwarder;
-import org.onap.policy.distribution.forwarding.PolicyForwardingException;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class provides an implementation of {@link PolicyForwarder} interface for forwarding the given policies to
- * apex-pdp.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
- */
-public class ApexPdpPolicyForwarder implements PolicyForwarder {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ApexPdpPolicyForwarder.class);
-    private static final String POLICY_TYPE = "APEX";
-
-    private ApexPdpPolicyForwarderParameterGroup apexForwarderParameters;
-    private EngineServiceFacade engineServiceFacade;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public void configure(final String parameterGroupName) {
-        apexForwarderParameters = ParameterService.get(parameterGroupName);
-        engineServiceFacade =
-                new EngineServiceFacade(apexForwarderParameters.getHostname(), apexForwarderParameters.getPort());
-
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public void forward(final Collection<ToscaEntity> policies) throws PolicyForwardingException {
-        if (policies.isEmpty()) {
-            final String message = "No apex policy to be forwarded to an apex engine";
-            LOGGER.debug(message);
-            throw new PolicyForwardingException(message);
-        } else if (policies.size() > 1) {
-            final String message = "More than one apex policy cannot be forwarded to an apex engine";
-            LOGGER.debug(message);
-            throw new PolicyForwardingException(message);
-        } else {
-            final ToscaEntity policy = (ToscaEntity) policies.toArray()[0];
-            if (policy instanceof ToscaPolicy) {
-                final ToscaPolicy toscaPolicy = (ToscaPolicy) policy;
-                if (POLICY_TYPE.equalsIgnoreCase(toscaPolicy.getType())) {
-                    forwardPolicy(toscaPolicy);
-                } else {
-                    final String message = "Ignoring the policy as it is not an apex-pdp policy";
-                    LOGGER.debug(message);
-                    throw new PolicyForwardingException(message);
-                }
-            } else {
-                final String message = "Ignoring the policy as it is not of type ToscaPolicy";
-                LOGGER.debug(message);
-                throw new PolicyForwardingException(message);
-            }
-        }
-    }
-
-    /**
-     * Method to forward a given policy to apex-pdp.
-     *
-     * @param apexPolicy the apex policy
-     * @throws PolicyForwardingException if any exception occurs while forwarding policy
-     */
-    private void forwardPolicy(final ToscaPolicy apexPolicy) throws PolicyForwardingException {
-        try {
-            engineServiceFacade.init();
-            final InputStream policyInputStream = IOUtils.toInputStream(apexPolicy.toString(), "UTF-8");
-            engineServiceFacade.deployModel(apexPolicy.getName(), policyInputStream,
-                    apexForwarderParameters.isIgnoreConflicts(), apexForwarderParameters.isForceUpdate());
-
-            LOGGER.debug("Sucessfully forwarded the policy to apex-pdp egine at {}:{}",
-                    apexForwarderParameters.getHostname(), apexForwarderParameters.getPort());
-
-        } catch (final ApexException | IOException exp) {
-            final String message = "Error sending policy to apex-pdp engine at" + apexForwarderParameters.getHostname()
-                    + ":" + apexForwarderParameters.getPort();
-            LOGGER.error(message, exp);
-            throw new PolicyForwardingException(message, exp);
-        }
-    }
-}
-
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderParameterGroup.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderParameterGroup.java
deleted file mode 100644
index 77c98a2d..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderParameterGroup.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property.
- *  Modifications 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.forwarding.apex.pdp;
-
-import lombok.Getter;
-
-import org.onap.policy.common.parameters.annotations.Min;
-import org.onap.policy.common.parameters.annotations.NotBlank;
-import org.onap.policy.common.parameters.annotations.NotNull;
-import org.onap.policy.distribution.main.parameters.PolicyForwarderConfigurationParameterGroup;
-
-/**
- * Holds the parameters for the{@link ApexPdpPolicyForwarder}.
- */
-@Getter
-@NotNull
-@NotBlank
-public class ApexPdpPolicyForwarderParameterGroup extends PolicyForwarderConfigurationParameterGroup {
-    public static final String POLICY_FORWARDER_PLUGIN_CLASS = ApexPdpPolicyForwarder.class.getName();
-
-    private String hostname;
-    @Min(value = 1)
-    private int port;
-    private boolean ignoreConflicts;
-    private boolean forceUpdate;
-
-    public ApexPdpPolicyForwarderParameterGroup() {
-        super(ApexPdpPolicyForwarderParameterGroup.class.getSimpleName());
-    }
-}
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyAdapter.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyAdapter.java
deleted file mode 100644
index 613a406f..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. 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.forwarding.xacml.pdp;
-
-import org.onap.policy.api.PolicyParameters;
-import org.onap.policy.api.PushPolicyParameters;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-
-/**
- * Adapts {@link ToscaPolicy} objects to objects compatible with the XACML PDP API.
- */
-public interface XacmlPdpPolicyAdapter<T extends ToscaPolicy> {
-
-    /**
-     * Get the policy.
-     *
-     * @return the policy
-     */
-    T getPolicy();
-
-    /**
-     * Get as a {@link PolicyParameters} object.
-     *
-     * @returna {@link PolicyParameters} object
-     */
-    PolicyParameters getAsPolicyParameters();
-
-    /**
-     * Get as a {@link PushPolicyParameters} object.
-     *
-     * @returna {@link PushPolicyParameters} object
-     */
-    PushPolicyParameters getAsPushPolicyParameters(final String pdpGroups);
-
-}
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarder.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarder.java
deleted file mode 100644
index 8eeeda7e..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarder.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Copyright (C) 2019 Intel Corp. All rights reserved.
- *  Modifications Copyright (C) 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.forwarding.xacml.pdp;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.onap.policy.api.PolicyParameters;
-import org.onap.policy.api.PushPolicyParameters;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
-import org.onap.policy.common.endpoints.http.client.HttpClient;
-import org.onap.policy.common.endpoints.http.client.HttpClientConfigException;
-import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
-import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.distribution.forwarding.PolicyForwarder;
-import org.onap.policy.distribution.forwarding.xacml.pdp.adapters.XacmlPdpOptimizationPolicyAdapter;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-
-/**
- * Forwards policies to the XACML PDP.
- */
-public class XacmlPdpPolicyForwarder implements PolicyForwarder {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpPolicyForwarder.class);
-    private static final String BASE_PATH = "pdp/api/";
-
-    private XacmlPdpPolicyForwarderParameterGroup configurationParameters = null;
-
-
-    @Override
-    public void forward(final Collection<ToscaEntity> policies) {
-        for (final ToscaEntity policy : policies) {
-            forward(policy);
-        }
-    }
-
-    private void forward(final ToscaEntity policy) {
-        final XacmlPdpPolicyAdapter<?> policyAdapter = getXacmlPdpPolicyAdapter(policy);
-
-        if (policyAdapter == null) {
-            LOGGER.error("Cannot forward policy {}. Unsupported policy type {}", policy,
-                    policy.getClass().getSimpleName());
-            return;
-        }
-
-        final boolean policyCreated = createPolicy(policyAdapter);
-        if (policyCreated) {
-            pushPolicy(policyAdapter);
-        }
-    }
-
-    private XacmlPdpPolicyAdapter<?> getXacmlPdpPolicyAdapter(final ToscaEntity policy) {
-        if (policy instanceof ToscaPolicy) {
-            return new XacmlPdpOptimizationPolicyAdapter((ToscaPolicy) policy);
-        }
-        return null;
-    }
-
-    private boolean createPolicy(final XacmlPdpPolicyAdapter<?> policyAdapter) {
-        final PolicyParameters policyParameters = policyAdapter.getAsPolicyParameters();
-        final Entity<PolicyParameters> entity = Entity.entity(policyParameters, MediaType.APPLICATION_JSON);
-
-        return invokeHttpClient(entity, "createPolicy", policyAdapter.getPolicy().getName());
-    }
-
-    private boolean pushPolicy(final XacmlPdpPolicyAdapter<?> policyAdapter) {
-        final PushPolicyParameters pushPolicyParameters =
-                policyAdapter.getAsPushPolicyParameters(configurationParameters.getPdpGroup());
-        final Entity<PushPolicyParameters> entity = Entity.entity(pushPolicyParameters, MediaType.APPLICATION_JSON);
-
-        return invokeHttpClient(entity, "pushPolicy", policyAdapter.getPolicy().getName());
-    }
-
-    private boolean invokeHttpClient(final Entity<?> entity, final String method, final String policyName) {
-
-        try {
-            final Response response = getHttpClient().put(method, entity,
-                    Collections.singletonMap("ClientAuth", configurationParameters.getClientAuth()));
-
-            if (response.getStatus() != HttpStatus.OK.value()) {
-                LOGGER.error(
-                        "Invocation of method {} failed for policy {}. Response status: {}, Response status info: {}",
-                        method, policyName, response.getStatus(), response.getStatusInfo());
-                return false;
-            }
-        } catch (final HttpClientConfigException exception) {
-            LOGGER.error("Invocation of method " + method + " failed for policy " + policyName
-                    + " due to error opening Http client", exception);
-            return false;
-        }
-        return true;
-    }
-
-    private HttpClient getHttpClient() throws HttpClientConfigException {
-        final boolean useHttps = configurationParameters.isUseHttps();
-        final String hostname = configurationParameters.getHostname();
-        final int port = configurationParameters.getPort();
-        final String userName = configurationParameters.getUserName();
-        final String password = configurationParameters.getPassword();
-        final boolean managed = configurationParameters.isManaged();
-        final BusTopicParams params =
-                BusTopicParams.builder().clientName("SDC Dist").useHttps(useHttps).hostname(hostname).port(port)
-                        .userName(userName).password(password).basePath(BASE_PATH).managed(managed).build();
-        return getHttpClientFactory().build(params);
-    }
-
-    @Override
-    public void configure(final String parameterGroupName) {
-        configurationParameters = ParameterService.get(parameterGroupName);
-    }
-
-    // these may be overridden by junit tests
-
-    protected HttpClientFactory getHttpClientFactory() {
-        return HttpClientFactoryInstance.getClientFactory();
-    }
-}
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java
deleted file mode 100644
index 4ce35f20..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property.
- *  Modifications 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.forwarding.xacml.pdp;
-
-import lombok.Getter;
-
-import org.onap.policy.common.parameters.annotations.Min;
-import org.onap.policy.common.parameters.annotations.NotBlank;
-import org.onap.policy.common.parameters.annotations.NotNull;
-import org.onap.policy.distribution.main.parameters.PolicyForwarderConfigurationParameterGroup;
-
-/**
- * Holds the parameters for the{@link XacmlPdpPolicyForwarder}.
- */
-@Getter
-@NotNull
-@NotBlank
-public class XacmlPdpPolicyForwarderParameterGroup extends PolicyForwarderConfigurationParameterGroup {
-    public static final String POLICY_FORWARDER_PLUGIN_CLASS = XacmlPdpPolicyForwarder.class.getName();
-
-    private boolean useHttps;
-    private String hostname;
-    @Min(value = 1)
-    private int port;
-    private String userName;
-    private String password;
-    private String clientAuth;
-    private boolean isManaged;
-    private String pdpGroup;
-
-    public XacmlPdpPolicyForwarderParameterGroup() {
-        super(XacmlPdpPolicyForwarderParameterGroup.class.getSimpleName());
-    }
-}
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/adapters/AbstractXacmlPdpPolicyAdapter.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/adapters/AbstractXacmlPdpPolicyAdapter.java
deleted file mode 100644
index f978d3a9..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/adapters/AbstractXacmlPdpPolicyAdapter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. 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.forwarding.xacml.pdp.adapters;
-
-import org.onap.policy.api.PushPolicyParameters;
-import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyAdapter;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-
-/**
- * Base class for {@link XacmlPdpPolicyAdapter} implementations.
- *
- * @param <T> the type of policy the adapter handles
- */
-public abstract class AbstractXacmlPdpPolicyAdapter<T extends ToscaPolicy> implements XacmlPdpPolicyAdapter<T> {
-
-    private T policy;
-
-    protected AbstractXacmlPdpPolicyAdapter(final T policy) {
-        this.policy = policy;
-    }
-
-    @Override
-    public T getPolicy() {
-        return policy;
-    }
-
-    @Override
-    public PushPolicyParameters getAsPushPolicyParameters(final String pdpGroups) {
-        final PushPolicyParameters pushPolicyParameters = new PushPolicyParameters();
-        pushPolicyParameters.setPolicyName(policy.getName());
-        pushPolicyParameters.setPolicyType(policy.getType());
-        pushPolicyParameters.setPdpGroup(pdpGroups);
-        return pushPolicyParameters;
-    }
-
-}
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/adapters/XacmlPdpOptimizationPolicyAdapter.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/adapters/XacmlPdpOptimizationPolicyAdapter.java
deleted file mode 100644
index c9633b15..00000000
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/adapters/XacmlPdpOptimizationPolicyAdapter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. 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.forwarding.xacml.pdp.adapters;
-
-import org.onap.policy.api.PolicyParameters;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-
-/**
- * Adapts {@link ToscaPolicy} objects to objects compatible with the XACML PDP API.
- */
-public class XacmlPdpOptimizationPolicyAdapter extends AbstractXacmlPdpPolicyAdapter<ToscaPolicy> {
-
-    /**
-     * Create an instance to adapt the given {@link ToscaPolicy}.
-     *
-     * @param optimizationPolicy the {@link ToscaPolicy} to be adapted
-     */
-    public XacmlPdpOptimizationPolicyAdapter(final ToscaPolicy optimizationPolicy) {
-        super(optimizationPolicy);
-    }
-
-    @Override
-    public PolicyParameters getAsPolicyParameters() {
-        final PolicyParameters policyParameters = new PolicyParameters();
-        policyParameters.setPolicyName(getPolicy().getName());
-        return policyParameters;
-    }
-
-}
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderParameterGroupTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderParameterGroupTest.java
deleted file mode 100644
index fc0fe3db..00000000
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderParameterGroupTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications 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.forwarding.apex.pdp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
-
-/**
- * Class to perform unit test of {@link ApexPdpPolicyForwarderParameterGroup}.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
- */
-public class ApexPdpPolicyForwarderParameterGroupTest {
-
-    @Test
-    public void testValidParameters() {
-        final ApexPdpPolicyForwarderParameterGroup configurationParameters = CommonTestData
-                .getPolicyForwarderParameters("src/test/resources/parameters/ApexPdpPolicyForwarderParameters.json",
-                        ApexPdpPolicyForwarderParameterGroup.class);
-        assertEquals(ApexPdpPolicyForwarderParameterGroup.class.getSimpleName(), configurationParameters.getName());
-        assertTrue(configurationParameters.isForceUpdate());
-        assertEquals("10.10.10.10", configurationParameters.getHostname());
-        assertEquals(1234, configurationParameters.getPort());
-        assertFalse(configurationParameters.isIgnoreConflicts());
-        assertEquals(ValidationStatus.CLEAN, configurationParameters.validate().getStatus());
-    }
-
-    @Test
-    public void testInvalidParameters() {
-        final ApexPdpPolicyForwarderParameterGroup configurationParameters =
-                CommonTestData.getPolicyForwarderParameters(
-                        "src/test/resources/parameters/ApexPdpPolicyForwarderParametersInvalid.json",
-                        ApexPdpPolicyForwarderParameterGroup.class);
-
-        assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus());
-    }
-
-    @Test
-    public void testEmptyParameters() {
-        final ApexPdpPolicyForwarderParameterGroup configurationParameters =
-                CommonTestData.getPolicyForwarderParameters("src/test/resources/parameters/EmptyParameters.json",
-                        ApexPdpPolicyForwarderParameterGroup.class);
-
-        assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus());
-    }
-}
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java
deleted file mode 100644
index 7d6743e1..00000000
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications 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.forwarding.apex.pdp;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.policy.apex.core.deployment.EngineServiceFacade;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.common.parameters.ParameterGroup;
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.distribution.forwarding.PolicyForwardingException;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-
-/**
- * Class to perform unit test of {@link ApexPdpPolicyForwarder}.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ApexPdpPolicyForwarderTest {
-
-    private static final boolean IGNORE_CONFLICTS = false;
-    private static final boolean FORCE_UPDATE = true;
-    private static final String GROUP_NAME = "apexPdpConfiguration";
-
-    @Mock
-    EngineServiceFacade engineServiceFacade;
-
-    /**
-     * Set up.
-     */
-    @BeforeClass
-    public static void setUp() {
-        final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters(
-                "src/test/resources/parameters/ApexPdpPolicyForwarderParameters.json",
-                ApexPdpPolicyForwarderParameterGroup.class);
-
-        parameterGroup.setName(GROUP_NAME);
-        ParameterService.register(parameterGroup);
-    }
-
-    /**
-     * Tear down.
-     */
-    @AfterClass
-    public static void tearDown() {
-        ParameterService.deregister(GROUP_NAME);
-    }
-
-    @Test
-    public void testForwardPolicy() throws ApexException, FileNotFoundException, IOException, PolicyForwardingException,
-            NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ApexPdpPolicyForwarder forwarder = new ApexPdpPolicyForwarder();
-        forwarder.configure(GROUP_NAME);
-
-        final Field forwarderField = forwarder.getClass().getDeclaredField("engineServiceFacade");
-        forwarderField.setAccessible(true);
-        forwarderField.set(forwarder, engineServiceFacade);
-
-        createPolicy(policies, "policy", "APEX", "Sample Policy of apex");
-
-        try {
-            forwarder.forward(policies);
-            verify(engineServiceFacade, times(1)).init();
-            verify(engineServiceFacade, times(1)).deployModel(eq("policy"), anyObject(), eq(IGNORE_CONFLICTS),
-                    eq(FORCE_UPDATE));
-        } catch (final Exception exp) {
-            fail("Test must not throw an exception");
-        }
-    }
-
-    @Test
-    public void testForwardPolicyError()
-            throws ApexException, FileNotFoundException, IOException, PolicyForwardingException, NoSuchFieldException,
-            SecurityException, IllegalArgumentException, IllegalAccessException {
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ApexPdpPolicyForwarder forwarder = new ApexPdpPolicyForwarder();
-        forwarder.configure(GROUP_NAME);
-
-        Mockito.doThrow(new ApexException("Failed")).when(engineServiceFacade).deployModel(eq("policy1"), anyObject(),
-                eq(IGNORE_CONFLICTS), eq(FORCE_UPDATE));
-
-        final Field decodersField = forwarder.getClass().getDeclaredField("engineServiceFacade");
-        decodersField.setAccessible(true);
-        decodersField.set(forwarder, engineServiceFacade);
-
-        createPolicy(policies, "policy1", "APEX", "Sample Policy of apex");
-
-        try {
-            forwarder.forward(policies);
-            fail("Test must throw an exception");
-        } catch (final Exception exp) {
-            assertTrue(exp.getMessage().contains("Error sending policy to apex-pdp engine"));
-        }
-
-    }
-
-    @Test
-    public void testForwardMoreThanOnePolicy()
-            throws ApexException, FileNotFoundException, IOException, PolicyForwardingException, NoSuchFieldException,
-            SecurityException, IllegalArgumentException, IllegalAccessException {
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ApexPdpPolicyForwarder forwarder = new ApexPdpPolicyForwarder();
-        forwarder.configure(GROUP_NAME);
-
-        final Field forwarderField = forwarder.getClass().getDeclaredField("engineServiceFacade");
-        forwarderField.setAccessible(true);
-        forwarderField.set(forwarder, engineServiceFacade);
-
-        createPolicy(policies, "policy1", "APEX", "Sample Policy of apex");
-        createPolicy(policies, "policy2", "APEX", "Sample Policy of apex");
-
-        try {
-            forwarder.forward(policies);
-            fail("Test must throw an exception");
-        } catch (final Exception exp) {
-            assertTrue(exp.getMessage().contains("More than one apex policy cannot be forwarded to an apex engine"));
-        }
-    }
-
-    @Test
-    public void testForwardUnsupportedPolicy()
-            throws ApexException, FileNotFoundException, IOException, PolicyForwardingException, NoSuchFieldException,
-            SecurityException, IllegalArgumentException, IllegalAccessException {
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ApexPdpPolicyForwarder forwarder = new ApexPdpPolicyForwarder();
-        forwarder.configure(GROUP_NAME);
-
-        final Field forwarderField = forwarder.getClass().getDeclaredField("engineServiceFacade");
-        forwarderField.setAccessible(true);
-        forwarderField.set(forwarder, engineServiceFacade);
-
-        final ToscaEntity policy = new UnsupportedPolicy();
-        policies.add(policy);
-
-        try {
-            forwarder.forward(policies);
-            fail("Test must throw an exception");
-        } catch (final Exception exp) {
-            assertTrue(exp.getMessage().contains("Ignoring the policy as it is not of type ToscaPolicy"));
-        }
-    }
-
-    class UnsupportedPolicy extends ToscaEntity {
-
-        @Override
-        public String getName() {
-            return "unsupported";
-        }
-    }
-
-    private void createPolicy(final Collection<ToscaEntity> policies, final String name, final String type,
-            final String description) {
-        final ToscaPolicy policy = new ToscaPolicy();
-        policy.setName(name);
-        policy.setType(type);
-        policy.setDescription(description);
-        policies.add(policy);
-    }
-}
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
index fd8422d6..0f010bfc 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
+import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
 
 /**
  * Class to perform unit test of {@link LifecycleApiForwarderParameters}.
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
index 4d837cdf..7d84657a 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
@@ -35,8 +35,8 @@ import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.common.utils.network.NetworkUtil;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.distribution.forwarding.PolicyForwardingException;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.LifecycleApiSimulatorMain;
+import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
+import org.onap.policy.distribution.forwarding.testclasses.LifecycleApiSimulatorMain;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/CommonTestData.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java
index 386526e5..9da1b613 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/CommonTestData.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.forwarding.xacml.pdp.testclasses;
+package org.onap.policy.distribution.forwarding.testclasses;
 
 import java.io.File;
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyDecoder.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/DummyDecoder.java
index f2fb144a..b40aabf8 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyDecoder.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/DummyDecoder.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.forwarding.xacml.pdp.testclasses;
+package org.onap.policy.distribution.forwarding.testclasses;
 
 import java.util.Collection;
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/DummyReceptionHandler.java
index f9bde3c3..b3cf489c 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/DummyReceptionHandler.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.forwarding.xacml.pdp.testclasses;
+package org.onap.policy.distribution.forwarding.testclasses;
 
 import org.onap.policy.distribution.reception.handling.AbstractReceptionHandler;
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/LifecycleApiSimulatorMain.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycleApiSimulatorMain.java
index 9aa68876..07c4b6c6 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/LifecycleApiSimulatorMain.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycleApiSimulatorMain.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.forwarding.xacml.pdp.testclasses;
+package org.onap.policy.distribution.forwarding.testclasses;
 
 import org.onap.policy.common.endpoints.http.server.RestServer;
 import org.onap.policy.common.endpoints.parameters.RestServerParameters;
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/LifecycycleApiSimulatorEndpoint.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java
index f07605f0..4d7d2600 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/LifecycycleApiSimulatorEndpoint.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.forwarding.xacml.pdp.testclasses;
+package org.onap.policy.distribution.forwarding.testclasses;
 
 import io.swagger.annotations.ApiParam;
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderParameterGroupTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderParameterGroupTest.java
deleted file mode 100644
index 6e98b225..00000000
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderParameterGroupTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications 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.forwarding.xacml.pdp.engine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarderParameterGroup;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
-
-public class XacmlPdpPolicyForwarderParameterGroupTest {
-
-    private static final String CLIENT_AUTH = "myClientAuth";
-    private static final String PASSWORD = "myPassword";
-    private static final String USER = "myUser";
-    private static final int PORT = 1234;
-    private static final String HOST_NAME = "10.10.10.10";
-
-    @Test
-    public void testValidParameters() {
-        final XacmlPdpPolicyForwarderParameterGroup configurationParameters = CommonTestData
-                .getPolicyForwarderParameters("src/test/resources/parameters/XacmlPdpPolicyForwarderParameters.json",
-                        XacmlPdpPolicyForwarderParameterGroup.class);
-
-        assertTrue(configurationParameters.isUseHttps());
-        assertEquals(HOST_NAME, configurationParameters.getHostname());
-        assertEquals(PORT, configurationParameters.getPort());
-        assertEquals(USER, configurationParameters.getUserName());
-        assertEquals(PASSWORD, configurationParameters.getPassword());
-        assertEquals(CLIENT_AUTH, configurationParameters.getClientAuth());
-        assertFalse(configurationParameters.isManaged());
-    }
-
-    @Test
-    public void testInvalidParameters() {
-        final XacmlPdpPolicyForwarderParameterGroup configurationParameters =
-                CommonTestData.getPolicyForwarderParameters(
-                        "src/test/resources/parameters/XacmlPdpPolicyForwarderParametersInvalid.json",
-                        XacmlPdpPolicyForwarderParameterGroup.class);
-
-        assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus());
-    }
-
-    @Test
-    public void testEmptyParameters() {
-        final XacmlPdpPolicyForwarderParameterGroup configurationParameters =
-                CommonTestData.getPolicyForwarderParameters("src/test/resources/parameters/EmptyParameters.json",
-                        XacmlPdpPolicyForwarderParameterGroup.class);
-
-        assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus());
-    }
-}
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
deleted file mode 100644
index 222614d9..00000000
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
- *  Modifications 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.forwarding.xacml.pdp.engine;
-
-import static org.junit.Assert.assertSame;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Response;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.ArgumentMatcher;
-import org.onap.policy.api.PolicyParameters;
-import org.onap.policy.api.PushPolicyParameters;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
-import org.onap.policy.common.endpoints.http.client.HttpClient;
-import org.onap.policy.common.endpoints.http.client.HttpClientConfigException;
-import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
-import org.onap.policy.common.parameters.ParameterGroup;
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarder;
-import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarderParameterGroup;
-import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-
-public class XacmlPdpPolicyForwarderTest {
-
-    private static final BusTopicParams BUS_TOPIC_PARAMS = BusTopicParams.builder().useHttps(true)
-            .hostname("10.10.10.10").port(1234).userName("myUser").password("myPassword").managed(false).build();
-    private static final String CLIENT_AUTH = "ClientAuth";
-    private static final String CLIENT_AUTH_VALUE = "myClientAuth";
-    private static final String PDP_GROUP_VALUE = "myPdpGroup";
-    private HashMap<String, Object> headers = new HashMap<>();
-    private BusTopicParamsMatcher matcher = new BusTopicParamsMatcher(BUS_TOPIC_PARAMS);
-
-    /**
-     * Set up.
-     */
-    @BeforeClass
-    public static void setUp() {
-        final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters(
-                "src/test/resources/parameters/XacmlPdpPolicyForwarderParameters.json",
-                XacmlPdpPolicyForwarderParameterGroup.class);
-        parameterGroup.setName("xacmlPdpConfiguration");
-        ParameterService.register(parameterGroup);
-    }
-
-    @Test
-    public void testForwardPolicy() throws Exception {
-
-        final HttpClient httpClientMock = mock(HttpClient.class);
-        headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE);
-        when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build());
-        when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.ok().build());
-
-        final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class);
-        when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock);
-
-        final XacmlPdpPolicyForwarder forwarder = new MyXacmlPdpPolicyForwarder(httpClientFactoryMock);
-        forwarder.configure("xacmlPdpConfiguration");
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-
-        final ToscaPolicy policy1 = createPolicy(policies, "policy1", "optimization");
-
-        final ToscaEntity policy2 = new UnsupportedPolicy();
-        policies.add(policy2);
-
-        final ToscaPolicy policy3 = createPolicy(policies, "policy3", "optimization");
-
-        forwarder.forward(policies);
-
-        verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy1)),
-                eq(headers));
-        verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy3)),
-                eq(headers));
-        verify(httpClientMock).put(eq("pushPolicy"), argThat(new PushPolicyParametersEntityMatcher(policy1)),
-                eq(headers));
-        verify(httpClientMock).put(eq("pushPolicy"), argThat(new PushPolicyParametersEntityMatcher(policy3)),
-                eq(headers));
-    }
-
-    @Test
-    public void testForwardPolicy_CreateFailsPushNotInvoked() throws Exception {
-
-        final HttpClient httpClientMock = mock(HttpClient.class);
-        headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE);
-        when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build());
-        when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.ok().build());
-
-        final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class);
-        when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock);
-
-        final XacmlPdpPolicyForwarder forwarder = new MyXacmlPdpPolicyForwarder(httpClientFactoryMock);
-        forwarder.configure("xacmlPdpConfiguration");
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ToscaPolicy policy = createPolicy(policies, "policy", "optimization");
-        forwarder.forward(policies);
-
-        verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy)), eq(headers));
-        verify(httpClientMock, times(0)).put(eq("pushPolicy"), any(), any());
-    }
-
-    @Test
-    public void testForwardPolicy_PushFails() throws Exception {
-
-        final HttpClient httpClientMock = mock(HttpClient.class);
-        headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE);
-        when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build());
-        when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build());
-
-        final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class);
-        when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock);
-
-        final XacmlPdpPolicyForwarder forwarder = new MyXacmlPdpPolicyForwarder(httpClientFactoryMock);
-        forwarder.configure("xacmlPdpConfiguration");
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ToscaPolicy policy = createPolicy(policies, "policy", "optimization");
-        forwarder.forward(policies);
-
-        verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy)), eq(headers));
-        verify(httpClientMock).put(eq("pushPolicy"), argThat(new PushPolicyParametersEntityMatcher(policy)),
-                eq(headers));
-    }
-
-    @Test
-    public void testForwardPolicy_HttpClientInitFailureForPolicyCreate() throws Exception {
-
-        final HttpClient httpClientMock = mock(HttpClient.class);
-        headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE);
-        when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build());
-        when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build());
-
-        final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class);
-        when(httpClientFactoryMock.build(argThat(matcher))).thenThrow(new HttpClientConfigException());
-
-        final XacmlPdpPolicyForwarder forwarder = new MyXacmlPdpPolicyForwarder(httpClientFactoryMock);
-        forwarder.configure("xacmlPdpConfiguration");
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ToscaPolicy policy = createPolicy(policies, "policy", "optimization");
-        forwarder.forward(policies);
-
-        assertSame(policy, policies.iterator().next());
-
-        verify(httpClientMock, times(0)).put(eq("createPolicy"), any(), any());
-        verify(httpClientMock, times(0)).put(eq("pushPolicy"), any(), any());
-    }
-
-    @Test
-    public void testForwardPolicy_HttpClientInitFailureForPolicyPush() throws Exception {
-
-        final HttpClient httpClientMock = mock(HttpClient.class);
-        headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE);
-        when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build());
-        when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build());
-
-        final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class);
-        when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock)
-                .thenThrow(new HttpClientConfigException());
-
-        final XacmlPdpPolicyForwarder forwarder = new MyXacmlPdpPolicyForwarder(httpClientFactoryMock);
-        forwarder.configure("xacmlPdpConfiguration");
-
-        final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ToscaPolicy policy = createPolicy(policies, "policy", "optimization");
-        forwarder.forward(policies);
-
-        verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy)), eq(headers));
-        verify(httpClientMock, times(0)).put(eq("pushPolicy"), any(), any());
-    }
-
-    class BusTopicParamsMatcher implements ArgumentMatcher<BusTopicParams> {
-
-        private BusTopicParams busTopicParams;
-
-        BusTopicParamsMatcher(final BusTopicParams busTopicParams) {
-            this.busTopicParams = busTopicParams;
-        }
-
-        @Override
-        public boolean matches(final BusTopicParams arg0) {
-            if (arg0 instanceof BusTopicParams) {
-                final BusTopicParams toCompareTo = (BusTopicParams) arg0;
-                return toCompareTo.isUseHttps() == busTopicParams.isUseHttps()
-                        && toCompareTo.getHostname().equals(busTopicParams.getHostname())
-                        && toCompareTo.getPort() == busTopicParams.getPort()
-                        && toCompareTo.getUserName().equals(busTopicParams.getUserName())
-                        && toCompareTo.getPassword().equals(busTopicParams.getPassword())
-                        && toCompareTo.isManaged() == busTopicParams.isManaged();
-            }
-            return false;
-        }
-    }
-
-    class PolicyParametersEntityMatcher implements ArgumentMatcher<Entity<PolicyParameters>> {
-
-        private ToscaPolicy policy;
-
-        PolicyParametersEntityMatcher(final ToscaPolicy policy) {
-            this.policy = policy;
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public boolean matches(final Entity<PolicyParameters> arg0) {
-            if (arg0 instanceof Entity) {
-                final PolicyParameters toCompareTo = ((Entity<PolicyParameters>) arg0).getEntity();
-                return toCompareTo.getPolicyName().equals(policy.getName());
-            }
-            return false;
-        }
-    }
-
-    class PushPolicyParametersEntityMatcher implements ArgumentMatcher<Entity<PushPolicyParameters>> {
-
-        private ToscaPolicy policy;
-
-        PushPolicyParametersEntityMatcher(final ToscaPolicy policy) {
-            this.policy = policy;
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public boolean matches(final Entity<PushPolicyParameters> arg0) {
-            if (arg0 instanceof Entity) {
-                final PushPolicyParameters toCompareTo = ((Entity<PushPolicyParameters>) arg0).getEntity();
-                return toCompareTo.getPolicyName().equals(policy.getName())
-                        && toCompareTo.getPolicyType().equals(policy.getType())
-                        && toCompareTo.getPdpGroup().equals(PDP_GROUP_VALUE);
-            }
-            return false;
-        }
-    }
-
-    class UnsupportedPolicy extends ToscaEntity {
-
-        @Override
-        public String getName() {
-            return "unsupported";
-        }
-    }
-
-    private class MyXacmlPdpPolicyForwarder extends XacmlPdpPolicyForwarder {
-        private HttpClientFactory factory;
-
-        public MyXacmlPdpPolicyForwarder(final HttpClientFactory httpClientFactory) {
-            this.factory = httpClientFactory;
-        }
-
-        @Override
-        protected HttpClientFactory getHttpClientFactory() {
-            return this.factory;
-        }
-    }
-
-    private ToscaPolicy createPolicy(final Collection<ToscaEntity> policies, final String name, final String type) {
-        final ToscaPolicy policy1 = new ToscaPolicy();
-        policy1.setName(name);
-        policy1.setType(type);
-        policies.add(policy1);
-        return policy1;
-    }
-}
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/Attribute.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/Attribute.java
index 9962894e..37f79f6b 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/Attribute.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/Attribute.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/Content.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/Content.java
index ef4584cb..a6e70bd9 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/Content.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/Content.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/Directive.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/Directive.java
index 6df5bc38..87889cc1 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/Directive.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/Directive.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/ExtractFromNode.java
index a7313876..0406020c 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/ExtractFromNode.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
@@ -61,13 +61,13 @@ public class ExtractFromNode {
     private static final String CPU_ARCHITECTURE_PATH = "virtual_cpu#cpu_architecture";
     private static final String MEMORY_PAGE_SIZE_PATH = "virtual_memory#vdu_mem_requirements#memoryPageSize";
     private static final String NETWORK_INTERFACE_TYPE_PATH =
-            "virtual_network_interface_requirements#network_interface_requirements#interfaceType";
+                    "virtual_network_interface_requirements#network_interface_requirements#interfaceType";
     private static final String NETWORK_PCI_PATH =
-            "virtual_network_interface_requirements#nic_io_requirements#logical_node_requirements";
+                    "virtual_network_interface_requirements#nic_io_requirements#logical_node_requirements";
     private static final String BASIC_CAPABILITIES_HPA_FEATURE = "basicCapabilities";
     private static final String HUGE_PAGES_HPA_FEATURE = "hugePages";
     private static final Map<String, String> NETWORK_HPA_FEATURE_MAP =
-            ImmutableMap.of("SR-IOV", "sriovNICNetwork", "PCI-Passthrough", "pciePassthrough");
+                    ImmutableMap.of("SR-IOV", "sriovNICNetwork", "PCI-Passthrough", "pciePassthrough");
     private static final Pattern PATTERN = Pattern.compile("(\\D*)(\\d+)(\\D*)");
     private ISdcCsarHelper sdcCsarHelper;
     final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().disableHtmlEscaping().create();
@@ -77,8 +77,8 @@ public class ExtractFromNode {
     }
 
     /**
-     * ExtractInfo from VNF , each VNF may includes more than one VDUs and CPs return new generated PdpxPolicy if it has
-     * got Hpa feature info or else return null.
+     * ExtractInfo from VNF , each VNF may includes more than one VDUs and CPs return new
+     * generated OptimizationPolicy if it has got Hpa feature info or else return null.
      *
      * @param node the NodeTemplate
      *
@@ -124,7 +124,8 @@ public class ExtractFromNode {
 
 
     /**
-     * ExtractInfofromVdu, supported hpa features, All under the capability of tosca.nodes.nfv.Vdu.Compute.
+     * ExtractInfofromVdu, supported hpa features, All under the capability of
+     * tosca.nodes.nfv.Vdu.Compute.
      *
      * @param lnodeVdu the list of Vdu node
      *
@@ -146,7 +147,7 @@ public class ExtractFromNode {
 
             final CapabilityAssignments capabilityAssignments = sdcCsarHelper.getCapabilitiesOf(node);
             final CapabilityAssignment capabilityAssignment =
-                    capabilityAssignments.getCapabilityByName("virtual_compute");
+                            capabilityAssignments.getCapabilityByName("virtual_compute");
             if (capabilityAssignment != null) {
                 generateBasicCapability(capabilityAssignment, flavorFeature);
                 generateHugePages(capabilityAssignment, flavorFeature);
@@ -156,21 +157,22 @@ public class ExtractFromNode {
     }
 
     /**
-     * GenerateBasicCapability, supported hpa features, All under the capability of tosca.nodes.nfv.Vdu.Compute.
+     * GenerateBasicCapability, supported hpa features, All under the capability of
+     * tosca.nodes.nfv.Vdu.Compute.
      *
      * @param capabilityAssignment represents the capability of node
      *
      * @param flavorFeature represents all the features of specified flavor
      */
     private void generateBasicCapability(final CapabilityAssignment capabilityAssignment,
-            final FlavorFeature flavorFeature) {
+                    final FlavorFeature flavorFeature) {
         // the format is xxx MB/GB like 4096 MB
         final String virtualMemSize =
-                sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, VIRTUAL_MEM_SIZE_PATH);
+                        sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, VIRTUAL_MEM_SIZE_PATH);
         if (virtualMemSize != null) {
             LOGGER.debug("the virtualMemSize = {}", virtualMemSize);
             final HpaFeatureAttribute hpaFeatureAttribute =
-                    generateHpaFeatureAttribute("virtualMemSize", virtualMemSize);
+                            generateHpaFeatureAttribute("virtualMemSize", virtualMemSize);
             final FlavorProperty flavorProperty = new FlavorProperty();
             flavorProperty.setHpaFeature(BASIC_CAPABILITIES_HPA_FEATURE);
             flavorProperty.getHpaFeatureAttributes().add(hpaFeatureAttribute);
@@ -179,12 +181,12 @@ public class ExtractFromNode {
 
         // the format is int like 2
         final String numVirtualCpu =
-                sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, NUM_VIRTUAL_CPU_PATH);
+                        sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, NUM_VIRTUAL_CPU_PATH);
         if (numVirtualCpu != null) {
             LOGGER.debug("the numVirtualCpu = {}", numVirtualCpu);
             final HpaFeatureAttribute hpaFeatureAttribute = generateHpaFeatureAttribute("numVirtualCpu", numVirtualCpu);
             final String cpuArchitecture =
-                    sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, CPU_ARCHITECTURE_PATH);
+                            sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, CPU_ARCHITECTURE_PATH);
             final FlavorProperty flavorProperty = new FlavorProperty();
             flavorProperty.setHpaFeature(BASIC_CAPABILITIES_HPA_FEATURE);
             if (cpuArchitecture != null) {
@@ -196,8 +198,9 @@ public class ExtractFromNode {
     }
 
     /**
-     * GenerateHpaFeatureAttribute based on the value of featureValue. the format: "hpa-attribute-key": "pciVendorId",
-     * "hpa-attribute-value": "1234", "operator": "=", "unit": "xxx".
+     * GenerateHpaFeatureAttribute based on the value of featureValue. the format:
+     * "hpa-attribute-key": "pciVendorId", "hpa-attribute-value": "1234", "operator": "=",
+     * "unit": "xxx".
      *
      * @param hpaAttributeKey get from the high layer tosca DM
      *
@@ -227,8 +230,9 @@ public class ExtractFromNode {
     }
 
     /**
-     * GenerateHugePages, supported hpa features, All under the capability of tosca.nodes.nfv.Vdu.Compute. The format is
-     * a map like: {"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true",
+     * GenerateHugePages, supported hpa features, All under the capability of
+     * tosca.nodes.nfv.Vdu.Compute. The format is a map like: {"schemaVersion": "0",
+     * "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true",
      * "configurationValue": "2 MB"}
      *
      * @param capabilityAssignment represents the capability of node
@@ -237,11 +241,11 @@ public class ExtractFromNode {
      */
     private void generateHugePages(final CapabilityAssignment capabilityAssignment, final FlavorFeature flavorFeature) {
         final String memoryPageSize =
-                sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, MEMORY_PAGE_SIZE_PATH);
+                        sdcCsarHelper.getCapabilityPropertyLeafValue(capabilityAssignment, MEMORY_PAGE_SIZE_PATH);
         LOGGER.debug("the memoryPageSize = {}", memoryPageSize);
         if (memoryPageSize != null) {
             final Map<String, String> retMap =
-                    gson.fromJson(memoryPageSize, new TypeToken<HashMap<String, String>>() {}.getType());
+                            gson.fromJson(memoryPageSize, new TypeToken<HashMap<String, String>>() {}.getType());
             LOGGER.debug("the retMap = {}", retMap);
             final String memoryPageSizeValue = retMap.get(CONFIGURATION_VALUE);
             final String mandatory = retMap.get("mandatory");
@@ -249,7 +253,7 @@ public class ExtractFromNode {
                 return;
             }
             final HpaFeatureAttribute hpaFeatureAttribute =
-                    generateHpaFeatureAttribute("memoryPageSize", memoryPageSizeValue);
+                            generateHpaFeatureAttribute("memoryPageSize", memoryPageSizeValue);
             final FlavorProperty flavorProperty = new FlavorProperty();
             flavorProperty.setHpaFeature(HUGE_PAGES_HPA_FEATURE);
             if (mandatory != null) {
@@ -261,8 +265,8 @@ public class ExtractFromNode {
     }
 
     /**
-     * ExtractInfoVduCp, supported hpa features, under the virtual_network_interface_requirements of
-     * tosca.nodes.nfv.VduCp.
+     * ExtractInfoVduCp, supported hpa features, under the
+     * virtual_network_interface_requirements of tosca.nodes.nfv.VduCp.
      *
      * @param lnodeVduCp the list of VduCp node
      *
@@ -270,7 +274,7 @@ public class ExtractFromNode {
      * @throws PolicyDecodingException if extract CP fails
      */
     public void extractInfoVduCp(final List<NodeTemplate> lnodeVduCp, final Content content)
-            throws PolicyDecodingException {
+                    throws PolicyDecodingException {
         // each CP will binds to a VDU so need the vdu flavor map info.
         final Map<String, FlavorFeature> vduFlavorMap = new HashMap<>();
         for (final FlavorFeature flavorFeature : content.getFlavorFeatures()) {
@@ -288,10 +292,10 @@ public class ExtractFromNode {
      * @throws PolicyDecodingException if any error occurs
      */
     private void parseNodeVduCp(final List<NodeTemplate> lnodeVduCp, final Map<String, FlavorFeature> vduFlavorMap)
-            throws PolicyDecodingException {
+                    throws PolicyDecodingException {
         for (final NodeTemplate node : lnodeVduCp) {
             final String interfaceType =
-                    sdcCsarHelper.getNodeTemplatePropertyLeafValue(node, NETWORK_INTERFACE_TYPE_PATH);
+                            sdcCsarHelper.getNodeTemplatePropertyLeafValue(node, NETWORK_INTERFACE_TYPE_PATH);
             LOGGER.debug("the interfaceType = {}", interfaceType);
             Map<String, Object> retMap = new HashMap<>();
             if (interfaceType != null) {
@@ -301,7 +305,7 @@ public class ExtractFromNode {
 
             String networkHpaFeature;
             if (retMap.containsKey(CONFIGURATION_VALUE)
-                    && NETWORK_HPA_FEATURE_MAP.containsKey(retMap.get(CONFIGURATION_VALUE).toString())) {
+                            && NETWORK_HPA_FEATURE_MAP.containsKey(retMap.get(CONFIGURATION_VALUE).toString())) {
                 final String interfaceTypeValue = retMap.get(CONFIGURATION_VALUE).toString();
                 networkHpaFeature = NETWORK_HPA_FEATURE_MAP.get(interfaceTypeValue);
                 LOGGER.debug(" the networkHpaFeature is = {}", networkHpaFeature);
@@ -311,7 +315,7 @@ public class ExtractFromNode {
             }
 
             final RequirementAssignments requriements =
-                    sdcCsarHelper.getRequirementsOf(node).getRequirementsByName("virtual_binding");
+                            sdcCsarHelper.getRequirementsOf(node).getRequirementsByName("virtual_binding");
             for (final RequirementAssignment requriement : requriements.getAll()) {
                 final String nodeTemplateName = requriement.getNodeTemplateName();
                 LOGGER.debug("getNodeTemplateName = {}", nodeTemplateName);
@@ -327,19 +331,19 @@ public class ExtractFromNode {
     }
 
     /**
-     * GenerateNetworkFeature, all pci feature are grouped into FlavorFeature together. The format is a map like:
-     * {"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true",
-     * "configurationValue": "2 MB"}
+     * GenerateNetworkFeature, all pci feature are grouped into FlavorFeature together.
+     * The format is a map like: {"schemaVersion": "0", "schemaSelector": "",
+     * "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}
      *
      * @param networkHpaFeature represents the specified Hpa feature
      * @param node represents the CP Node
      * @param flavorFeature represents all the features of specified flavor
      */
     private void generateNetworkFeature(final String networkHpaFeature, final NodeTemplate node,
-            final FlavorFeature flavorFeature) {
+                    final FlavorFeature flavorFeature) {
         final FlavorProperty flavorProperty = new FlavorProperty();
         flavorProperty.setHpaFeature(networkHpaFeature);
-        final String[] pciKeys = { "pciVendorId", "pciDeviceId", "pciNumDevices", "physicalNetwork" };
+        final String[] pciKeys = {"pciVendorId", "pciDeviceId", "pciNumDevices", "physicalNetwork"};
         for (final String pciKey : pciKeys) {
             LOGGER.debug("the pciKey = {}", pciKey);
             final String pciKeyPath = NETWORK_PCI_PATH + "#" + pciKey;
@@ -347,7 +351,7 @@ public class ExtractFromNode {
             if (pciValue != null) {
                 LOGGER.debug("the pciValue = {}", pciValue);
                 final Map<String, String> retMap =
-                        gson.fromJson(pciValue, new TypeToken<HashMap<String, String>>() {}.getType());
+                                gson.fromJson(pciValue, new TypeToken<HashMap<String, String>>() {}.getType());
                 final String pciConfigValue = retMap.get(CONFIGURATION_VALUE);
                 if (pciConfigValue == null) {
                     return;
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/FlavorFeature.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/FlavorFeature.java
index c29378de..75643a72 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/FlavorFeature.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/FlavorFeature.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/FlavorProperty.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/FlavorProperty.java
index 0453370d..f849ebaa 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/FlavorProperty.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/FlavorProperty.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/HpaFeatureAttribute.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/HpaFeatureAttribute.java
index 91008aa5..8bb078ad 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/HpaFeatureAttribute.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/HpaFeatureAttribute.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxLifecycleApi.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/PolicyDecoderCsarHpa.java
index 8cfc6857..e1e1a9a9 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxLifecycleApi.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/PolicyDecoderCsarHpa.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -26,17 +26,12 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.distribution.model.Csar;
 import org.onap.policy.distribution.model.PolicyInput;
 import org.onap.policy.distribution.reception.decoding.PolicyDecoder;
 import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntityKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
@@ -48,11 +43,10 @@ import org.slf4j.LoggerFactory;
 /**
  * Decodes PDP-X policies from a CSAR file and creates ToscaServiceTemplate for Policy Lifecycle API's.
  */
-public class PolicyDecoderCsarPdpxLifecycleApi implements PolicyDecoder<Csar, ToscaServiceTemplate> {
+public class PolicyDecoderCsarHpa implements PolicyDecoder<Csar, ToscaServiceTemplate> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PolicyDecoderCsarPdpxLifecycleApi.class);
-    private final StandardCoder coder = new StandardCoder();
-    private PolicyDecoderCsarPdpxLifecycleApiParameters decoderParameters;
+    private static final Logger LOGGER = LoggerFactory.getLogger(PolicyDecoderCsarHpa.class);
+    private PolicyDecoderCsarHpaParameters decoderParameters;
 
     public static final String TOSCA_POLICY_SCOPE = "scope";
     public static final String TOSCA_POLICY_SERVICES = "services";
@@ -118,9 +112,7 @@ public class PolicyDecoderCsarPdpxLifecycleApi implements PolicyDecoder<Csar, To
             final File csarFile = new File(csar.getCsarPath());
             sdcCsarHelper = factory.getSdcCsarHelper(csarFile.getAbsolutePath());
         } catch (final Exception exp) {
-            final String message = "Failed passing the csar file";
-            LOGGER.error(message, exp);
-            throw new PolicyDecodingException(message, exp);
+            throw new PolicyDecodingException( "Failed passing the csar file", exp);
         }
         return sdcCsarHelper;
     }
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxLifecycleApiParameters.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/PolicyDecoderCsarHpaParameters.java
index a66a53a8..7d26335c 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxLifecycleApiParameters.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/hpa/PolicyDecoderCsarHpaParameters.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import lombok.Getter;
 
@@ -28,12 +28,12 @@ import org.onap.policy.common.parameters.annotations.NotNull;
 import org.onap.policy.distribution.reception.parameters.PolicyDecoderConfigurationParameterGroup;
 
 /**
- * This class handles the parameters needed for {@link PolicyDecoderCsarPdpxLifecycleApi}.
+ * This class handles the parameters needed for {@link PolicyDecoderCsarHpa}.
  */
 @Getter
 @NotNull
 @NotBlank
-public class PolicyDecoderCsarPdpxLifecycleApiParameters extends PolicyDecoderConfigurationParameterGroup {
+public class PolicyDecoderCsarHpaParameters extends PolicyDecoderConfigurationParameterGroup {
 
     private String policyNamePrefix;
     private String onapName;
@@ -42,8 +42,8 @@ public class PolicyDecoderCsarPdpxLifecycleApiParameters extends PolicyDecoderCo
     private String riskType;
     private String riskLevel;
 
-    public PolicyDecoderCsarPdpxLifecycleApiParameters() {
-        super(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+    public PolicyDecoderCsarHpaParameters() {
+        super(PolicyDecoderCsarHpaParameters.class.getSimpleName());
     }
 }
 
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ConfigBody.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ConfigBody.java
deleted file mode 100644
index 521fcfd6..00000000
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ConfigBody.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. 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.pdpx;
-
-public class ConfigBody {
-
-    private String service;
-    private String policyName;
-    private String description;
-    private String templateVersion;
-    private String version;
-    private String priority;
-    private String riskType;
-    private String riskLevel;
-    private String guard;
-    private Content content;
-
-    public String getService() {
-        return service;
-    }
-
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    public String getPolicyName() {
-        return policyName;
-    }
-
-    public void setPolicyName(String policyName) {
-        this.policyName = policyName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getTemplateVersion() {
-        return templateVersion;
-    }
-
-    public void setTemplateVersion(String templateVersion) {
-        this.templateVersion = templateVersion;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getPriority() {
-        return priority;
-    }
-
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-
-    public String getRiskType() {
-        return riskType;
-    }
-
-    public void setRiskType(String riskType) {
-        this.riskType = riskType;
-    }
-
-    public String getRiskLevel() {
-        return riskLevel;
-    }
-
-    public void setRiskLevel(String riskLevel) {
-        this.riskLevel = riskLevel;
-    }
-
-    public String getGuard() {
-        return guard;
-    }
-
-    public void setGuard(String guard) {
-        this.guard = guard;
-    }
-
-    public Content getContent() {
-        return content;
-    }
-
-    public void setContent(Content content) {
-        this.content = content;
-    }
-}
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java
deleted file mode 100644
index e7a0e8ab..00000000
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. 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.pdpx;
-
-import org.onap.policy.distribution.model.Policy;
-import org.onap.policy.distribution.reception.decoding.PolicyDecoder;
-
-/**
- * A PDP-X Policy, decoded by a {@link PolicyDecoder}.
- */
-public class PdpxPolicy implements Policy {
-
-    private String guard;
-    private String service;
-    private String policyName;
-    private String description;
-    private String templateVersion;
-    private String version;
-    private String riskType;
-    private String priority;
-    private String riskLevel;
-    private Content content = new Content();
-
-    @Override
-    public String getPolicyName() {
-        return policyName;
-    }
-
-    @Override
-    public String getPolicyType() {
-        return content.getPolicyType();
-    }
-
-    public String getGuard() {
-        return guard;
-    }
-
-    public String getService() {
-        return service;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getTemplateVersion() {
-        return templateVersion;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public String getRiskType() {
-        return riskType;
-    }
-
-    public String getPriority() {
-        return priority;
-    }
-
-    public String getRiskLevel() {
-        return riskLevel;
-    }
-
-    public Content getContent() {
-        return content;
-    }
-
-    public void setGuard(final String guard) {
-        this.guard = guard;
-    }
-
-    public void setService(final String service) {
-        this.service = service;
-    }
-
-    public void setPolicyName(final String policyName) {
-        this.policyName = policyName;
-    }
-
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
-    public void setTemplateVersion(final String templateVersion) {
-        this.templateVersion = templateVersion;
-    }
-
-    public void setVersion(final String version) {
-        this.version = version;
-    }
-
-    public void setRiskType(final String riskType) {
-        this.riskType = riskType;
-    }
-
-    public void setPriority(final String priority) {
-        this.priority = priority;
-    }
-
-    public void setRiskLevel(final String riskLevel) {
-        this.riskLevel = riskLevel;
-    }
-
-    public void setContent(final Content content) {
-        this.content = content;
-    }
-}
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpx.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpx.java
deleted file mode 100644
index 842245c0..00000000
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpx.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  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.pdpx;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.distribution.model.Csar;
-import org.onap.policy.distribution.model.OptimizationPolicy;
-import org.onap.policy.distribution.model.PolicyInput;
-import org.onap.policy.distribution.reception.decoding.PolicyDecoder;
-import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
-import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.onap.sdc.toscaparser.api.NodeTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Decodes PDP-X policies from a CSAR file.
- */
-public class PolicyDecoderCsarPdpx implements PolicyDecoder<Csar, OptimizationPolicy> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PolicyDecoderCsarPdpx.class);
-    private final Gson gson = new GsonBuilder().serializeNulls().disableHtmlEscaping().create();
-    private PolicyDecoderCsarPdpxConfigurationParameterGroup decoderParameters;
-
-    @Override
-    public Collection<OptimizationPolicy> decode(final Csar csar) throws PolicyDecodingException {
-        final List<OptimizationPolicy> policies = new ArrayList<>();
-        final ISdcCsarHelper sdcCsarHelper = parseCsar(csar);
-        final List<NodeTemplate> lnodeVf = sdcCsarHelper.getServiceVfList();
-        LOGGER.debug("the size of Vf = {}", lnodeVf.size());
-        final ExtractFromNode extractFromNode = new ExtractFromNode();
-        extractFromNode.setSdcCsarHelper(sdcCsarHelper);
-        final String serviceName = sdcCsarHelper.getServiceMetadata().getValue("name");
-        LOGGER.debug("the name of the service = {}", serviceName);
-        for (final NodeTemplate node : lnodeVf) {
-            final Content content = extractFromNode.extractInfo(node);
-            if (content != null) {
-                final OptimizationPolicy policy = new OptimizationPolicy();
-                final String policyName = decoderParameters.getPolicyNamePrefix() + "." + content.getIdentity();
-                policy.setOnapName(decoderParameters.getOnapName());
-                policy.setName(policyName);
-                final ConfigBody configBody = new ConfigBody();
-                configBody.setService("hpaPolicy");
-                configBody.setPolicyName(policyName);
-                configBody.setDescription("OOF Policy");
-                configBody.setTemplateVersion("OpenSource.version.1");
-                configBody.setVersion(decoderParameters.getVersion());
-                configBody.setPriority(decoderParameters.getPriority());
-                configBody.setRiskLevel(decoderParameters.getRiskLevel());
-                configBody.setRiskType(decoderParameters.getRiskType());
-                configBody.setGuard("False");
-                content.setPolicyType("hpa");
-                content.getPolicyScope().add("HPA");
-                content.getPolicyScope().add(serviceName);
-                configBody.setContent(content);
-                policy.setConfigBody(gson.toJson(configBody));
-                policies.add(policy);
-            }
-        }
-        return policies;
-    }
-
-    @Override
-    public boolean canHandle(final PolicyInput policyInput) {
-        return policyInput.getClass().isAssignableFrom(Csar.class);
-    }
-
-    /**
-     * Parse the input Csar using SDC TOSCA parser.
-     *
-     * @param csar represents the service TOSCA Csar
-     * @return the object to represents the content of input csar
-     * @throws PolicyDecodingException if parse fails
-     */
-    public ISdcCsarHelper parseCsar(final Csar csar) throws PolicyDecodingException {
-        ISdcCsarHelper sdcCsarHelper;
-        try {
-            final SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
-            LOGGER.debug("Csar File Path = {}", csar.getCsarPath());
-            final File csarFile = new File(csar.getCsarPath());
-            sdcCsarHelper = factory.getSdcCsarHelper(csarFile.getAbsolutePath());
-        } catch (final Exception exp) {
-            final String message = "Failed passing the csar file";
-            LOGGER.error(message, exp);
-            throw new PolicyDecodingException(message, exp);
-        }
-        return sdcCsarHelper;
-    }
-
-    @Override
-    public void configure(final String parameterGroupName) {
-        decoderParameters = ParameterService.get(parameterGroupName);
-    }
-}
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxConfigurationParameterGroup.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxConfigurationParameterGroup.java
deleted file mode 100644
index f376c391..00000000
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PolicyDecoderCsarPdpxConfigurationParameterGroup.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications 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.pdpx;
-
-import lombok.Getter;
-
-import org.onap.policy.common.parameters.annotations.NotBlank;
-import org.onap.policy.common.parameters.annotations.NotNull;
-import org.onap.policy.distribution.reception.parameters.PolicyDecoderConfigurationParameterGroup;
-
-/**
- * This class handles reading, parsing and validating of the paramaters for the {@link PolicyDecoderCsarPdpx}.
- */
-@Getter
-@NotNull
-@NotBlank
-public class PolicyDecoderCsarPdpxConfigurationParameterGroup extends PolicyDecoderConfigurationParameterGroup {
-
-    private String policyNamePrefix;
-    private String onapName;
-    private String version;
-    private String priority;
-    private String riskType;
-    private String riskLevel;
-
-    public PolicyDecoderCsarPdpxConfigurationParameterGroup() {
-        super(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-    }
-}
-
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/CommonTestData.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/CommonTestData.java
index 5006e078..62a6ba4d 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/CommonTestData.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/CommonTestData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import java.io.File;
 
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestAttribute.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestAttribute.java
index 565f17d3..cf03ff30 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestAttribute.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestAttribute.java
@@ -18,11 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.policy.distribution.reception.decoding.hpa.Attribute;
 
 /**
  * Class to perform unit test for Attribute 0f {@link Attribute}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestContent.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestContent.java
index da77eefb..3770bc77 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestContent.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestContent.java
@@ -18,11 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.policy.distribution.reception.decoding.hpa.Content;
+import org.onap.policy.distribution.reception.decoding.hpa.FlavorFeature;
 
 /**
  * Class to perform unit test for Content 0f {@link Content}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestDirective.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestDirective.java
index cc8d946f..9ab53931 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestDirective.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestDirective.java
@@ -18,11 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.policy.distribution.reception.decoding.hpa.Attribute;
+import org.onap.policy.distribution.reception.decoding.hpa.Directive;
 
 /**
  * Class to perform unit test for Directive 0f {@link Directive}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestFlavorFeature.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorFeature.java
index e4de2759..47b74c71 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestFlavorFeature.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorFeature.java
@@ -18,11 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.policy.distribution.reception.decoding.hpa.Directive;
+import org.onap.policy.distribution.reception.decoding.hpa.FlavorFeature;
+import org.onap.policy.distribution.reception.decoding.hpa.FlavorProperty;
 
 /**
  * Class to perform unit test for FlavorFeature 0f {@link FlavorFeature}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestFlavorProperty.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorProperty.java
index da6c26fc..2d0504da 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestFlavorProperty.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestFlavorProperty.java
@@ -18,11 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.policy.distribution.reception.decoding.hpa.Directive;
+import org.onap.policy.distribution.reception.decoding.hpa.FlavorProperty;
+import org.onap.policy.distribution.reception.decoding.hpa.HpaFeatureAttribute;
 
 /**
  * Class to perform unit test for FlavorProperty 0f {@link FlavorProperty}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestHpaFeatureAttribute.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestHpaFeatureAttribute.java
index f2f514d0..fddeb168 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestHpaFeatureAttribute.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestHpaFeatureAttribute.java
@@ -18,11 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.policy.distribution.reception.decoding.hpa.HpaFeatureAttribute;
 
 /**
  * Class to perform unit test for HpaFeatureAttribute 0f {@link HpaFeatureAttribute}.
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxLifecycleApi.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpa.java
index 3b8339a9..552f430e 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxLifecycleApi.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpa.java
@@ -19,16 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+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.lang.String;
 import java.util.Collection;
 import java.util.Map;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -38,15 +36,14 @@ 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.distribution.reception.decoding.pdpx.PolicyDecoderCsarPdpxLifecycleApi;
 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 PolicyDecoderCsarPdpxLifecycleApiLifecycleApi}.
+ * Class to perform unit test of {@link PolicyDecoderCsarHpa}.
  */
-public class TestPolicyDecoderCsarPdpxLifecycleApi {
+public class TestPolicyDecoderCsarHpa {
 
     private final StandardCoder encoder = new StandardCoder();
 
@@ -56,9 +53,9 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
     @BeforeClass
     public static void setUp() {
         final ParameterGroup parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/PdpxPolicyDecoderParameters.json",
-                PolicyDecoderCsarPdpxLifecycleApiParameters.class);
-        parameterGroup.setName(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+                "src/test/resources/parameters/HpaPolicyDecoderParameters.json",
+                PolicyDecoderCsarHpaParameters.class);
+        parameterGroup.setName(PolicyDecoderCsarHpaParameters.class.getSimpleName());
         ParameterService.register(parameterGroup);
     }
 
@@ -67,25 +64,25 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
      */
     @AfterClass
     public static void tearDown() {
-        ParameterService.deregister(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        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 PolicyDecoderCsarPdpxLifecycleApi policyDecoderCsarPdpx = new PolicyDecoderCsarPdpxLifecycleApi();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
+        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
 
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarPdpx.decode(csar);
+        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(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_HPA_OOF);
+        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
         Map<String, Object> props = policy.getProperties();
         Object flavorFeatures =
-                      props.get(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_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\""));
@@ -102,17 +99,17 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
     @Test
     public void testHpaPolicySriov() throws IOException, PolicyDecodingException, CoderException {
         final Csar csar = new Csar("src/test/resources/hpaPolicySriov.csar");
-        final PolicyDecoderCsarPdpxLifecycleApi policyDecoderCsarPdpx = new PolicyDecoderCsarPdpxLifecycleApi();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
+        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
 
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarPdpx.decode(csar);
+        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(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_HPA_OOF);
+        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
         Map<String, Object> props = policy.getProperties();
         Object flavorFeatures =
-                      props.get(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_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\""));
@@ -140,18 +137,18 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
     @Test
     public void testHpaPolicyPciePassthrough() throws IOException, PolicyDecodingException, CoderException {
         final Csar csar = new Csar("src/test/resources/hpaPolicyPciePassthrough.csar");
-        final PolicyDecoderCsarPdpxLifecycleApi policyDecoderCsarPdpx = new PolicyDecoderCsarPdpxLifecycleApi();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
+        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
 
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarPdpx.decode(csar);
+        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(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_HPA_OOF);
+        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
         Map<String, Object> props = policy.getProperties();
         Object flavorFeatures =
-                      props.get(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_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\""));
@@ -179,18 +176,18 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
     @Test
     public void testHpaPolicyHugePage() throws IOException, PolicyDecodingException, CoderException {
         final Csar csar = new Csar("src/test/resources/hpaPolicyHugePage.csar");
-        final PolicyDecoderCsarPdpxLifecycleApi policyDecoderCsarPdpx = new PolicyDecoderCsarPdpxLifecycleApi();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
+        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
 
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarPdpx.decode(csar);
+        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(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_HPA_OOF);
+        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
         Map<String, Object> props = policy.getProperties();
         Object flavorFeatures =
-                      props.get(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_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\""));
@@ -210,18 +207,18 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
     @Test
     public void testS3p0PciVendorId() throws IOException, PolicyDecodingException, CoderException {
         final Csar csar = new Csar("src/test/resources/s3p_0_pciVendorId.csar");
-        final PolicyDecoderCsarPdpxLifecycleApi policyDecoderCsarPdpx = new PolicyDecoderCsarPdpxLifecycleApi();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
+        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
 
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarPdpx.decode(csar);
+        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(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_HPA_OOF);
+        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
         Map<String, Object> props = policy.getProperties();
         Object flavorFeatures =
-                      props.get(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_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\""));
@@ -241,18 +238,18 @@ public class TestPolicyDecoderCsarPdpxLifecycleApi {
     @Test
     public void testserviceVcpeWithAll() throws IOException, PolicyDecodingException, CoderException {
         final Csar csar = new Csar("src/test/resources/service-VcpeWithAll-csar.csar");
-        final PolicyDecoderCsarPdpxLifecycleApi policyDecoderCsarPdpx = new PolicyDecoderCsarPdpxLifecycleApi();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName());
+        final PolicyDecoderCsarHpa policyDecoderCsarHpa = new PolicyDecoderCsarHpa();
+        policyDecoderCsarHpa.configure(PolicyDecoderCsarHpaParameters.class.getSimpleName());
 
-        final Collection<ToscaServiceTemplate> entities = policyDecoderCsarPdpx.decode(csar);
+        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(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_HPA_OOF);
+        ToscaPolicy policy = map.get(PolicyDecoderCsarHpa.TOSCA_POLICY_HPA_OOF);
         Map<String, Object> props = policy.getProperties();
         Object flavorFeatures =
-                      props.get(PolicyDecoderCsarPdpxLifecycleApi.TOSCA_POLICY_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\""));
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxLifecycleApiParameters.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpaParameters.java
index 47971ad3..1ca9e1a1 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxLifecycleApiParameters.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/hpa/TestPolicyDecoderCsarHpaParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.distribution.reception.decoding.pdpx;
+package org.onap.policy.distribution.reception.decoding.hpa;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,17 +26,17 @@ import org.junit.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 
 /**
- * Class to perform unit test of {@link PolicyDecoderCsarPdpxLifecycleApiParameters}.
+ * Class to perform unit test of {@link PolicyDecoderCsarHpaParameters}.
  */
-public class TestPolicyDecoderCsarPdpxLifecycleApiParameters {
+public class TestPolicyDecoderCsarHpaParameters {
 
     @Test
     public void testValidParameters() {
-        final PolicyDecoderCsarPdpxLifecycleApiParameters parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/PdpxPolicyDecoderParameters.json",
-                PolicyDecoderCsarPdpxLifecycleApiParameters.class);
+        final PolicyDecoderCsarHpaParameters parameterGroup = CommonTestData.getPolicyDecoderParameters(
+                "src/test/resources/parameters/HpaPolicyDecoderParameters.json",
+                PolicyDecoderCsarHpaParameters.class);
 
-        assertEquals(PolicyDecoderCsarPdpxLifecycleApiParameters.class.getSimpleName(), parameterGroup.getName());
+        assertEquals(PolicyDecoderCsarHpaParameters.class.getSimpleName(), parameterGroup.getName());
         assertEquals("onapName", parameterGroup.getOnapName());
         assertEquals("OOF", parameterGroup.getPolicyNamePrefix());
         assertEquals("5", parameterGroup.getPriority());
@@ -48,18 +48,18 @@ public class TestPolicyDecoderCsarPdpxLifecycleApiParameters {
 
     @Test
     public void testInvalidParameters() {
-        final PolicyDecoderCsarPdpxLifecycleApiParameters parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/PdpxPolicyDecoderParametersInvalid.json",
-                PolicyDecoderCsarPdpxLifecycleApiParameters.class);
+        final PolicyDecoderCsarHpaParameters parameterGroup = CommonTestData.getPolicyDecoderParameters(
+                "src/test/resources/parameters/HpaPolicyDecoderParametersInvalid.json",
+                PolicyDecoderCsarHpaParameters.class);
 
         assertEquals(ValidationStatus.INVALID, parameterGroup.validate().getStatus());
     }
 
     @Test
     public void testEmptyParameters() {
-        final PolicyDecoderCsarPdpxLifecycleApiParameters configurationParameters =
+        final PolicyDecoderCsarHpaParameters configurationParameters =
                 CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json",
-                        PolicyDecoderCsarPdpxLifecycleApiParameters.class);
+                        PolicyDecoderCsarHpaParameters.class);
 
         assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus());
     }
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java
deleted file mode 100644
index 0eac8bf6..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications 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.pdpx;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Collection;
-
-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.distribution.model.Csar;
-import org.onap.policy.distribution.model.OptimizationPolicy;
-import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
-
-/**
- * Class to perform unit test of {@link PolicyDecoderCsarPdpx}.
- *
- */
-public class TestPolicyDecoderCsarPdpx {
-
-    /**
-     * Set up for test cases.
-     */
-    @BeforeClass
-    public static void setUp() {
-        final ParameterGroup parameterGroup = CommonTestData.getPolicyDecoderParameters(
-                "src/test/resources/parameters/PdpxPolicyDecoderParameters.json",
-                PolicyDecoderCsarPdpxConfigurationParameterGroup.class);
-        parameterGroup.setName(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-        ParameterService.register(parameterGroup);
-    }
-
-    /**
-     * Tear down.
-     */
-    @AfterClass
-    public static void tearDown() {
-        ParameterService.deregister(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-    }
-
-    @Test
-    public void testHpaPolicy2Vnf() throws IOException, PolicyDecodingException {
-        final Csar csar = new Csar("src/test/resources/service-TestNs8-csar.csar");
-        final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-
-        final Collection<OptimizationPolicy> ret = policyDecoderCsarPdpx.decode(csar);
-
-        assertEquals(2, ret.size());
-        final OptimizationPolicy policy = (OptimizationPolicy) ret.toArray()[0];
-
-        assertEquals("onapName", policy.getOnapName());
-        assertTrue(policy.getName().startsWith("OOF."));
-        assertTrue(policy.getConfigBody().contains("\"priority\":\"5\""));
-        assertTrue(policy.getConfigBody().contains("\"riskLevel\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"riskType\":\"Test\""));
-        assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
-        assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
-
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"basicCapabilities\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"True\""));
-        assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"virtualMemSize\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"MB\""));
-    }
-
-    @Test
-    public void testHpaPolicySriov() throws IOException, PolicyDecodingException {
-        final Csar csar = new Csar("src/test/resources/hpaPolicySriov.csar");
-        final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-
-        final Collection<OptimizationPolicy> policies = policyDecoderCsarPdpx.decode(csar);
-        final OptimizationPolicy policy = (OptimizationPolicy) policies.toArray()[0];
-
-        assertEquals("onapName", policy.getOnapName());
-        assertTrue(policy.getName().startsWith("OOF."));
-        assertTrue(policy.getConfigBody().contains("\"priority\":\"5\""));
-        assertTrue(policy.getConfigBody().contains("\"riskLevel\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"riskType\":\"Test\""));
-        assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
-        assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
-
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"sriovNICNetwork\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"True\""));
-        assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciDeviceId\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"5678\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciNumDevices\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"1\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-    }
-
-    @Test
-    public void testHpaPolicyPciePassthrough() throws IOException, PolicyDecodingException {
-        final Csar csar = new Csar("src/test/resources/hpaPolicyPciePassthrough.csar");
-        final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-
-        final Collection<OptimizationPolicy> policies = policyDecoderCsarPdpx.decode(csar);
-        assertEquals(2, policies.size());
-        final OptimizationPolicy policy = (OptimizationPolicy) policies.toArray()[0];
-
-        assertEquals("onapName", policy.getOnapName());
-        assertTrue(policy.getName().startsWith("OOF."));
-        assertTrue(policy.getConfigBody().contains("\"priority\":\"5\""));
-        assertTrue(policy.getConfigBody().contains("\"riskLevel\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"riskType\":\"Test\""));
-        assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
-        assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
-
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"pciePassthrough\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"True\""));
-        assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciDeviceId\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"5678\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciNumDevices\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"1\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-
-
-    }
-
-    @Test
-    public void testHpaPolicyHugePage() throws IOException, PolicyDecodingException {
-        final Csar csar = new Csar("src/test/resources/hpaPolicyHugePage.csar");
-        final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-
-        final Collection<OptimizationPolicy> policies = policyDecoderCsarPdpx.decode(csar);
-        assertEquals(2, policies.size());
-        final OptimizationPolicy policy = (OptimizationPolicy) policies.toArray()[0];
-
-        assertEquals("onapName", policy.getOnapName());
-        assertTrue(policy.getName().startsWith("OOF."));
-        assertTrue(policy.getConfigBody().contains("\"priority\":\"5\""));
-        assertTrue(policy.getConfigBody().contains("\"riskLevel\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"riskType\":\"Test\""));
-        assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
-        assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
-
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"hugePages\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"true\""));
-        assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"memoryPageSize\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"MB\""));
-    }
-
-    @Test
-    public void testS3p0PciVendorId() throws IOException, PolicyDecodingException {
-        final Csar csar = new Csar("src/test/resources/s3p_0_pciVendorId.csar");
-        final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-
-        final Collection<OptimizationPolicy> policies = policyDecoderCsarPdpx.decode(csar);
-        assertEquals(1, policies.size());
-        final OptimizationPolicy policy = (OptimizationPolicy) policies.toArray()[0];
-
-        assertEquals("onapName", policy.getOnapName());
-        assertTrue(policy.getName().startsWith("OOF."));
-        assertTrue(policy.getConfigBody().contains("\"priority\":\"5\""));
-        assertTrue(policy.getConfigBody().contains("\"riskLevel\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"riskType\":\"Test\""));
-        assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
-        assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
-
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"pciePassthrough\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"True\""));
-        assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-
-    }
-
-    @Test
-    public void testserviceVcpeWithAll() throws IOException, PolicyDecodingException {
-        final Csar csar = new Csar("src/test/resources/service-VcpeWithAll-csar.csar");
-        final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx();
-        policyDecoderCsarPdpx.configure(PolicyDecoderCsarPdpxConfigurationParameterGroup.class.getSimpleName());
-
-        final Collection<OptimizationPolicy> policies = policyDecoderCsarPdpx.decode(csar);
-        assertEquals(5, policies.size());
-        final OptimizationPolicy policy = (OptimizationPolicy) policies.toArray()[0];
-
-        assertEquals("onapName", policy.getOnapName());
-        assertTrue(policy.getName().startsWith("OOF."));
-        assertTrue(policy.getConfigBody().contains("\"priority\":\"5\""));
-        assertTrue(policy.getConfigBody().contains("\"riskLevel\":\"2\""));
-        assertTrue(policy.getConfigBody().contains("\"riskType\":\"Test\""));
-        assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
-        assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
-
-        assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
-        assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
-        assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"sriovNICNetwork\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"True\""));
-        assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"pciVendorId\""));
-        assertTrue(policy.getConfigBody().contains("\"hpa-attribute-value\":\"1234\""));
-        assertTrue(policy.getConfigBody().contains("\"operator\":\"=\""));
-        assertTrue(policy.getConfigBody().contains("\"unit\":\"\""));
-
-    }
-}
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxConfigurationParameterGroup.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxConfigurationParameterGroup.java
deleted file mode 100644
index d0de432a..00000000
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpxConfigurationParameterGroup.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications 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.pdpx;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.onap.policy.common.parameters.ValidationStatus;
-
-/**
- * Class to perform unit test of {@link PolicyDecoderCsarPdpxConfigurationParameterGroup}.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
- */
-public class TestPolicyDecoderCsarPdpxConfigurationParameterGroup {
-
-    @Test
-    public void testValidParameters() {
-        final PolicyDecoderCsarPdpxConfigurationParameterGroup parameterGroup = CommonTestData
-                .getPolicyDecoderParameters("src/test/resources/parameters/PdpxPolicyDecoderParameters.json",
-                        PolicyDecoderCsarPdpxConfigurationParameterGroup.class);
-
-        assertEquals(PolicyDecoderCsarPdpxConfigurationParameterGroup.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 PolicyDecoderCsarPdpxConfigurationParameterGroup parameterGroup = CommonTestData
-                .getPolicyDecoderParameters("src/test/resources/parameters/PdpxPolicyDecoderParametersInvalid.json",
-                        PolicyDecoderCsarPdpxConfigurationParameterGroup.class);
-
-        assertEquals(ValidationStatus.INVALID, parameterGroup.validate().getStatus());
-    }
-
-    @Test
-    public void testEmptyParameters() {
-        final PolicyDecoderCsarPdpxConfigurationParameterGroup configurationParameters =
-                CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json",
-                        PolicyDecoderCsarPdpxConfigurationParameterGroup.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 56ddc406..c3e69037 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.pdpx.CommonTestData;
+import org.onap.policy.distribution.reception.decoding.hpa.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 451e4f1b..d619671f 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
@@ -37,7 +37,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.distribution.model.Csar;
-import org.onap.policy.distribution.reception.decoding.pdpx.CommonTestData;
+import org.onap.policy.distribution.reception.decoding.hpa.CommonTestData;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 
 /**
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 30bcdf11..f5845de8 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
@@ -36,7 +36,7 @@ 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.pdpx.CommonTestData;
+import org.onap.policy.distribution.reception.decoding.hpa.CommonTestData;
 
 /**
  * Class to perform unit test of {@link SdcConfiguration}.
diff --git a/plugins/reception-plugins/src/test/resources/parameters/PdpxPolicyDecoderParameters.json b/plugins/reception-plugins/src/test/resources/parameters/HpaPolicyDecoderParameters.json
index 9f686632..9f686632 100644
--- a/plugins/reception-plugins/src/test/resources/parameters/PdpxPolicyDecoderParameters.json
+++ b/plugins/reception-plugins/src/test/resources/parameters/HpaPolicyDecoderParameters.json
diff --git a/plugins/reception-plugins/src/test/resources/parameters/PdpxPolicyDecoderParametersInvalid.json b/plugins/reception-plugins/src/test/resources/parameters/HpaPolicyDecoderParametersInvalid.json
index a716452e..a716452e 100644
--- a/plugins/reception-plugins/src/test/resources/parameters/PdpxPolicyDecoderParametersInvalid.json
+++ b/plugins/reception-plugins/src/test/resources/parameters/HpaPolicyDecoderParametersInvalid.json