Removed checkstyle warnings

Removed checkstyle warnings from
policy/drools-applications/controlloop/common/model-impl/aai
including renaming classes:
AAI* -> Aai*
PNF* -> Pnf*
and renaming some methods in those classes

Issue-ID: POLICY-705
Change-Id: I2d59a668728aa58a2c9fbe78c44e924e6cfb4531
Signed-off-by: mmis <michael.morris@ericsson.com>

5 files changed, 75 insertions, 75 deletions

diff --git a/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java b/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
index f2d0991e2..0db66c5af 100644
--- a/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
+++ b/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
@@ -31,14 +31,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.onap.policy.aai.AAIManager;
-import org.onap.policy.aai.AAINQInstanceFilters;
-import org.onap.policy.aai.AAINQInventoryResponseItem;
-import org.onap.policy.aai.AAINQNamedQuery;
-import org.onap.policy.aai.AAINQQueryParameters;
-import org.onap.policy.aai.AAINQRequest;
-import org.onap.policy.aai.AAINQResponse;
-import org.onap.policy.aai.util.AAIException;
+import org.onap.policy.aai.AaiManager;
+import org.onap.policy.aai.AaiNqInstanceFilters;
+import org.onap.policy.aai.AaiNqInventoryResponseItem;
+import org.onap.policy.aai.AaiNqNamedQuery;
+import org.onap.policy.aai.AaiNqQueryParameters;
+import org.onap.policy.aai.AaiNqRequest;
+import org.onap.policy.aai.AaiNqResponse;
+import org.onap.policy.aai.util.AaiException;
 import org.onap.policy.appclcm.LCMCommonHeader;
 import org.onap.policy.appclcm.LCMRequest;
 import org.onap.policy.appclcm.LCMRequestWrapper;
