summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2017-09-27 17:54:23 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-27 17:54:23 +0000
commit817bd6c46fabe57a9622cafcad88c9a3d087f8e3 (patch)
tree5caa075ad00f60589a739486bb54fad31878546d
parent3f326bcd2490258b3cdd0fbcc27dfe36ba27fc7c (diff)
parent48fd5399abb123cc1d74a625f0a1d4d2ff3005af (diff)
Merge "Create common object to consolidate AAI response"
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199CloudRegion.java51
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperties.java42
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperty.java48
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199GenericVNF.java85
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InstanceFilters.java43
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItem.java64
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItems.java42
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java116
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199NamedQuery.java41
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199QueryParameters.java40
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Request.java65
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199RequestWrapper.java39
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Response.java43
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ResponseWrapper.java40
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ServiceInstance.java55
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Tenant.java45
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java61
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VfModule.java69
-rw-r--r--controlloop/templates/template.demo.v1.0.0/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java4
19 files changed, 2 insertions, 991 deletions
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199CloudRegion.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199CloudRegion.java
deleted file mode 100644
index 4c80c4a41..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199CloudRegion.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199CloudRegion implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -897231529157222683L;
-
- @SerializedName("cloud-owner")
- public String cloudOwner;
-
- @SerializedName("cloud-region-id")
- public String cloudRegionId;
-
- @SerializedName("cloud-region-version")
- public String cloudRegionVersion;
-
- @SerializedName("complex-name")
- public String complexName;
-
- @SerializedName("resource-version")
- public String resourceVersion;
-
- public AAINQF199CloudRegion() {
- }
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperties.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperties.java
deleted file mode 100644
index ca5863a46..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperties.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199ExtraProperties implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 4109625574744702319L;
-
- @SerializedName("extra-property")
- public List<AAINQF199ExtraProperty> extraProperty = new LinkedList<AAINQF199ExtraProperty>();
-
- public AAINQF199ExtraProperties() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperty.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperty.java
deleted file mode 100644
index 7280ff9bc..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ExtraProperty.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199ExtraProperty implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -3861240617222397736L;
-
- @SerializedName("property-name")
- public String propertyName;
-
- @SerializedName("property-value")
- public String propertyValue;
-
- public AAINQF199ExtraProperty() {
- }
-
- public AAINQF199ExtraProperty(String propertyName, String propertyValue) {
- this.propertyName = propertyName;
- this.propertyValue = propertyValue;
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199GenericVNF.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199GenericVNF.java
deleted file mode 100644
index eb19ad95e..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199GenericVNF.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199GenericVNF implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 834322706248060559L;
-
- @SerializedName("vnf-id")
- public String vnfID;
-
- @SerializedName("vnf-name")
- public String vnfName;
-
- @SerializedName("vnf-name2")
- public String vnfName2;
-
- @SerializedName("vnf-type")
- public String vnfType;
-
- @SerializedName("service-id")
- public String serviceId;
-
- @SerializedName("prov-status")
- public String provStatus;
-
- @SerializedName("operational-state")
- public String operationalState;
-
- @SerializedName("ipv4-oam-address")
- public String ipv4OamAddress;
-
- @SerializedName("ipv4-loopback0-address")
- public String ipv4Loopback0Address;
-
- @SerializedName("in-maint")
- public Boolean inMaint;
-
- @SerializedName("is-closed-loop-disabled")
- public Boolean isClosedLoopDisabled;
-
- @SerializedName("resource-version")
- public String resourceVersion;
-
- @SerializedName("encrypted-access-flag")
- public Boolean encrypedAccessFlag;
-
- @SerializedName("persona-model-id")
- public String personaModelId;
-
- @SerializedName("persona-model-version")
- public String personaModelVersion;
-
- @SerializedName("model-invariant-id")
- public String modelInvariantId;
-
- public AAINQF199GenericVNF() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InstanceFilters.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InstanceFilters.java
deleted file mode 100644
index 80ab73d74..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InstanceFilters.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199InstanceFilters implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 8993824591338121185L;
-
- @SerializedName("instance-filter")
- public List<Map<String, Map<String, String>>> instanceFilter = new LinkedList<Map<String, Map<String, String>>>();
-
- public AAINQF199InstanceFilters() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItem.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItem.java
deleted file mode 100644
index d896c931b..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItem.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199InventoryResponseItem implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 7142072567154675183L;
-
- @SerializedName("model-name")
- public String modelName;
-
- @SerializedName("vf-module")
- public AAINQF199VfModule vfModule;
-
- @SerializedName("service-instance")
- public AAINQF199ServiceInstance serviceInstance;
-
- @SerializedName("vserver")
- public AAINQF199VServer vserver;
-
- @SerializedName("tenant")
- public AAINQF199Tenant tenant;
-
- @SerializedName("cloud-region")
- public AAINQF199CloudRegion cloudRegion;
-
- @SerializedName("generic-vnf")
- public AAINQF199GenericVNF genericVNF;
-
- @SerializedName("extra-properties")
- public AAINQF199ExtraProperties extraProperties;
-
- @SerializedName("inventory-response-items")
- public AAINQF199InventoryResponseItems items;
-
- public AAINQF199InventoryResponseItem() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItems.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItems.java
deleted file mode 100644
index d3d17093f..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199InventoryResponseItems.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199InventoryResponseItems implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 7602807659381179004L;
-
- @SerializedName("inventory-response-item")
- public List<AAINQF199InventoryResponseItem> inventoryResponseItems = new LinkedList<AAINQF199InventoryResponseItem>();
-
- public AAINQF199InventoryResponseItems() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java
deleted file mode 100644
index 00f62cf10..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.onap.policy.aai.AAIGETResponse;
-import org.onap.policy.aai.util.Serialization;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.gson.JsonSyntaxException;
-
-public final class AAINQF199Manager {
- private static final Logger logger = LoggerFactory.getLogger(AAINQF199Manager.class);
-
- public static AAINQF199Response postQuery(String url, String username, String password, AAINQF199Request request, UUID requestID) {
-
- Map<String, String> headers = new HashMap<>();
- headers.put("X-FromAppId", "POLICY");
- headers.put("X-TransactionId", requestID.toString());
- headers.put("Accept", "application/json");
-
- url = url + "/aai/search/named-query";
-
- Pair<Integer, String> httpDetails = RESTManager.post(url, username, password, headers, "application/json", Serialization.gsonPretty.toJson(request));
-
- logger.debug("Performing AAI POST to " + url + "\nSending: \n" + Serialization.gsonPretty.toJson(request) + "END");
-
- if (httpDetails == null) {
- logger.debug("AAI POST - Null Response from {}", url);
- return null;
- }
-
- logger.debug(url);
- logger.debug("{}", httpDetails.a);
- logger.debug("{}", httpDetails.b);
- if (httpDetails.a == 200) {
- try {
- AAINQF199Response response = Serialization.gsonPretty.fromJson(httpDetails.b, AAINQF199Response.class);
- return response;
- } catch (JsonSyntaxException e) {
- logger.error("postQuery threw: ", e);
- }
- }
-
- return null;
- }
-
- public static AAIGETResponse getQuery(String urlGet, String username, String password, UUID requestID, String vnfId) {
-
- Map<String, String> headers = new HashMap<>();
- headers.put("X-FromAppId", "POLICY");
- headers.put("X-TransactionId", requestID.toString());
- headers.put("Accept", "application/json");
-
- urlGet = urlGet + "/aai/v8/network/generic-vnfs/generic-vnf/" + vnfId;
-
- int attemptsLeft = 3;
- AAIGETResponse responseGet = null;
-
- while(attemptsLeft-- > 0){
-
- Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
- if (httpDetailsGet == null) {
- logger.debug("AAI GET Null Response to {}", urlGet);
- return null;
- }
-
- logger.debug(urlGet);
- logger.debug("{}", httpDetailsGet.a);
- logger.debug("{}", httpDetailsGet.b);
-
- if (httpDetailsGet.a == 200) {
- try {
- responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, AAIGETResponse.class);
- return responseGet;
- } catch (JsonSyntaxException e) {
- logger.error("getQuery threw: ", e);
- }
- }
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- logger.error(e.getMessage());
- Thread.currentThread().interrupt();
- }
-
- }
-
- return null;
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199NamedQuery.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199NamedQuery.java
deleted file mode 100644
index 922d67f39..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199NamedQuery.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199NamedQuery implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -3277980060302645333L;
-
- @SerializedName("named-query-uuid")
- public UUID namedQueryUUID;
-
- public AAINQF199NamedQuery() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199QueryParameters.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199QueryParameters.java
deleted file mode 100644
index 8812a2483..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199QueryParameters.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199QueryParameters implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -4291227193197126982L;
-
- @SerializedName("named-query")
- public AAINQF199NamedQuery namedQuery;
-
- public AAINQF199QueryParameters() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Request.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Request.java
deleted file mode 100644
index 0feb6d73b..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Request.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-
-/*
- *
- * {
- "query-parameters": {
- "named-query": {
- "named-query-uuid": "f199cb88-5e69-4b1f-93e0-6f257877d066"
- }
- },
- "instance-filters": {
- "instance-filter": [
- {
- "vserver": {
- "vserver-name": "dfw1lb01lb01"
- }
- }
- ]
- }
-}
-
- *
- */
-
-public class AAINQF199Request implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -3283942659786236032L;
-
- @SerializedName("query-parameters")
- public AAINQF199QueryParameters queryParameters;
- @SerializedName("instance-filters")
- public AAINQF199InstanceFilters instanceFilters;
-
- public AAINQF199Request() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199RequestWrapper.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199RequestWrapper.java
deleted file mode 100644
index fdd630ba8..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199RequestWrapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.util.UUID;
-
-public class AAINQF199RequestWrapper {
-
- public UUID requestID;
- public AAINQF199Request aainqf199request;
-
- public AAINQF199RequestWrapper() {
-
- }
-
- public AAINQF199RequestWrapper(UUID requestID, AAINQF199Request aainqf199request){
- this.requestID = requestID;
- this.aainqf199request = aainqf199request;
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Response.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Response.java
deleted file mode 100644
index bcecc04b9..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Response.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199Response implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 8411407444051746101L;
-
- @SerializedName("inventory-response-item")
- public List<AAINQF199InventoryResponseItem> inventoryResponseItems = new LinkedList<>();
-
- public AAINQF199Response() {
-
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ResponseWrapper.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ResponseWrapper.java
deleted file mode 100644
index d4fe8f86d..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ResponseWrapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.util.UUID;
-
-import org.onap.policy.aai.AAINQF199.AAINQF199Response;
-
-public class AAINQF199ResponseWrapper {
-
- public UUID requestID;
- public AAINQF199Response aainqf199response;
-
- public AAINQF199ResponseWrapper() {
-
- }
-
- public AAINQF199ResponseWrapper(UUID requestID, AAINQF199Response aainqf199response){
- this.requestID = requestID;
- this.aainqf199response = aainqf199response;
- }
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ServiceInstance.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ServiceInstance.java
deleted file mode 100644
index 8aa4a1b2a..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199ServiceInstance.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199ServiceInstance implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -8000944396593889586L;
-
- @SerializedName("service-instance-id")
- public String serviceInstanceID;
-
- @SerializedName("service-instance-name")
- public String serviceInstanceName;
-
- @SerializedName("persona-model-id")
- public String personaModelId;
-
- @SerializedName("persona-model-version")
- public String personaModelVersion;
-
- @SerializedName("service-instance-location-id")
- public String serviceInstanceLocationId;
-
- @SerializedName("resource-version")
- public String resourceVersion;
-
- public AAINQF199ServiceInstance() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Tenant.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Tenant.java
deleted file mode 100644
index 763c052ca..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Tenant.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199Tenant implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 4702784101671984364L;
-
- @SerializedName("tenant-id")
- public String tenantId;
-
- @SerializedName("tenant-name")
- public String tenantName;
-
- @SerializedName("resource-version")
- public String resourceVersion;
-
- public AAINQF199Tenant() {
- }
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java
deleted file mode 100644
index 823dc76a0..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199VServer implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -6718526692734215643L;
-
- @SerializedName("vserver-id")
- public String vserverId;
-
- @SerializedName("vserver-name")
- public String vserverName;
-
- @SerializedName("vserver-name2")
- public String vserverName2;
-
- @SerializedName("prov-status")
- public String provStatus;
-
- @SerializedName("vserver-selflink")
- public String vserverSelflink;
-
- @SerializedName("in-maint")
- public Boolean inMaint;
-
- @SerializedName("is-closed-loop-disabled")
- public Boolean isClosedLoopDisabled;
-
- @SerializedName("resource-version")
- public String resourceVersion;
-
- public AAINQF199VServer() {
- }
-
-}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VfModule.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VfModule.java
deleted file mode 100644
index 50161fb8a..000000000
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VfModule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.aai.AAINQF199;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AAINQF199VfModule implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 8019133081429638231L;
-
- @SerializedName("vf-module-id")
- public String vfModuleId;
-
- @SerializedName("vf-module-name")
- public String vfModuleName;
-
- @SerializedName("heat-stack-id")
- public String heatStackId;
-
- @SerializedName("orchestration-status")
- public String orchestrationStatus;
-
- @SerializedName("is-base-vf-module")
- public Boolean isBaseVfModule;
-
- @SerializedName("resource-version")
- public String resourceVersion;
-
- @SerializedName("persona-model-id")
- public String personaModelId;
-
- @SerializedName("persona-model-version")
- public String personaModelVersion;
-
- @SerializedName("widget-model-id")
- public String widgetModelId;
-
- @SerializedName("widget-model-version")
- public String widgetModelVersion;
-
- @SerializedName("contrail-service-instance-fqdn")
- public String contrailServiceInstanceFqdn;
-
- public AAINQF199VfModule() {
- }
-}
diff --git a/controlloop/templates/template.demo.v1.0.0/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java b/controlloop/templates/template.demo.v1.0.0/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java
index 6f79c6a74..333fde6b2 100644
--- a/controlloop/templates/template.demo.v1.0.0/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java
+++ b/controlloop/templates/template.demo.v1.0.0/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java
@@ -33,8 +33,8 @@ import org.onap.policy.mso.SORequest;
import org.onap.policy.mso.SORequestDetails;
import org.onap.policy.mso.SORequestInfo;
import org.onap.policy.mso.SORequestParameters;
-import org.onap.policy.aai.AAINQF199.AAINQF199Response;
-import org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;
+import org.onap.policy.aai.AAINQResponse;
+import org.onap.policy.aai.AAINQResponseWrapper;
import org.onap.policy.mso.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;