Moving all files to root directory

Change-Id: Ica5535fd6ec85f350fe1640b42137b49f83f10f0
Signed-off-by: Patrick Brady <pb071s@att.com>

9 files changed, 1194 insertions, 0 deletions

diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/.gitignore b/appc-dg/appc-dg-shared/appc-dg-aai/.gitignore
new file mode 100644
index 000000000..b83d22266
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/.settings/org.eclipse.wst.common.project.facet.core.xml b/appc-dg/appc-dg-shared/appc-dg-aai/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 000000000..f4ef8aa0a
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+</faceted-project>
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
new file mode 100644
index 000000000..a1bdfbfcd
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.openecomp.appc</groupId>
+        <artifactId>appc-dg-shared</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>appc-dg-aai</artifactId>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.openecomp.appc</groupId>
+            <artifactId>appc-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.appc</groupId>
+            <artifactId>appc-dg-common</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdnc.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdnc.adaptors</groupId>
+            <artifactId>aai-service-provider</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.6.2</version>
+            <scope>test</scope>
+
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.6.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>appc-dg-aai</Bundle-SymbolicName>
+                        <Export-Package>org.openecomp.appc.dg.aai</Export-Package>
+                        <Private-Package>org.openecomp.appc.dg.aai.impl.*</Private-Package>
+                        <Import-Package>
+                            !org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*
+                        </Import-Package>
+                        <Embed-Dependency>
+                            appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false
+                        </Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java
new file mode 100644
index 000000000..e220182f2
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.dg.aai;
+
+import java.util.Map;
+
+import org.openecomp.appc.exceptions.APPCException;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+
+
+public interface AAIPlugin extends SvcLogicJavaPlugin {
+    void postGenericVnfData(Map<String, String> params, SvcLogicContext ctx) throws APPCException;
+
+    void getGenericVnfData(Map<String, String> params, SvcLogicContext ctx) throws APPCException;
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java
new file mode 100644
index 000000000..6eae559e8
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java
@@ -0,0 +1,122 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.dg.aai.impl;
+
+import org.openecomp.appc.dg.aai.AAIPlugin;
+import org.openecomp.appc.dg.aai.impl.Constants;
+import org.openecomp.appc.exceptions.APPCException;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.openecomp.sdnc.sli.aai.AAIClient;
+import org.openecomp.sdnc.sli.aai.AAIService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class AAIPluginImpl implements AAIPlugin {
+    private AAIClient aaiClient;
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(AAIPluginImpl.class);
+
+    public AAIPluginImpl() {
+        BundleContext bctx = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+        ServiceReference sref = bctx.getServiceReference(AAIService.class);
+        aaiClient = (AAIClient) bctx.getService(sref);
+    }
+
+    @Override
+    public void postGenericVnfData(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
+        String vnf_id = ctx.getAttribute(Constants.VNF_ID_PARAM_NAME);
+        String prefix = ctx.getAttribute(Constants.AAI_PREFIX_PARAM_NAME);
+
+        String key = "vnf-id = '" + vnf_id + "'";
+
+        Map<String, String> data = new HashMap<>();
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            String paramKey = entry.getKey();
+            int pos = paramKey.indexOf(Constants.AAI_INPUT_DATA);
+            if (pos == 0) {
+                data.put(paramKey.substring(Constants.AAI_INPUT_DATA.length()+1), entry.getValue());
+            }
+        }
+
+        try {
+            SvcLogicResource.QueryStatus response = aaiClient.update("generic-vnf", key, data, prefix, ctx);
+            if (SvcLogicResource.QueryStatus.NOT_FOUND.equals(response)) {
+                String errorMessage = String.format("VNF not found for vnf_id = %s", vnf_id);
+                ctx.setAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE, errorMessage);
+                throw new APPCException(errorMessage);
+            }
+            logger.info("AAIResponse: " + response.toString());
+            if (SvcLogicResource.QueryStatus.FAILURE.equals(response)) {
+                String errorMessage = String.format("Error Querying AAI with vnfID = %s", vnf_id);
+                ctx.setAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE, errorMessage);
+                throw new APPCException(errorMessage);
+            }
+        } catch (SvcLogicException e) {
+            String errorMessage = String.format("Error in postVnfdata %s", e);
+            ctx.setAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE, errorMessage);
+            logger.error(errorMessage);
+            throw new APPCException(e);
+        }
+    }
+
+    @Override
+    public void getGenericVnfData(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
+        String vnf_id = ctx.getAttribute(Constants.VNF_ID_PARAM_NAME);
+        String prefix = ctx.getAttribute(Constants.AAI_PREFIX_PARAM_NAME);
+
+        String key = "vnf-id = '" + vnf_id + "'";
+        try {
+            SvcLogicResource.QueryStatus response = aaiClient.query("generic-vnf", false, null, key, prefix, null, ctx);
+            if (SvcLogicResource.QueryStatus.NOT_FOUND.equals(response)) {
+                String errorMessage = String.format("VNF not found for vnf_id = %s", vnf_id);
+                ctx.setAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE, errorMessage);
+                throw new APPCException(errorMessage);
+            } else if (SvcLogicResource.QueryStatus.FAILURE.equals(response)) {
+                String errorMessage = String.format("Error Querying AAI with vnfID = %s", vnf_id);
+                ctx.setAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE, errorMessage);
+                throw new APPCException(errorMessage);
+            }
+            String aaiEntitlementPoolUuid = ctx.getAttribute(Constants.AAI_ENTITLMENT_POOL_UUID_NAME);
+            if (null == aaiEntitlementPoolUuid) aaiEntitlementPoolUuid = "";
+            String aaiLicenseKeyGroupUuid = ctx.getAttribute(Constants.AAI_LICENSE_KEY_UUID_NAME);
+            if (null == aaiLicenseKeyGroupUuid) aaiLicenseKeyGroupUuid = "";
+
+            ctx.setAttribute(Constants.IS_RELEASE_ENTITLEMENT_REQUIRE, Boolean.toString(!aaiEntitlementPoolUuid.isEmpty()));
+            ctx.setAttribute(Constants.IS_RELEASE_LICENSE_REQUIRE, Boolean.toString(!aaiLicenseKeyGroupUuid.isEmpty()));
+
+            logger.info("AAIResponse: " + response.toString());
+        } catch (SvcLogicException e) {
+            String errorMessage = String.format("Error in getVnfdata %s", e);
+            ctx.setAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE, errorMessage);
+            logger.error(errorMessage);
+            throw new APPCException(e);
+        }
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java
new file mode 100644
index 000000000..3feab4795
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.dg.aai.impl;
+
+
+public class Constants {
+    public final static String VNF_ID_PARAM_NAME = "aai.vnfID";
+    public static final String AAI_PREFIX_PARAM_NAME = "aai.prefix";
+    public static final String AAI_INPUT_DATA = "aai.input.data";
+    public static final String AAI_ERROR_MESSAGE = "org.openecomp.appc.dg.error";
+
+    public static final String CONFIGURE_PATH = "/restconf/config/opendaylight-inventory:nodes/node/";
+    public static final String CONNECT_PATH = "/restconf/config/opendaylight-inventory:nodes/node/controller-config/yang-ext:mount/config:modules";
+    public static final String CHECK_CONNECTION_PATH = "/restconf/operational/opendaylight-inventory:nodes/node/";
+    public static final String DISCONNECT_PATH = "/restconf/config/opendaylight-inventory:nodes/node/controller-config/yang-ext:mount/config:modules/module/odl-sal-netconf-connector-cfg:sal-netconf-connector/";
+
+    public static final String CONTROLLER_IP = "127.0.0.1";
+    public static final int CONTROLLER_PORT = 8181;
+    public static final String PROTOCOL = "http";
+
+    public static final String VF_LICENSE = "VF_LICENSE";
+
+    // tables and fields
+    public static final String NETCONF_SCHEMA = "sdnctl";
+    public static final String SDNCTL_SCHEMA = "sdnctl";
+    public static final String DEVICE_AUTHENTICATION_TABLE_NAME = "DEVICE_AUTHENTICATION";
+    public static final String CONFIGFILES_TABLE_NAME = "CONFIGFILES";
+    public static final String DEVICE_INTERFACE_LOG_TABLE_NAME = "DEVICE_INTERFACE_LOG";
+    public static final String FILE_CONTENT_TABLE_FIELD_NAME = "FILE_CONTENT";
+    public static final String FILE_NAME_TABLE_FIELD_NAME = "FILE_NAME";
+    public static final String USER_NAME_TABLE_FIELD_NAME = "USER_NAME";
+    public static final String PASSWORD_TABLE_FIELD_NAME = "PASSWORD";
+    public static final String PORT_NUMBER_TABLE_FIELD_NAME = "PORT_NUMBER";
+    public static final String VNF_TYPE_TABLE_FIELD_NAME = "VNF_TYPE";
+    public static final String SERVICE_INSTANCE_ID_FIELD_NAME = "SERVICE_INSTANCE_ID";
+    public static final String REQUEST_ID_FIELD_NAME = "REQUEST_ID";
+    public static final String CREATION_DATE_FIELD_NAME = "CREATION_DATE";
+    public static final String LOG_FIELD_NAME = "LOG";
+    public static final String ASDC_ARTIFACTS_TABLE_NAME = "ASDC_ARTIFACTS";
+
+    // input fields names
+    public static final String PAYLOAD = "payload";
+
+    // constants fo DG
+    public static final String VNF_TYPE_FIELD_NAME = "org.openecomp.appc.vftype";
+    public static final String VNF_VERSION_FIELD_NAME = "org.openecomp.appc.vfversion";
+    public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.openecomp.appc.resource-version";
+    public static final String TARGET_VNF_TYPE = "target-vnf-type";
+    public static final String FILE_CONTENT_FIELD_NAME = "file-content";
+    public static final String CONNECTION_DETAILS_FIELD_NAME = "connection-details";
+    public static final String CONFIGURATION_FILE_FIELD_NAME = "configuration-file-name";
+    public static final String VNF_HOST_IP_ADDRESS_FIELD_NAME = "vnf-host-ip-address";
+    public static final String UPGRADE_VERSION = "upgrade-version";
+    public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error";
+    public static final String DG_OUTPUT_STATUS_MESSAGE = "output.status.message";
+    public static final String RESOURCEKEY = "resourceKey";
+    public static final String REQ_ID_FIELD_NAME = "org.openecomp.appc.reqid";
+    public static final String API_VERSION_FIELD_NAME = "org.openecomp.appc.apiversion";
+    public static final String MODEL_ENTITLMENT_POOL_UUID_NAME = "model.entitlement.pool.uuid";
+    public static final String MODEL_LICENSE_KEY_UUID_NAME = "model.license.key.uuid";
+    public static final String ENTITLMENT_POOL_UUID_NAME = "entitlement.pool.uuid";
+    public static final String LICENSE_KEY_UUID_NAME = "license.key.uuid";
+    public static final String IS_ACQUIRE_LICENSE_REQUIRE ="is.acquire-license.require";
+    public static final String IS_RELEASE_LICENSE_REQUIRE ="is.release-license.require";
+
+    public static final String AAI_ENTITLMENT_POOL_UUID_NAME = "aai.input.data.entitlement-assignment-group-uuid";
+    public static final String AAI_LICENSE_KEY_UUID_NAME = "aai.input.data.license-assignment-group-uuid";
+    public static final String AAI_LICENSE_KEY_VALUE = "aai.input.data.license-key";
+    public static final String IS_AAI_ENTITLEMENT_UPDATE_REQUIRE = "is.aai-entitlement-update.require";
+    public static final String IS_AAI_LICENSE_UPDATE_REQUIRE = "is.aai-license-update.require";
+    public static final String IS_ACQUIRE_ENTITLEMENT_REQUIRE ="is.acquire-entitlement.require";
+    public static final String IS_RELEASE_ENTITLEMENT_REQUIRE ="is.release-entitlement.require";
+
+    public enum ASDC_ARTIFACTS_FIELDS {
+        SERVICE_UUID,
+        DISTRIBUTION_ID,
+        SERVICE_NAME,
+        SERVICE_DESCRIPTION,
+        RESOURCE_UUID,
+        RESOURCE_INSTANCE_NAME,
+        RESOURCE_NAME,
+        RESOURCE_VERSION,
+        RESOURCE_TYPE,
+        ARTIFACT_UUID,
+        ARTIFACT_TYPE,
+        ARTIFACT_VERSION,
+        ARTIFACT_DESCRIPTION,
+        INTERNAL_VERSION,
+        CREATION_DATE,
+        ARTIFACT_NAME,
+        ARTIFACT_CONTENT
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 000000000..260b218d6
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : APP-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+
+    <service id="aaiServicePlugin" interface="org.openecomp.appc.dg.aai.AAIPlugin">
+        <bean class="org.openecomp.appc.dg.aai.impl.AAIPluginImpl"/>
+    </service>
+
+</blueprint>
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java
new file mode 100644
index 000000000..fc4379dd2
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java
@@ -0,0 +1,544 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.dg.aai.impl;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.openecomp.sdnc.sli.aai.AAIClient;
+import org.openecomp.sdnc.sli.aai.AAIServiceException;
+import org.openecomp.sdnc.sli.aai.data.*;
+import org.openecomp.sdnc.sli.aai.data.notify.NotifyEvent;
+import org.openecomp.sdnc.sli.aai.data.v1507.VServer;
+import org.openecomp.sdnc.sli.aai.update.Update;
+
+
+public class AAIClientMock implements AAIClient {
+
+    Map<String, String> mockAAI = new HashMap<>();
+
+    public void setMockAAI(Map<String, String> mockAAI) {
+        this.mockAAI = mockAAI;
+    }
+
+    @Override
+    public AAIResponse requestSdnZoneQuery(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postNetworkVceData(String s, Vce vce) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public Vce requestNetworkVceData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean deleteNetworkVceData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public ServiceInstance requestServiceInterfaceData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public ServiceInstance requestServiceInterfaceData(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postServiceInterfaceData(String s, String s1, String s2, ServiceInstance serviceInstance) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public SearchResults requestServiceInstanceURL(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public Vpe requestNetworkVpeData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postNetworkVpeData(String s, Vpe vpe) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteNetworkVpeData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public Vserver requestVServerData(String s, String s1, String s2, String s3) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postVServerData(String s, String s1, String s2, String s3, Vserver vserver) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteVServerData(String s, String s1, String s2, String s3, String s4) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public URL requestVserverURLNodeQuery(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public String getTenantIdFromVserverUrl(URL url) {
+        return null;
+    }
+
+    @Override
+    public String getCloudOwnerFromVserverUrl(URL url) {
+        return null;
+    }
+
+    @Override
+    public String getCloudRegionFromVserverUrl(URL url) {
+        return null;
+    }
+
+    @Override
+    public String getVServerIdFromVserverUrl(URL url, String s) {
+        return null;
+    }
+
+    @Override
+    public Vserver requestVServerDataByURL(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public VplsPe requestNetworkVplsPeData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postNetworkVplsPeData(String s, VplsPe vplsPe) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteNetworkVplsPeData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public Complex requestNetworkComplexData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postNetworkComplexData(String s, Complex complex) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteNetworkComplexData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public CtagPool requestCtagPoolData(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public VServer dataChangeRequestVServerData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public CtagPool dataChangeRequestCtagPoolData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public VplsPe dataChangeRequestVplsPeData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public Vpe dataChangeRequestVpeData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public DvsSwitch dataChangeRequestDvsSwitchData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public PServer dataChangeRequestPServerData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public OamNetwork dataChangeRequestOAMNetworkData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public AvailabilityZone dataChangeRequestAvailabilityZoneData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public Complex dataChangeRequestComplexData(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean dataChangeDeleteVServerData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteCtagPoolData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteVplsPeData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteVpeData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteDvsSwitchData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteOAMNetworkData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteAvailabilityZoneData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean dataChangeDeleteComplexData(URL url) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public GenericVnf requestGenericVnfData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postGenericVnfData(String s, GenericVnf genericVnf) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteGenericVnfData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public DvsSwitch requestDvsSwitchData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postDvsSwitchData(String s, DvsSwitch dvsSwitch) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteDvsSwitchData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public PInterface requestPInterfaceData(String s, String s1) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postPInterfaceData(String s, String s1, PInterface pInterface) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deletePInterfaceData(String s, String s1, String s2) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public PhysicalLink requestPhysicalLinkData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postPhysicalLinkData(String s, PhysicalLink physicalLink) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deletePhysicalLinkData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public PServer requestPServerData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postPServerData(String s, PServer pServer) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deletePServerData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public L3Network requestL3NetworkData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public L3Network requestL3NetworkQueryByName(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postL3NetworkData(String s, L3Network l3Network) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteL3NetworkData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public VpnBinding requestVpnBindingData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean deleteVpnBindingData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public VnfImage requestVnfImageData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public VnfImage requestVnfImageDataByVendorModel(String s, String s1) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public VnfImage requestVnfImageDataByVendorModelVersion(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean sendNotify(NotifyEvent notifyEvent, String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public SitePairSet requestSitePairSetData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postSitePairSetData(String s, SitePairSet sitePairSet) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteSitePairSetData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public Service requestServiceData(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postServiceData(String s, Service service) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean deleteServiceData(String s, String s1) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public QueryResponse requestNodeQuery(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public String requestDataByURL(URL url) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public GenericVnf requestGenericVnfeNodeQuery(String s) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public Tenant requestTenantData(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public Tenant requestTenantDataByName(String s, String s1, String s2) throws AAIServiceException {
+        return null;
+    }
+
+    @Override
+    public boolean postTenantData(String s, String s1, String s2, Tenant tenant) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public boolean updateAnAIEntry(Update update) throws AAIServiceException {
+        return false;
+    }
+
+    @Override
+    public QueryStatus backup(Map<String, String> map, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus restore(Map<String, String> map, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus isAvailable(String s, String s1, String s2, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus exists(String s, String s1, String s2, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus query(String s, boolean b, String s1, String key, String prefix, String s4, SvcLogicContext ctx) throws SvcLogicException {
+        if (s.equals("generic-vnf") && key.equals("vnf-id = 'test_VNF'") && ctx != null) {
+            for (Map.Entry<String, String> entry : mockAAI.entrySet()) {
+                ctx.setAttribute(prefix + "." + entry.getKey(), entry.getValue());
+            }
+            return QueryStatus.SUCCESS;
+
+
+        } else if (key.equals("vnf-id = 'test_VNF1'")){
+            return QueryStatus.NOT_FOUND;
+        }
+        else if (key.equals("vnf-id = 'test_VNF3'")){
+            throw new SvcLogicException();
+        }
+        else {
+            return QueryStatus.FAILURE;
+        }
+
+
+    }
+
+    @Override
+    public QueryStatus reserve(String s, String s1, String s2, String s3, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus save(String s, boolean b, boolean b1, String s1, Map<String, String> map, String s2, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus release(String s, String s1, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus delete(String s, String s1, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus notify(String s, String s1, SvcLogicContext svcLogicContext) throws SvcLogicException {
+        return null;
+    }
+
+    @Override
+    public QueryStatus update(String s, String key, Map<String, String> data, String prefix, SvcLogicContext ctx) throws SvcLogicException {
+        if (s.equals("generic-vnf") && key.equals("vnf-id = 'test_VNF'") && ctx != null) {
+            for (Map.Entry<String, String> entry : data.entrySet()) {
+                mockAAI.put(entry.getKey(), entry.getValue());
+            }
+            return QueryStatus.SUCCESS;
+
+
+        } else if (key.equals("vnf-id = 'test_VNF1'")){
+            return QueryStatus.NOT_FOUND;
+        }
+        else if (key.equals("vnf-id = 'test_VNF3'")){
+            throw new SvcLogicException();
+        }
+        else {
+            return QueryStatus.FAILURE;
+        }
+
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java
new file mode 100644
index 000000000..8d6fea0cf
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java
@@ -0,0 +1,260 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.dg.aai.impl;
+
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.mockito.*;
+import org.openecomp.appc.dg.aai.Constants;
+import org.openecomp.appc.dg.aai.impl.AAIPluginImpl;
+import org.openecomp.appc.dg.common.dao.DAOService;
+import org.openecomp.appc.dg.common.impl.LicenseManagerImpl;
+import org.openecomp.appc.exceptions.APPCException;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.openecomp.sdnc.sli.aai.AAIClient;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+import static org.powermock.api.support.SuppressCode.suppressConstructor;
+
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({AAIPluginImpl.class, FrameworkUtil.class})
+public class AAIPluginImplTest {
+    private AAIPluginImpl aaiPlugin;
+    private AAIClientMock aaiClient;
+
+    private final BundleContext bundleContext= Mockito.mock(BundleContext.class);
+    private final Bundle bundleService=Mockito.mock(Bundle.class);
+    private final ServiceReference sref=Mockito.mock(ServiceReference.class);
+
+    String prefix = "aai.input.data";
+    String vnfId = "test_VNF";
+    String vnfId1 = "test_VNF1";
+    String vnfId2 = "test_VNF2";
+    String vnfId3 = "test_VNF3";
+
+    @Before
+    public void setUp() throws NoSuchFieldException, IllegalAccessException {
+        aaiClient = new AAIClientMock();
+        PowerMockito.mockStatic(FrameworkUtil.class);
+        PowerMockito.when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
+        PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
+        PowerMockito.when(bundleContext.getServiceReference(Matchers.any(Class.class))).thenReturn(sref);
+        PowerMockito.when(bundleContext.getService(sref)).thenReturn(aaiClient);
+        aaiPlugin = new AAIPluginImpl();
+
+
+    }
+
+
+
+
+    @Test
+    public void testPostGenericVnfData() throws Exception {
+        Map<String, String> params = new HashMap<>();
+        params.put(prefix+"."+"license-key-uuid", "123");
+        params.put(prefix+"."+"license-assignment-group-uuid", "1234");
+        params.put(prefix+"."+"data.license-key", "12345");
+
+        HashMap<String, String> mockAAI = new HashMap<>();
+        aaiClient.setMockAAI(mockAAI);
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId);
+        ctx.setAttribute("aai.prefix", prefix);
+
+        aaiPlugin.postGenericVnfData(params, ctx);
+
+        Assert.assertEquals("wrong license-key-uuid","123", mockAAI.get("license-key-uuid"));
+        Assert.assertEquals("wrong license-assignment-group-uuid","1234", mockAAI.get("license-assignment-group-uuid"));
+        Assert.assertEquals("wrong data.license-key","12345", mockAAI.get("data.license-key"));
+    }
+
+
+    @Test
+    public void testPostGenericVnfDataNegativeVnfNotFound() throws Exception {
+        Map<String, String> params = new HashMap<>();
+        params.put(prefix+"."+"license-key-uuid", "123");
+        params.put(prefix+"."+"license-assignment-group-uuid", "1234");
+        params.put(prefix+"."+"data.license-key", "12345");
+
+        HashMap<String, String> mockAAI = new HashMap<>();
+
+        aaiClient.setMockAAI(mockAAI);
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId1);
+        ctx.setAttribute("aai.prefix", prefix);
+
+        try {
+            aaiPlugin.postGenericVnfData(params, ctx);
+            Assert.assertTrue(false);
+        } catch (APPCException e) {
+            Assert.assertNotNull(ctx.getAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE));
+        }
+
+    }
+
+
+    @Test
+    public void testPostGenericVnfDataNegativeFailure() throws Exception {
+        Map<String, String> params = new HashMap<>();
+        params.put(prefix+"."+"license-key-uuid", "123");
+        params.put(prefix+"."+"license-assignment-group-uuid", "1234");
+        params.put(prefix+"."+"data.license-key", "12345");
+
+        HashMap<String, String> mockAAI = new HashMap<>();
+
+        aaiClient.setMockAAI(mockAAI);
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId2);
+        ctx.setAttribute("aai.prefix", prefix);
+
+        try {
+            aaiPlugin.postGenericVnfData(params, ctx);
+            Assert.assertTrue(false);
+        } catch (APPCException e) {
+            Assert.assertNotNull(ctx.getAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE));
+        }
+
+    }
+
+
+    @Test
+    public void testPostGenericVnfDataNegativeSvcLogicException() throws Exception {
+        Map<String, String> params = new HashMap<>();
+        params.put(prefix+"."+"license-key-uuid", "123");
+        params.put(prefix+"."+"license-assignment-group-uuid", "1234");
+        params.put(prefix+"."+"data.license-key", "12345");
+
+        HashMap<String, String> mockAAI = new HashMap<>();
+
+        aaiClient.setMockAAI(mockAAI);
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId3);
+        ctx.setAttribute("aai.prefix", prefix);
+
+        try {
+            aaiPlugin.postGenericVnfData(params, ctx);
+            Assert.assertTrue(false);
+        } catch (APPCException e) {
+            Assert.assertNotNull(ctx.getAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE));
+        }
+
+    }
+
+    @Test
+    public void testGetGenericVnfData() throws Exception {
+        String vnfNameKey = "vnf-name";
+        String vnfType = "VSCP";
+        String vnfTypeKey = "vnf-type";
+        String provStatus = "Active";
+        String provStatusKey = "prov-status";
+        String orchestrationStatus = "Running";
+        String orchestrationStatusKey = "orchestration-status";
+
+        Map<String, String> params = new HashMap<>();
+        HashMap<String, String> mockAAI = new HashMap<>();
+        mockAAI.put(vnfNameKey,vnfId);
+        mockAAI.put(vnfTypeKey,vnfType);
+        mockAAI.put(provStatusKey, provStatus);
+        mockAAI.put(orchestrationStatusKey, orchestrationStatus);
+        aaiClient.setMockAAI(mockAAI);
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId);
+        ctx.setAttribute("aai.prefix", prefix);
+
+
+        aaiPlugin.getGenericVnfData(params, ctx);
+
+        Assert.assertEquals("wrong "+vnfNameKey,vnfId, ctx.getAttribute(prefix + "." + vnfNameKey));
+        Assert.assertEquals("wrong "+orchestrationStatusKey,orchestrationStatus, ctx.getAttribute(prefix + "." + orchestrationStatusKey));
+        Assert.assertEquals("wrong "+vnfTypeKey,vnfType, ctx.getAttribute(prefix + "." +  vnfTypeKey));
+        Assert.assertEquals("wrong "+provStatusKey,provStatus, ctx.getAttribute(prefix + "." + provStatusKey ));
+    }
+
+
+
+
+    @Test
+    public void testGetGenericVnfDataNegativeVnfNotFound() throws Exception {
+
+        Map<String, String> params = new HashMap<>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId1);
+        ctx.setAttribute("aai.prefix", prefix);
+
+
+        try {
+            aaiPlugin.getGenericVnfData(params, ctx);
+            Assert.assertTrue(false);
+        } catch (APPCException e) {
+            Assert.assertNotNull(ctx.getAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE));
+        }
+    }
+
+
+    @Test
+    public void testGetGenericVnfDataNegativeFailure() throws Exception {
+
+        Map<String, String> params = new HashMap<>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId2);
+        ctx.setAttribute("aai.prefix", prefix);
+
+        try {
+            aaiPlugin.getGenericVnfData(params, ctx);
+            Assert.assertTrue(false);
+        } catch (APPCException e) {
+            Assert.assertNotNull(ctx.getAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE));
+        }
+    }
+
+
+    @Test
+    public void testGetGenericVnfDataNegativeSvcLogicException() throws Exception {
+
+        Map<String, String> params = new HashMap<>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("aai.vnfID", vnfId3);
+        ctx.setAttribute("aai.prefix", prefix);
+
+        try {
+            aaiPlugin.getGenericVnfData(params, ctx);
+            Assert.assertTrue(false);
+        } catch (APPCException e) {
+            Assert.assertNotNull(ctx.getAttribute(Constants.DG_OUTPUT_STATUS_MESSAGE));
+        }
+    }
+
+}