aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/eventmanager/src
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-08-10 18:16:21 -0400
committerJim Hahn <jrh3@att.com>2018-08-14 12:07:09 -0400
commit71aacf6cf96b35020937aefc799122ab695f2a31 (patch)
treef999168e8f5dd1dc7685bad0761529180de05930 /controlloop/common/eventmanager/src
parentb88421e9bc12e96894bd59950efc1312a3f15b7b (diff)
update AAI response classes per API
Several of the AAI response classes did not match the new AAI interface. Updated AaiGetVnfResponse and AaiGetVserverResponse and the classes they use to reflect the new API; other top-level classes were left untouched. Fix checkstyle errors. Change-Id: Ife5830c45ba8aece8d676a10f0fd8a9c9fe6cb66 Issue-ID: POLICY-964 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/eventmanager/src')
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java26
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java87
2 files changed, 51 insertions, 62 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index fa608ca08..2c1b6f628 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -26,11 +26,13 @@ import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
+import java.util.List;
import java.util.UUID;
import org.onap.policy.aai.AaiGetVnfResponse;
import org.onap.policy.aai.AaiGetVserverResponse;
import org.onap.policy.aai.AaiManager;
+import org.onap.policy.aai.AaiNqVServer;
import org.onap.policy.aai.util.AaiException;
import org.onap.policy.controlloop.ControlLoopEventStatus;
import org.onap.policy.controlloop.ControlLoopException;
@@ -708,12 +710,8 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
throw new AaiException("AAI Responded with a request error (query by " + queryTypeString + ")");
}
- if (aaiResponse.getIsClosedLoopDisabled() != null) {
- String value = aaiResponse.getIsClosedLoopDisabled();
- if ("true".equalsIgnoreCase(value) || "T".equalsIgnoreCase(value) || "yes".equalsIgnoreCase(value)
- || "Y".equalsIgnoreCase(value)) {
- throw new AaiException("is-closed-loop-disabled is set to true (query by " + queryTypeString + ")");
- }
+ if (aaiResponse.getIsClosedLoopDisabled()) {
+ throw new AaiException("is-closed-loop-disabled is set to true (query by " + queryTypeString + ")");
}
}
@@ -724,13 +722,15 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
if (aaiResponse.getRequestError() != null) {
throw new AaiException("AAI responded with a request error (query by vserver-name)");
}
-
- if (aaiResponse.getIsClosedLoopDisabled() != null) {
- String value = aaiResponse.getIsClosedLoopDisabled();
- if ("true".equalsIgnoreCase(value) || "T".equalsIgnoreCase(value) || "yes".equalsIgnoreCase(value)
- || "Y".equalsIgnoreCase(value)) {
- throw new AaiException("is-closed-loop-disabled is set to true (query by vserver-name)");
- }
+
+ List<AaiNqVServer> lst = aaiResponse.getVserver();
+ if(lst.isEmpty()) {
+ return;
+ }
+
+ AaiNqVServer svr = lst.get(0);
+ if (svr.getIsClosedLoopDisabled()) {
+ throw new AaiException("is-closed-loop-disabled is set to true (query by vserver-name)");
}
}
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
index 711848167..37558474a 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -34,18 +33,16 @@ import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.HashMap;
import java.util.UUID;
-
import org.apache.commons.io.IOUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.AaiGetVnfResponse;
import org.onap.policy.aai.AaiGetVserverResponse;
+import org.onap.policy.aai.AaiNqVServer;
import org.onap.policy.aai.RelatedToProperty;
-import org.onap.policy.aai.RelatedToPropertyItem;
import org.onap.policy.aai.Relationship;
import org.onap.policy.aai.RelationshipData;
-import org.onap.policy.aai.RelationshipDataItem;
import org.onap.policy.aai.RelationshipList;
import org.onap.policy.aai.util.AaiException;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
@@ -308,43 +305,39 @@ public class ControlLoopEventManagerTest {
response.setVnfType("Basa-122216-Service/VidVsamp12BaseVolume 1");
response.setServiceId("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
response.setOrchestrationStatus("Created");
- response.setInMaint("false");
- response.setIsClosedLoopDisabled("false");
+ response.setInMaint(false);
+ response.setIsClosedLoopDisabled(false);
response.setResourceVersion("1494001988835");
response.setModelInvariantId("f18be3cd-d446-456e-9109-121d9b62feaa");
final RelationshipList relationshipList = new RelationshipList();
final Relationship relationship = new Relationship();
- RelationshipData relationshipData = new RelationshipData();
- RelationshipDataItem relationshipDataItem = new RelationshipDataItem();
+ RelationshipData relationshipDataItem = new RelationshipData();
relationshipDataItem.setRelationshipKey("customer.global-customer-id");
relationshipDataItem.setRelationshipValue("MSO_1610_ST");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.setRelationshipKey("service-subscription.service-type");
relationshipDataItem.setRelationshipValue("MSO-dev-service-type");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.setRelationshipKey("service-instance.service-instance-id");
relationshipDataItem.setRelationshipValue("e1e9c97c-02c0-4919-9b4c-eb5d5ef68970");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
- RelatedToProperty relatedToProperty = new RelatedToProperty();
- RelatedToPropertyItem item = new RelatedToPropertyItem();
+ RelatedToProperty item = new RelatedToProperty();
item.setPropertyKey("service-instance.service-instance-name");
item.setPropertyValue("lll_svc_010317");
- relatedToProperty.getRelatedTo().add(item);
+ relationship.getRelatedToProperty().add(item);
relationship.setRelatedTo("service-instance");
relationship.setRelatedLink(
"/aai/v11/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription"
+ "/MSO-dev-service-type/service-instances/service-instance/"
+ "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970");
- relationship.setRelationshipData(relationshipData);
- relationship.setRelatedToProperty(relatedToProperty);
- relationshipList.getRelationshipList().add(relationship);
+ relationshipList.getRelationships().add(relationship);
response.setRelationshipList(relationshipList);
return response;
@@ -362,43 +355,39 @@ public class ControlLoopEventManagerTest {
response.setVnfType("Basa-122216-Service/VidVsamp12BaseVolume 1");
response.setServiceId("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
response.setOrchestrationStatus("Created");
- response.setInMaint("false");
- response.setIsClosedLoopDisabled("false");
+ response.setInMaint(false);
+ response.setIsClosedLoopDisabled(false);
response.setResourceVersion("1494001988835");
response.setModelInvariantId("f18be3cd-d446-456e-9109-121d9b62feaa");
final RelationshipList relationshipList = new RelationshipList();
final Relationship relationship = new Relationship();
- RelationshipData relationshipData = new RelationshipData();
- RelationshipDataItem relationshipDataItem = new RelationshipDataItem();
+ RelationshipData relationshipDataItem = new RelationshipData();
relationshipDataItem.setRelationshipKey("customer.global-customer-id");
relationshipDataItem.setRelationshipValue("MSO_1610_ST");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.setRelationshipKey("service-subscription.service-type");
relationshipDataItem.setRelationshipValue("MSO-dev-service-type");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.setRelationshipKey("service-instance.service-instance-id");
relationshipDataItem.setRelationshipValue("e1e9c97c-02c0-4919-9b4c-eb5d5ef68970");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
- RelatedToProperty relatedToProperty = new RelatedToProperty();
- RelatedToPropertyItem item = new RelatedToPropertyItem();
+ RelatedToProperty item = new RelatedToProperty();
item.setPropertyKey("service-instance.service-instance-name");
item.setPropertyValue("lll_svc_010317");
- relatedToProperty.getRelatedTo().add(item);
+ relationship.getRelatedToProperty().add(item);
relationship.setRelatedTo("service-instance");
relationship.setRelatedLink(
"/aai/v11/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription"
+ "/MSO-dev-service-type/service-instances/service-instance/"
+ "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970");
- relationship.setRelationshipData(relationshipData);
- relationship.setRelatedToProperty(relatedToProperty);
- relationshipList.getRelationshipList().add(relationship);
+ relationshipList.getRelationships().add(relationship);
response.setRelationshipList(relationshipList);
return response;
@@ -410,49 +399,49 @@ public class ControlLoopEventManagerTest {
public static AaiGetVserverResponse getQueryByVserverName2(String urlGet, String username, String password,
UUID requestId, String key) {
AaiGetVserverResponse response = new AaiGetVserverResponse();
+
+ AaiNqVServer svr = new AaiNqVServer();
- response.setVserverId("d0668d4f-c25e-4a1b-87c4-83845c01efd8");
- response.setVserverName("USMSO1SX7NJ0103UJZZ01-vjunos0");
- response.setVserverName2("vjunos0");
- response.setVserverSelflink(
+ svr.setVserverId("d0668d4f-c25e-4a1b-87c4-83845c01efd8");
+ svr.setVserverName("USMSO1SX7NJ0103UJZZ01-vjunos0");
+ svr.setVserverName2("vjunos0");
+ svr.setVserverSelflink(
"https://aai-ext1.test.att.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/USMSO1SX7NJ0103UJZZ01%3A%3AuCPE-VMS/vservers/vserver/d0668d4f-c25e-4a1b-87c4-83845c01efd8");
- response.setInMaint("false");
- response.setIsClosedLoopDisabled("false");
- response.setResourceVersion("1494001931513");
+ svr.setInMaint(false);
+ svr.setIsClosedLoopDisabled(false);
+ svr.setResourceVersion("1494001931513");
final RelationshipList relationshipList = new RelationshipList();
final Relationship relationship = new Relationship();
- RelationshipData relationshipData = new RelationshipData();
- RelationshipDataItem relationshipDataItem = new RelationshipDataItem();
+ RelationshipData relationshipDataItem = new RelationshipData();
relationshipDataItem.setRelationshipKey("customer.global-customer-id");
relationshipDataItem.setRelationshipValue("MSO_1610_ST");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.setRelationshipKey("service-subscription.service-type");
relationshipDataItem.setRelationshipValue("MSO-dev-service-type");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.setRelationshipKey("service-instance.service-instance-id");
relationshipDataItem.setRelationshipValue("e1e9c97c-02c0-4919-9b4c-eb5d5ef68970");
- relationshipData.getRelationshipData().add(relationshipDataItem);
+ relationship.getRelationshipData().add(relationshipDataItem);
- RelatedToProperty relatedToProperty = new RelatedToProperty();
- RelatedToPropertyItem item = new RelatedToPropertyItem();
+ RelatedToProperty item = new RelatedToProperty();
item.setPropertyKey("service-instance.service-instance-name");
item.setPropertyValue("lll_svc_010317");
- relatedToProperty.getRelatedTo().add(item);
+ relationship.getRelatedToProperty().add(item);
relationship.setRelatedTo("service-instance");
relationship.setRelatedLink(
"/aai/v11/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription"
+ "/MSO-dev-service-type/service-instances/service-instance/"
+ "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970");
- relationship.setRelationshipData(relationshipData);
- relationship.setRelatedToProperty(relatedToProperty);
- relationshipList.getRelationshipList().add(relationship);
- response.setRelationshipList(relationshipList);
+ relationshipList.getRelationships().add(relationship);
+ svr.setRelationshipList(relationshipList);
+
+ response.getVserver().add(svr);
return response;
}