@@ -115,12 +115,12 @@ public class AppcLcmActorServiceProvider implements Actor {
      * 
      * @return the vnf-id of the target vnf to act upon or null if not found
      */
-    private static String parseAaiResponse(List<AAINQInventoryResponseItem> items, String resourceId) {
+    private static String parseAaiResponse(List<AaiNqInventoryResponseItem> items, String resourceId) {
         String vnfId = null;
-        for (AAINQInventoryResponseItem item : items) {
-            if ((item.getGenericVNF() != null) && (item.getGenericVNF().getModelInvariantId() != null)
-                    && (resourceId.equals(item.getGenericVNF().getModelInvariantId()))) {
-                vnfId = item.getGenericVNF().getVnfID();
+        for (AaiNqInventoryResponseItem item : items) {
+            if ((item.getGenericVnf() != null) && (item.getGenericVnf().getModelInvariantId() != null)
+                    && (resourceId.equals(item.getGenericVnf().getModelInvariantId()))) {
+                vnfId = item.getGenericVnf().getVnfId();
                 break;
             } else {
                 if ((item.getItems() != null) && (item.getItems().getInventoryResponseItems() != null)) {
@@ -140,17 +140,17 @@ public class AppcLcmActorServiceProvider implements Actor {
      * @param sourceVnfId the vnf id of the source entity reporting the alert
      * 
      * @return the target entities vnf id to act upon
-     * @throws AAIException it an error occurs
+     * @throws AaiException it an error occurs
      */
-    public static String vnfNamedQuery(String resourceId, String sourceVnfId) throws AAIException {
+    public static String vnfNamedQuery(String resourceId, String sourceVnfId) throws AaiException {
 
         // TODO: This request id should not be hard coded in future releases
         UUID requestId = UUID.fromString("a93ac487-409c-4e8c-9e5f-334ae8f99087");
 
-        AAINQRequest aaiRequest = new AAINQRequest();
-        aaiRequest.setQueryParameters(new AAINQQueryParameters());
-        aaiRequest.getQueryParameters().setNamedQuery(new AAINQNamedQuery());
-        aaiRequest.getQueryParameters().getNamedQuery().setNamedQueryUUID(requestId);
+        AaiNqRequest aaiRequest = new AaiNqRequest();
+        aaiRequest.setQueryParameters(new AaiNqQueryParameters());
+        aaiRequest.getQueryParameters().setNamedQuery(new AaiNqNamedQuery());
+        aaiRequest.getQueryParameters().getNamedQuery().setNamedQueryUuid(requestId);
 
         Map<String, Map<String, String>> filter = new HashMap<>();
         Map<String, String> filterItem = new HashMap<>();
@@ -158,20 +158,20 @@ public class AppcLcmActorServiceProvider implements Actor {
         filterItem.put("vnf-id", sourceVnfId);
         filter.put("generic-vnf", filterItem);
 
-        aaiRequest.setInstanceFilters(new AAINQInstanceFilters());
+        aaiRequest.setInstanceFilters(new AaiNqInstanceFilters());
         aaiRequest.getInstanceFilters().getInstanceFilter().add(filter);
 
-        AAINQResponse aaiResponse = new AAIManager(new RESTManager()).postQuery(getPeManagerEnvProperty("aai.url"),
+        AaiNqResponse aaiResponse = new AaiManager(new RESTManager()).postQuery(getPeManagerEnvProperty("aai.url"),
                 getPeManagerEnvProperty("aai.username"), getPeManagerEnvProperty("aai.password"), aaiRequest,
                 requestId);
 
         if (aaiResponse == null) {
-            throw new AAIException("The named query response was null");
+            throw new AaiException("The named query response was null");
         }
 
         String targetVnfId = parseAaiResponse(aaiResponse.getInventoryResponseItems(), resourceId);
         if (targetVnfId == null) {
-            throw new AAIException("Target vnf-id could not be found");
+            throw new AaiException("Target vnf-id could not be found");
         }
 
         return targetVnfId;
diff --git a/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java b/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java
index 50b03c6b4..72d43d318 100644
--- a/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java
+++ b/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java
@@ -32,7 +32,7 @@ import java.util.UUID;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.aai.util.AAIException;
+import org.onap.policy.aai.util.AaiException;
 import org.onap.policy.appclcm.LCMCommonHeader;
 import org.onap.policy.appclcm.LCMRequest;
 import org.onap.policy.appclcm.LCMRequestWrapper;
@@ -312,7 +312,7 @@ public class AppcLcmServiceProviderTest {
         String targetVnfId = null;
         try {
             targetVnfId = AppcLcmActorServiceProvider.vnfNamedQuery(resourceId, "vnf01");
-        } catch (AAIException e) {
+        } catch (AaiException e) {
             logger.warn(e.toString());
             fail("no vnf-id found");
         }
diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
index 738cf3d04..231b8fae5 100644
--- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
@@ -30,15 +30,15 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.drools.core.WorkingMemory;
-import org.onap.policy.aai.AAIManager;
-import org.onap.policy.aai.AAINQExtraProperty;
-import org.onap.policy.aai.AAINQInstanceFilters;
-import org.onap.policy.aai.AAINQInventoryResponseItem;
-import org.onap.policy.aai.AAINQNamedQuery;
-import org.onap.policy.aai.AAINQQueryParameters;
-import org.onap.policy.aai.AAINQRequest;
-import org.onap.policy.aai.AAINQResponse;
-import org.onap.policy.aai.AAINQResponseWrapper;
+import org.onap.policy.aai.AaiManager;
+import org.onap.policy.aai.AaiNqExtraProperty;
+import org.onap.policy.aai.AaiNqInstanceFilters;
+import org.onap.policy.aai.AaiNqInventoryResponseItem;
+import org.onap.policy.aai.AaiNqNamedQuery;
+import org.onap.policy.aai.AaiNqQueryParameters;
+import org.onap.policy.aai.AaiNqRequest;
+import org.onap.policy.aai.AaiNqResponse;
+import org.onap.policy.aai.AaiNqResponseWrapper;
 import org.onap.policy.controlloop.ControlLoopOperation;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
@@ -121,19 +121,19 @@ public class SOActorServiceProvider implements Actor {
         }
 
         // Perform named query request and handle response
-        AAINQResponseWrapper aaiResponseWrapper = performAaiNamedQueryRequest(onset);
+        AaiNqResponseWrapper aaiResponseWrapper = performAaiNamedQueryRequest(onset);
         if (aaiResponseWrapper == null) {
             // Tracing and error handling handied in the "performAaiNamedQueryRequest()" method
             return null;
         }
 
-        AAINQInventoryResponseItem vnfItem;
-        AAINQInventoryResponseItem vnfServiceItem;
-        AAINQInventoryResponseItem tenantItem;
+        AaiNqInventoryResponseItem vnfItem;
+        AaiNqInventoryResponseItem vnfServiceItem;
+        AaiNqInventoryResponseItem tenantItem;
 
         // Extract the items we're interested in from the response
         try {
-            vnfItem = aaiResponseWrapper.getAainqresponse().getInventoryResponseItems().get(0).getItems()
+            vnfItem = aaiResponseWrapper.getAaiNqResponse().getInventoryResponseItems().get(0).getItems()
                     .getInventoryResponseItems().get(0);
         } catch (Exception e) {
             logger.error("VNF Item not found in AAI response {}", Serialization.gsonPretty.toJson(aaiResponseWrapper),
@@ -150,7 +150,7 @@ public class SOActorServiceProvider implements Actor {
         }
 
         try {
-            tenantItem = aaiResponseWrapper.getAainqresponse().getInventoryResponseItems().get(0).getItems()
+            tenantItem = aaiResponseWrapper.getAaiNqResponse().getInventoryResponseItems().get(0).getItems()
                     .getInventoryResponseItems().get(1);
         } catch (Exception e) {
             logger.error("Tenant Item not found in AAI response {}",
@@ -189,14 +189,14 @@ public class SOActorServiceProvider implements Actor {
         //
         // modelInfo
         //
-        AAINQInventoryResponseItem vfModuleItem = vnfItem.getItems().getInventoryResponseItems().get(nonBaseIndex);
+        AaiNqInventoryResponseItem vfModuleItem = vnfItem.getItems().getInventoryResponseItems().get(nonBaseIndex);
 
         request.getRequestDetails().getModelInfo().setModelType("vfModule");
         request.getRequestDetails().getModelInfo()
                 .setModelInvariantId(vfModuleItem.getVfModule().getModelInvariantId());
         request.getRequestDetails().getModelInfo().setModelVersionId(vfModuleItem.getVfModule().getModelVersionId());
 
-        for (AAINQExtraProperty prop : vfModuleItem.getExtraProperties().getExtraProperty()) {
+        for (AaiNqExtraProperty prop : vfModuleItem.getExtraProperties().getExtraProperty()) {
             if (prop.getPropertyName().equals(modelNamePropertyKey)) {
                 request.getRequestDetails().getModelInfo().setModelName(prop.getPropertyValue());
             } else if (prop.getPropertyName().equals(modelVersionPropertyKey)) {
@@ -237,12 +237,12 @@ public class SOActorServiceProvider implements Actor {
 
         // Service Item
         relatedInstanceListElement1.getRelatedInstance()
-                .setInstanceId(vnfServiceItem.getServiceInstance().getServiceInstanceID());
+                .setInstanceId(vnfServiceItem.getServiceInstance().getServiceInstanceId());
         relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SOModelInfo());
         relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("service");
         relatedInstanceListElement1.getRelatedInstance().getModelInfo()
                 .setModelInvariantId(vnfServiceItem.getServiceInstance().getModelInvariantId());
-        for (AAINQExtraProperty prop : vnfServiceItem.getExtraProperties().getExtraProperty()) {
+        for (AaiNqExtraProperty prop : vnfServiceItem.getExtraProperties().getExtraProperty()) {
             if (prop.getPropertyName().equals(modelNamePropertyKey)) {
                 relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelName(prop.getPropertyValue());
             } else if (prop.getPropertyName().equals(modelVersionPropertyKey)) {
@@ -252,12 +252,12 @@ public class SOActorServiceProvider implements Actor {
         }
 
         // VNF Item
-        relatedInstanceListElement2.getRelatedInstance().setInstanceId(vnfItem.getGenericVNF().getVnfID());
+        relatedInstanceListElement2.getRelatedInstance().setInstanceId(vnfItem.getGenericVnf().getVnfId());
         relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SOModelInfo());
         relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("vnf");
         relatedInstanceListElement2.getRelatedInstance().getModelInfo()
-                .setModelInvariantId(vnfItem.getGenericVNF().getModelInvariantId());
-        for (AAINQExtraProperty prop : vnfItem.getExtraProperties().getExtraProperty()) {
+                .setModelInvariantId(vnfItem.getGenericVnf().getModelInvariantId());
+        for (AaiNqExtraProperty prop : vnfItem.getExtraProperties().getExtraProperty()) {
             if (prop.getPropertyName().equals(modelNamePropertyKey)) {
                 relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelName(prop.getPropertyValue());
             } else if (prop.getPropertyName().equals(modelVersionPropertyKey)) {
@@ -269,15 +269,15 @@ public class SOActorServiceProvider implements Actor {
             }
         }
         relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelCustomizationName(vnfItem
-                .getGenericVNF().getVnfType().substring(vnfItem.getGenericVNF().getVnfType().lastIndexOf('/') + 1));
+                .getGenericVnf().getVnfType().substring(vnfItem.getGenericVnf().getVnfType().lastIndexOf('/') + 1));
 
         // Insert the Service Item and VNF Item
         request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement1);
         request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement2);
 
         // Save the instance IDs for the VNF and service to static fields
-        preserveInstanceIds(vnfItem.getGenericVNF().getVnfID(),
-                vnfServiceItem.getServiceInstance().getServiceInstanceID());
+        preserveInstanceIds(vnfItem.getGenericVnf().getVnfId(),
+                vnfServiceItem.getServiceInstance().getServiceInstanceId());
 
         if (logger.isDebugEnabled()) {
             logger.debug("SO request sent: {}", Serialization.gsonPretty.toJson(request));
@@ -306,17 +306,17 @@ public class SOActorServiceProvider implements Actor {
      * @param onset the virtial control loop event
      * @returns the response to the AAI Named Query
      */
-    private AAINQResponseWrapper performAaiNamedQueryRequest(VirtualControlLoopEvent onset) {
+    private AaiNqResponseWrapper performAaiNamedQueryRequest(VirtualControlLoopEvent onset) {
 
         // create AAI named-query request with UUID started with ""
-        AAINQRequest aaiNqRequest = new AAINQRequest();
-        AAINQQueryParameters aaiNqQueryParam = new AAINQQueryParameters();
-        AAINQNamedQuery aaiNqNamedQuery = new AAINQNamedQuery();
-        final AAINQInstanceFilters aaiNqInstanceFilter = new AAINQInstanceFilters();
+        AaiNqRequest aaiNqRequest = new AaiNqRequest();
+        AaiNqQueryParameters aaiNqQueryParam = new AaiNqQueryParameters();
+        AaiNqNamedQuery aaiNqNamedQuery = new AaiNqNamedQuery();
+        final AaiNqInstanceFilters aaiNqInstanceFilter = new AaiNqInstanceFilters();
 
         // queryParameters
         // UUID.fromString($params.getAaiNamedQueryUUID()) TO DO: AaiNamedQueryUUID
-        aaiNqNamedQuery.setNamedQueryUUID(UUID.fromString("4ff56a54-9e3f-46b7-a337-07a1d3c6b469"));
+        aaiNqNamedQuery.setNamedQueryUuid(UUID.fromString("4ff56a54-9e3f-46b7-a337-07a1d3c6b469"));
         aaiNqQueryParam.setNamedQuery(aaiNqNamedQuery);
         aaiNqRequest.setQueryParameters(aaiNqQueryParam);
         //
@@ -334,7 +334,7 @@ public class SOActorServiceProvider implements Actor {
             logger.debug("AAI Request sent: {}", Serialization.gsonPretty.toJson(aaiNqRequest));
         }
 
-        AAINQResponse aaiNqResponse = new AAIManager(new RESTManager()).postQuery(getPeManagerEnvProperty("aai.url"),
+        AaiNqResponse aaiNqResponse = new AaiManager(new RESTManager()).postQuery(getPeManagerEnvProperty("aai.url"),
                 getPeManagerEnvProperty("aai.username"), getPeManagerEnvProperty("aai.password"), aaiNqRequest,
                 onset.getRequestID());
 
@@ -345,11 +345,11 @@ public class SOActorServiceProvider implements Actor {
         }
 
         // Create AAINQResponseWrapper
-        AAINQResponseWrapper aaiNqResponseWrapper = new AAINQResponseWrapper(onset.getRequestID(), aaiNqResponse);
+        AaiNqResponseWrapper aaiNqResponseWrapper = new AaiNqResponseWrapper(onset.getRequestID(), aaiNqResponse);
 
         if (logger.isDebugEnabled()) {
             logger.debug("AAI Named Query Response: ");
-            logger.debug(Serialization.gsonPretty.toJson(aaiNqResponseWrapper.getAainqresponse()));
+            logger.debug(Serialization.gsonPretty.toJson(aaiNqResponseWrapper.getAaiNqResponse()));
         }
 
         return aaiNqResponseWrapper;
@@ -363,8 +363,8 @@ public class SOActorServiceProvider implements Actor {
      *        for the non base index
      * @return the base or non base index or -1 if the index was not found
      */
-    private int findIndex(List<AAINQInventoryResponseItem> inventoryResponseItems, boolean baseIndexFlag) {
-        for (AAINQInventoryResponseItem invenoryResponseItem : inventoryResponseItems) {
+    private int findIndex(List<AaiNqInventoryResponseItem> inventoryResponseItems, boolean baseIndexFlag) {
+        for (AaiNqInventoryResponseItem invenoryResponseItem : inventoryResponseItems) {
             if (invenoryResponseItem.getVfModule() != null
                     && baseIndexFlag == invenoryResponseItem.getVfModule().getIsBaseVfModule()) {
                 return inventoryResponseItems.indexOf(invenoryResponseItem);
@@ -381,9 +381,9 @@ public class SOActorServiceProvider implements Actor {
      * @return number of non base index modules
      */
 
-    private int findNonBaseModules(List<AAINQInventoryResponseItem> inventoryResponseItems) {
+    private int findNonBaseModules(List<AaiNqInventoryResponseItem> inventoryResponseItems) {
         int nonBaseModuleCount = 0;
-        for (AAINQInventoryResponseItem invenoryResponseItem : inventoryResponseItems) {
+        for (AaiNqInventoryResponseItem invenoryResponseItem : inventoryResponseItems) {
             if (invenoryResponseItem.getVfModule() != null
                     && (!invenoryResponseItem.getVfModule().getIsBaseVfModule())) {
                 nonBaseModuleCount++;
diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
index 839b07e2b..83f44a1ed 100644
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
@@ -25,8 +25,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-import org.onap.policy.aai.AAIGETVnfResponse;
-import org.onap.policy.aai.AAIManager;
+import org.onap.policy.aai.AaiGetVnfResponse;
+import org.onap.policy.aai.AaiManager;
 import org.onap.policy.controlloop.ControlLoopOperation;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
@@ -86,13 +86,13 @@ public class VFCActorServiceProvider implements Actor {
      * @return the constructed request
      */
     public static VFCRequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation,
-            Policy policy, AAIGETVnfResponse vnfResponse) {
+            Policy policy, AaiGetVnfResponse vnfResponse) {
 
         // Construct an VFC request
         VFCRequest request = new VFCRequest();
         String serviceInstance = onset.getAAI().get("service-instance.service-instance-id");
         if (serviceInstance == null || "".equals(serviceInstance)) {
-            AAIGETVnfResponse tempVnfResp = vnfResponse;
+            AaiGetVnfResponse tempVnfResp = vnfResponse;
             if (tempVnfResp == null) { // if the response is null, we haven't queried
                 // This does the AAI query since we haven't already
                 tempVnfResp = getAaiServiceInstance(onset);
@@ -122,8 +122,8 @@ public class VFCActorServiceProvider implements Actor {
         return request;
     }
 
-    private static AAIGETVnfResponse getAaiServiceInstance(VirtualControlLoopEvent event) {
-        AAIGETVnfResponse response = null;
+    private static AaiGetVnfResponse getAaiServiceInstance(VirtualControlLoopEvent event) {
+        AaiGetVnfResponse response = null;
         UUID requestId = event.getRequestID();
         String vnfName = event.getAAI().get("generic-vnf.vnf-name");
         String vnfId = event.getAAI().get("generic-vnf.vnf-id");
@@ -133,11 +133,11 @@ public class VFCActorServiceProvider implements Actor {
         try {
             if (vnfName != null) {
                 String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf?vnf-name=";
-                response = new AAIManager(new RESTManager()).getQueryByVnfName(url, aaiUsername, aaiPassword, requestId,
+                response = new AaiManager(new RESTManager()).getQueryByVnfName(url, aaiUsername, aaiPassword, requestId,
                         vnfName);
             } else if (vnfId != null) {
                 String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf/";
-                response = new AAIManager(new RESTManager()).getQueryByVnfID(url, aaiUsername, aaiPassword, requestId,
+                response = new AaiManager(new RESTManager()).getQueryByVnfId(url, aaiUsername, aaiPassword, requestId,
                         vnfId);
             } else {
                 logger.error("getAAIServiceInstance failed");
diff --git a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java
index 39be472ae..8c0ab22eb 100644
--- a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java
@@ -30,7 +30,7 @@ import java.util.UUID;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.aai.AAIGETVnfResponse;
+import org.onap.policy.aai.AaiGetVnfResponse;
 import org.onap.policy.controlloop.ControlLoopOperation;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.policy.Policy;
@@ -90,13 +90,13 @@ public class TestVFCActorServiceProvider {
         onset.getAAI().put("service-instance.service-instance-id", "");
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
-        assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AAIGETVnfResponse()));
+        assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
 
         policy.setRecipe("Restart");
-        assertNotNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AAIGETVnfResponse()));
+        assertNotNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
 
         VFCRequest request =
-                VFCActorServiceProvider.constructRequest(onset, operation, policy, new AAIGETVnfResponse());
+                VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse());
 
         assertEquals(requestId, request.getRequestId());
         assertEquals("dorothy.gale.1939", request.getHealRequest().getVnfInstanceId());