Removing Named Query.

Removing all the related  files and necessary modifications for removing named query. The code now only supports Custom Query

Issue-ID: POLICY-2125
Change-Id: Ifa5ccb74142aa424359c0dea85b90bbcf70147cb
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>

29 files changed, 0 insertions, 1584 deletions

diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java
deleted file mode 100644
index 61dde9270..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiGetResponse implements Serializable {
-    private static final long serialVersionUID = 7311418432051756162L;
-
-    private AaiNqRequestError requestError;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java
deleted file mode 100644
index dc587f2c7..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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 excthe License at
- * ept in compliance with the License.
- * You may obtain a copy of
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-public class AaiGetVnfResponse extends AaiGetResponse implements Serializable {
-
-    private static final long serialVersionUID = -6247505944905898871L;
-
-    @SerializedName("vnf-id")
-    private String vnfId;
-
-    @SerializedName("vnf-name")
-    private String vnfName;
-
-    @SerializedName("vnf-type")
-    private String vnfType;
-
-    @SerializedName("service-id")
-    private String serviceId;
-
-    @SerializedName("orchestration-status")
-    private String orchestrationStatus;
-
-    @SerializedName("in-maint")
-    private boolean inMaint;
-
-    @SerializedName("is-closed-loop-disabled")
-    private boolean isClosedLoopDisabled;
-
-    @SerializedName("model-invariant-id")
-    private String modelInvariantId;
-
-    @SerializedName("prov-status")
-    private String provStatus;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-
-    @SerializedName("relationship-list")
-    private RelationshipList relationshipList;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java
deleted file mode 100644
index c79f72c9f..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-public class AaiGetVserverResponse extends AaiGetResponse implements Serializable {
-
-    private static final long serialVersionUID = -6247505944905898871L;
-
-    private List<AaiNqVServer> vserver = new LinkedList<>();
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
index d95068b2b..5b484243a 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
@@ -217,142 +217,6 @@ public final class AaiManager {
         return null;
     }
 
-    /**
-     * Post a query to A&AI.
-     *
-     * @param url the A&AI URL
-     * @param username the user name for authentication
-     * @param password the password for authentication
-     * @param request the request to issue towards A&AI
-     * @param requestId the UUID of the request
-     * @return the response from A&AI
-     */
-    public AaiNqResponse postQuery(String url, String username, String password, AaiNqRequest request, UUID requestId) {
-
-        final Map<String, String> headers = createHeaders(requestId);
-
-        url = url + "/aai/search/named-query";
-
-        logger.debug("RestManager.post before");
-        String requestJson = Serialization.gsonPretty.toJson(request);
-        NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, url, requestJson);
-        Pair<Integer, String> httpDetails =
-                restManager.post(url, username, password, headers, APPLICATION_JSON, requestJson);
-        logger.debug("RestManager.post after");
-
-        if (httpDetails == null) {
-            logger.info("AAI POST Null Response to {}", url);
-            return null;
-        }
-
-        int httpResponseCode = httpDetails.first;
-
-        logger.info(url);
-        logger.info("{}", httpResponseCode);
-        logger.info(httpDetails.second);
-
-        if (httpDetails.second != null) {
-            return composeResponse(httpDetails, url, AaiNqResponse.class);
-        }
-        return null;
-    }
-
-    /**
-     * Perform a GET request for a particular virtual server towards A&AI.
-     *
-     * @param urlGet the A&AI URL
-     * @param username the user name for authentication
-     * @param password the password for authentication
-     * @param requestId the UUID of the request
-     * @param key the key of the virtual server
-     * @return the response for the virtual server from A&AI
-     */
-    public AaiGetVserverResponse getQueryByVserverName(String urlGet, String username, String password, UUID requestId,
-            String key) {
-        return getQuery(urlGet, username, password, requestId, key, AaiGetVserverResponse.class);
-    }
-
-    /**
-     * Perform a GET request for a particular VNF by VNF ID towards A&AI.
-     *
-     * @param urlGet the A&AI URL
-     * @param username the user name for authentication
-     * @param password the password for authentication
-     * @param requestId the UUID of the request
-     * @param key the ID of the VNF
-     * @return the response for the virtual server from A&AI
-     */
-    public AaiGetVnfResponse getQueryByVnfId(String urlGet, String username, String password, UUID requestId,
-            String key) {
-        return getQuery(urlGet, username, password, requestId, key, AaiGetVnfResponse.class);
-    }
-
-    /**
-     * Perform a GET request for a particular VNF by VNF name towards A&AI.
-     *
-     * @param urlGet the A&AI URL
-     * @param username the user name for authentication
-     * @param password the password for authentication
-     * @param requestId the UUID of the request
-     * @param key the name of the VNF
-     * @return the response for the virtual server from A&AI
-     */
-    public AaiGetVnfResponse getQueryByVnfName(String urlGet, String username, String password, UUID requestId,
-            String key) {
-        return getQuery(urlGet, username, password, requestId, key, AaiGetVnfResponse.class);
-    }
-
-    /**
-     * Perform a GET query for a particular entity towards A&AI.
-     *
-     * @param <T> the generic type for the response
-     * @param url the A&AI URL
-     * @param username the user name for authentication
-     * @param password the password for authentication
-     * @param requestId the UUID of the request
-     * @param key the name of the VNF
-     * @param classOfResponse the class of the response to return
-     * @return the response for the virtual server from A&AI
-     */
-    private <T> T getQuery(final String url, final String username, final String password, final UUID requestId,
-            final String key, final Class<T> classOfResponse) {
-
-        Map<String, String> headers = createHeaders(requestId);
-
-        String urlGet = url + key;
-
-        int attemptsLeft = 3;
-
-        while (attemptsLeft-- > 0) {
-            NetLoggerUtil.getNetworkLogger().info("[OUT|{}|{}|]", CommInfrastructure.REST, urlGet);
-            Pair<Integer, String> httpDetailsGet = restManager.get(urlGet, username, password, headers);
-            if (httpDetailsGet == null) {
-                logger.info("AAI GET Null Response to {}", urlGet);
-                return null;
-            }
-
-            int httpResponseCode = httpDetailsGet.first;
-
-            logger.info(urlGet);
-            logger.info("{}", httpResponseCode);
-            logger.info(httpDetailsGet.second);
-
-            if (httpResponseCode == 200) {
-                T responseGet = composeResponse(httpDetailsGet, urlGet, classOfResponse);
-                if (responseGet != null) {
-                    return responseGet;
-                }
-            }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-
-        }
-
-        return null;
-    }
 
     /**
      * Create the headers for the HTTP request.
@@ -371,28 +235,6 @@ public final class AaiManager {
     }
 
     /**
-     * This method uses Google's GSON to create a response object from a JSON string.
-     *
-     * @param <T> the generic type
-     * @param httpDetails the HTTP response
-     * @param url the URL from which the response came
-     * @param classOfResponse The response class
-     * @return an instance of the response class
-     * @throws JsonSyntaxException on GSON errors instantiating the response
-     */
-    private <T> T composeResponse(final Pair<Integer, String> httpDetails, final String url,
-            final Class<T> classOfResponse) {
-        try {
-            T response = Serialization.gsonPretty.fromJson(httpDetails.second, classOfResponse);
-            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, httpDetails.second);
-            return response;
-        } catch (JsonSyntaxException e) {
-            logger.error("postQuery threw: ", e);
-            return null;
-        }
-    }
-
-    /**
      * Perform a GET request for a particular PNF by PNF ID towards A&AI.
      *
      * @param url the A&AI URL
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java
deleted file mode 100644
index 851c4f6af..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqCloudRegion implements Serializable {
-
-    private static final long serialVersionUID = -897231529157222683L;
-
-    @SerializedName("cloud-owner")
-    private String cloudOwner;
-
-    @SerializedName("cloud-region-id")
-    private String cloudRegionId;
-
-    @SerializedName("cloud-region-version")
-    private String cloudRegionVersion;
-
-    @SerializedName("complex-name")
-    private String complexName;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java
deleted file mode 100644
index f33d10ca9..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqExtraProperties implements Serializable {
-    private static final long serialVersionUID = 4109625574744702319L;
-
-    @SerializedName("extra-property")
-    private List<AaiNqExtraProperty> extraProperty = new LinkedList<>();
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java
deleted file mode 100644
index acab811d0..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AaiNqExtraProperty implements Serializable {
-
-    private static final long serialVersionUID = -3861240617222397736L;
-
-    @SerializedName("property-name")
-    private String propertyName;
-
-    @SerializedName("property-value")
-    private String propertyValue;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java
deleted file mode 100644
index 72b27779f..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqGenericVnf implements Serializable {
-
-    private static final long serialVersionUID = 834322706248060560L;
-
-    @SerializedName("vnf-id")
-    private String vnfId;
-
-    @SerializedName("vnf-name")
-    private String vnfName;
-
-    @SerializedName("vnf-name2")
-    private String vnfName2;
-
-    @SerializedName("vnf-type")
-    private String vnfType;
-
-    @SerializedName("service-id")
-    private String serviceId;
-
-    @SerializedName("prov-status")
-    private String provStatus;
-
-    @SerializedName("operational-state")
-    private String operationalState;
-
-    @SerializedName("ipv4-oam-address")
-    private String ipv4OamAddress;
-
-    @SerializedName("ipv4-loopback0-address")
-    private String ipv4Loopback0Address;
-
-    @SerializedName("in-maint")
-    private Boolean inMaint;
-
-    @SerializedName("is-closed-loop-disabled")
-    private Boolean isClosedLoopDisabled;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-
-    @SerializedName("encrypted-access-flag")
-    private Boolean encrypedAccessFlag;
-
-    @SerializedName("persona-model-id")
-    private String personaModelId;
-
-    @SerializedName("persona-model-version")
-    private String personaModelVersion;
-
-    @SerializedName("model-invariant-id")
-    private String modelInvariantId;
-
-    @SerializedName("model-version-id")
-    private String modelVersionId;
-
-    @SerializedName("model-customization-id")
-    private String modelCustomizationId = null;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java
deleted file mode 100644
index 90e0668b4..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqInstanceFilters implements Serializable {
-
-    private static final long serialVersionUID = 8993824591338121185L;
-
-    @SerializedName("instance-filter")
-    private List<Map<String, Map<String, String>>> instanceFilter = new LinkedList<>();
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java
deleted file mode 100644
index 50f101e27..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqInventoryResponseItem implements Serializable {
-
-    private static final long serialVersionUID = 7142072567154675183L;
-
-    @SerializedName("model-name")
-    private String modelName;
-
-    @SerializedName("vf-module")
-    private AaiNqVfModule vfModule;
-
-    @SerializedName("service-instance")
-    private AaiNqServiceInstance serviceInstance;
-
-    @SerializedName("vserver")
-    private AaiNqVServer vserver;
-
-    @SerializedName("tenant")
-    private AaiNqTenant tenant;
-
-    @SerializedName("cloud-region")
-    private AaiNqCloudRegion cloudRegion;
-
-    @SerializedName("generic-vnf")
-    private AaiNqGenericVnf genericVnf;
-
-    @SerializedName("extra-properties")
-    private AaiNqExtraProperties extraProperties;
-
-    @SerializedName("inventory-response-items")
-    private AaiNqInventoryResponseItems items;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java
deleted file mode 100644
index 51b3e9067..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqInventoryResponseItems implements Serializable {
-    private static final long serialVersionUID = 7602807659381179004L;
-
-    @SerializedName("inventory-response-item")
-    private List<AaiNqInventoryResponseItem> inventoryResponseItems = new LinkedList<>();
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java
deleted file mode 100644
index 3847dcf6e..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.UUID;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqNamedQuery implements Serializable {
-    private static final long serialVersionUID = -3277980060302645333L;
-
-    @SerializedName("named-query-uuid")
-    private UUID namedQueryUuid;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java
deleted file mode 100644
index 873f836eb..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqQueryParameters implements Serializable {
-    private static final long serialVersionUID = -4291227193197126982L;
-
-    @SerializedName("named-query")
-    private AaiNqNamedQuery namedQuery;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java
deleted file mode 100644
index d99244782..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqRequest implements Serializable {
-    private static final long serialVersionUID = -3283942659786236032L;
-
-    @SerializedName("query-parameters")
-    private AaiNqQueryParameters queryParameters;
-
-    @SerializedName("instance-filters")
-    private AaiNqInstanceFilters instanceFilters;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java
deleted file mode 100644
index c4222b422..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqRequestError implements Serializable {
-    private static final long serialVersionUID = -7742674155387022932L;
-
-    @SerializedName("serviceException")
-    private AaiNqServiceExcept serviceExcept;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java
deleted file mode 100644
index 3c42a0d96..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqResponse implements Serializable {
-    private static final long serialVersionUID = 8411407444051746101L;
-
-    @SerializedName("inventory-response-item")
-    private List<AaiNqInventoryResponseItem> inventoryResponseItems = new LinkedList<>();
-
-    @SerializedName("requestError")
-    private AaiNqRequestError requestError;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponseWrapper.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponseWrapper.java
deleted file mode 100644
index 68d07270a..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponseWrapper.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AaiNqResponseWrapper implements Serializable {
-    private static final long serialVersionUID = 8411407444051746101L;
-    
-    private static final Logger logger = LoggerFactory.getLogger(AaiNqResponseWrapper.class);
-
-    private static final Pattern VF_MODULE_NAME_PAT = Pattern.compile("(.*_)(\\d+)");
-
-    private UUID requestId;
-    private AaiNqResponse aaiNqResponse;
-
-    public AaiNqResponseWrapper() {}
-
-    public AaiNqResponseWrapper(UUID requestId, AaiNqResponse aaiNqResponse) {
-        this.requestId = requestId;
-        this.aaiNqResponse = aaiNqResponse;
-    }
-
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(UUID requestId) {
-        this.requestId = requestId;
-    }
-
-    public AaiNqResponse getAaiNqResponse() {
-        return aaiNqResponse;
-    }
-
-    public void setAaiNqResponse(AaiNqResponse aaiNqResponse) {
-        this.aaiNqResponse = aaiNqResponse;
-    }
-
-    /**
-     * Counts the number of VF modules, if any, in the response.
-     *
-     * @return the number of VF modules, or {@code 0} if there are none
-     */
-    public int countVfModules() {
-        return getVfModuleItems(false).size();
-    }
-
-    /**
-     * Generates the name for the next VF module.
-     *
-     * @return the name of the next VF module, or {@code null} if the name could not be
-     *         generated (i.e., because the response has no matching VF module names on
-     *         which to model it)
-     */
-    public String genVfModuleName() {
-        /*
-         * Loop through the VF modules, extracting the name prefix and the largest number
-         * suffix
-         */
-        String prefix = null;
-        int maxSuffix = -1;
-
-        for (AaiNqInventoryResponseItem item : getVfModuleItems(false)) {
-            String name = item.getVfModule().getVfModuleName();
-            Matcher matcher = VF_MODULE_NAME_PAT.matcher(name);
-            if (matcher.matches()) {
-                int suffix = Integer.parseInt(matcher.group(2));
-                if (suffix > maxSuffix) {
-                    maxSuffix = suffix;
-                    prefix = matcher.group(1);
-                }
-            }
-        }
-
-        ++maxSuffix;
-
-        return (prefix == null ? null : prefix + maxSuffix);
-    }
-
-    /**
-     * Gets a list of VF modules. If the non-base VF modules are requested, then only
-     * those whose names match the name pattern, {@link #VF_MODULE_NAME_PAT}, are
-     * returned.
-     *
-     * @param wantBaseModule {@code true} if the the base VF module(s) is desired,
-     *        {@code false} otherwise
-     * @return the list of VF module items
-     */
-    public List<AaiNqInventoryResponseItem> getVfModuleItems(boolean wantBaseModule) {
-        // get the list of items
-        List<AaiNqInventoryResponseItem> itemList;
-        try {
-            itemList = aaiNqResponse.getInventoryResponseItems().get(0).getItems().getInventoryResponseItems().get(0)
-                            .getItems().getInventoryResponseItems();
-
-        } catch (NullPointerException | IndexOutOfBoundsException e) {
-            logger.debug("no VF modules in AAI response", e);
-            return Collections.emptyList();
-        }
-
-        if (itemList == null) {
-            return Collections.emptyList();
-        }
-
-        /*
-         * Walk the items looking for VF modules, allocating the list only when an item is
-         * found.
-         */
-        List<AaiNqInventoryResponseItem> vfModuleItems = new ArrayList<>(itemList.size());
-
-        for (AaiNqInventoryResponseItem inventoryResponseItem : itemList) {
-            AaiNqVfModule vfmod = inventoryResponseItem.getVfModule();
-            if (vfmod == null) {
-                continue;
-            }
-
-            if (vfmod.getIsBaseVfModule() == wantBaseModule
-                            && (wantBaseModule || VF_MODULE_NAME_PAT.matcher(vfmod.getVfModuleName()).matches())) {
-                vfModuleItems.add(inventoryResponseItem);
-            }
-        }
-
-        return vfModuleItems;
-    }
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java
deleted file mode 100644
index 27751e776..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqServiceExcept implements Serializable {
-    private static final long serialVersionUID = 2858343404484338546L;
-
-    @SerializedName("messageId")
-    private String messageId;
-
-    @SerializedName("text")
-    private String text;
-
-    @SerializedName("variables")
-    private String[] variables;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java
deleted file mode 100644
index 79213c354..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqServiceInstance implements Serializable {
-    private static final long serialVersionUID = -8000944396593889586L;
-
-    @SerializedName("service-instance-id")
-    private String serviceInstanceId;
-
-    @SerializedName("service-instance-name")
-    private String serviceInstanceName;
-
-    @SerializedName("persona-model-id")
-    private String personaModelId;
-
-    @SerializedName("persona-model-version")
-    private String personaModelVersion;
-
-    @SerializedName("service-instance-location-id")
-    private String serviceInstanceLocationId;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-
-    @SerializedName("model-invariant-id")
-    private String modelInvariantId;
-
-    @SerializedName("model-version-id")
-    private String modelVersionId;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java
deleted file mode 100644
index 5e68f4109..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqTenant implements Serializable {
-    private static final long serialVersionUID = 4702784101671984364L;
-
-    @SerializedName("tenant-id")
-    private String tenantId;
-
-    @SerializedName("tenant-name")
-    private String tenantName;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java
deleted file mode 100644
index 68917137c..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqVServer implements Serializable {
-    private static final long serialVersionUID = -6718526692734215643L;
-
-    @SerializedName("vserver-id")
-    private String vserverId;
-
-    @SerializedName("vserver-name")
-    private String vserverName;
-
-    @SerializedName("vserver-name2")
-    private String vserverName2;
-
-    @SerializedName("prov-status")
-    private String provStatus;
-
-    @SerializedName("vserver-selflink")
-    private String vserverSelflink;
-
-    @SerializedName("in-maint")
-    private Boolean inMaint;
-
-    @SerializedName("is-closed-loop-disabled")
-    private Boolean isClosedLoopDisabled;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-
-    @SerializedName("relationship-list")
-    private RelationshipList relationshipList;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java
deleted file mode 100644
index ce38a3e3b..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AaiNqVfModule implements Serializable {
-    private static final long serialVersionUID = 8019133081429638232L;
-
-    @SerializedName("vf-module-id")
-    private String vfModuleId;
-
-    @SerializedName("vf-module-name")
-    private String vfModuleName;
-
-    @SerializedName("heat-stack-id")
-    private String heatStackId;
-
-    @SerializedName("orchestration-status")
-    private String orchestrationStatus;
-
-    @SerializedName("is-base-vf-module")
-    private Boolean isBaseVfModule;
-
-    @SerializedName("resource-version")
-    private String resourceVersion;
-
-    @SerializedName("persona-model-id")
-    private String personaModelId;
-
-    @SerializedName("persona-model-version")
-    private String personaModelVersion;
-
-    @SerializedName("widget-model-id")
-    private String widgetModelId;
-
-    @SerializedName("widget-model-version")
-    private String widgetModelVersion;
-
-    @SerializedName("contrail-service-instance-fqdn")
-    private String contrailServiceInstanceFqdn;
-
-    @SerializedName("model-invariant-id")
-    private String modelInvariantId;
-
-    @SerializedName("model-version-id")
-    private String modelVersionId;
-
-    @SerializedName("model-customization-id")
-    private String modelCustomizationId = null;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java
deleted file mode 100644
index ae6b97970..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class Pnf implements Serializable {
-    private static final long serialVersionUID = -3535108358668248501L;
-
-    private String pnfName;
-    private PnfType pnfType;
-
-    public Pnf(Pnf pnf) {
-        this.pnfName = pnf.pnfName;
-        this.pnfType = pnf.pnfType;
-    }
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java
deleted file mode 100644
index 6a7ad83c5..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class PnfInstance implements Serializable {
-
-    private static final long serialVersionUID = -3694152433472165034L;
-
-    private String pnfName;
-    private String pnfInstanceName;
-    private PnfType pnfType;
-    private String pnfSerial;
-
-    /**
-     * Create an instance from a given instance.
-     *
-     * @param instance the instance
-     */
-    public PnfInstance(PnfInstance instance) {
-        if (instance == null) {
-            return;
-        }
-        this.pnfName = instance.pnfName;
-        this.pnfInstanceName = instance.pnfInstanceName;
-        this.pnfType = instance.pnfType;
-        this.pnfSerial = instance.pnfSerial;
-    }
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfType.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfType.java
deleted file mode 100644
index a549d7b9d..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-public enum PnfType {
-    ENODEB("eNodeB"), PSERVER("pserver");
-
-    private String type;
-
-    private PnfType(String type) {
-        this.type = type;
-    }
-
-    @Override
-    public String toString() {
-        return this.type;
-    }
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
deleted file mode 100644
index f65b642ed..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class RelatedToProperty implements Serializable {
-    private static final long serialVersionUID = 5644372985092588638L;
-
-    @SerializedName("property-key")
-    private String propertyKey;
-    @SerializedName("property-value")
-    private String propertyValue;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
deleted file mode 100644
index 78421b0f2..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class Relationship implements Serializable {
-    private static final long serialVersionUID = -68508443869003055L;
-
-    @SerializedName("related-to")
-    private String relatedTo;
-
-    @SerializedName("related-link")
-    private String relatedLink;
-
-    @SerializedName("relationship-data")
-    private List<RelationshipData> relationshipData = new LinkedList<>();
-
-    @SerializedName("related-to-property")
-    private List<RelatedToProperty> relatedToProperty = new LinkedList<>();
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
deleted file mode 100644
index 9119bf6ac..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class RelationshipData implements Serializable {
-    private static final long serialVersionUID = 550450041634939768L;
-
-    @SerializedName("relationship-key")
-    private String relationshipKey;
-    @SerializedName("relationship-value")
-    private String relationshipValue;
-}
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
deleted file mode 100644
index 91bc32844..000000000
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017-2019 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class RelationshipList implements Serializable {
-    private static final long serialVersionUID = 6115655704973981990L;
-
-    @SerializedName("relationship")
-    private List<Relationship> relationships = new LinkedList<>();
-}