summaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl/aai/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/common/model-impl/aai/src/test')
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java10
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java10
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQExtraPropertiesTest.java10
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemTest.java36
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemsTest.java50
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseTest.java50
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseWrapperTest.java54
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFInstanceTest.java6
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFTest.java4
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelatedToPropertyTest.java4
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipDataTest.java4
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipItemTest.java2
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipListTest.java8
-rw-r--r--controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipTest.java6
14 files changed, 127 insertions, 127 deletions
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java
index e668ca372..534dd4791 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java
@@ -49,28 +49,28 @@ public class AAIGETVnfResponseTest {
relationshipDataItem.relationshipKey = "customer.global-customer-id";
relationshipDataItem.relationshipValue = "MSO_1610_ST";
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.relationshipKey = "service-subscription.service-type";
relationshipDataItem.relationshipValue = "MSO-dev-service-type";
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.relationshipKey = "service-instance.service-instance-id";
relationshipDataItem.relationshipValue = "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970";
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
RelatedToProperty relatedToProperty = new RelatedToProperty();
RelatedToPropertyItem item = new RelatedToPropertyItem();
item.propertyKey = "service-instance.service-instance-name";
item.propertyValue = "lll_svc_010317";
- relatedToProperty.relatedTo.add(item);
+ relatedToProperty.getRelatedTo().add(item);
relationship.relatedTo = "service-instance";
relationship.relatedLink = "/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.relationshipData = relationshipData;
relationship.relatedToProperty = relatedToProperty;
- relationshipList.relationshipList.add(relationship);
+ relationshipList.getRelationshipList().add(relationship);
response.relationshipList = relationshipList;
logger.info(Serialization.gsonPretty.toJson(response));
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java
index 83d2a2682..1221557dd 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java
@@ -47,28 +47,28 @@ public class AAIGETVserverResponseTest {
relationshipDataItem.relationshipKey = "customer.global-customer-id";
relationshipDataItem.relationshipValue = "MSO_1610_ST";
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.relationshipKey = "service-subscription.service-type";
relationshipDataItem.relationshipValue = "MSO-dev-service-type";
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
relationshipDataItem.relationshipKey = "service-instance.service-instance-id";
relationshipDataItem.relationshipValue = "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970";
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
RelatedToProperty relatedToProperty = new RelatedToProperty();
RelatedToPropertyItem item = new RelatedToPropertyItem();
item.propertyKey = "service-instance.service-instance-name";
item.propertyValue = "lll_svc_010317";
- relatedToProperty.relatedTo.add(item);
+ relatedToProperty.getRelatedTo().add(item);
relationship.relatedTo = "service-instance";
relationship.relatedLink = "/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.relationshipData = relationshipData;
relationship.relatedToProperty = relatedToProperty;
- relationshipList.relationshipList.add(relationship);
+ relationshipList.getRelationshipList().add(relationship);
response.relationshipList = relationshipList;
logger.info(Serialization.gsonPretty.toJson(response));
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQExtraPropertiesTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQExtraPropertiesTest.java
index d67f3dd11..148f5df4b 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQExtraPropertiesTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQExtraPropertiesTest.java
@@ -38,11 +38,11 @@ public class AAINQExtraPropertiesTest {
@Test
public void test() {
AAINQExtraProperties aaiNQExtraProperties = new AAINQExtraProperties();
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "service-instance"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "service-instance"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
assertNotNull(aaiNQExtraProperties);
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemTest.java
index ac21a81d8..9dd686409 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemTest.java
@@ -52,12 +52,12 @@ public class AAINQInventoryResponseItemTest {
aaiNQCloudRegion.resourceVersion = "1485365988";
aaiNQInventoryResponseItem.cloudRegion = aaiNQCloudRegion;
AAINQExtraProperties aaiNQExtraProperties = new AAINQExtraProperties();
- aaiNQExtraProperties.extraProperty = new LinkedList<>();
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
- aaiNQExtraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
+ aaiNQExtraProperties.setExtraProperty(new LinkedList<>());
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ aaiNQExtraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
aaiNQInventoryResponseItem.extraProperties = aaiNQExtraProperties;
AAINQGenericVNF aaiNQGenericVNF = new AAINQGenericVNF();
aaiNQGenericVNF.vnfID = "dhv-test-gvnf";
@@ -87,11 +87,11 @@ public class AAINQInventoryResponseItemTest {
serviceItem.serviceInstance.serviceInstanceLocationId = "dhv-test-service-instance-location-id1";
serviceItem.serviceInstance.resourceVersion = "1485366092";
serviceItem.extraProperties = new AAINQExtraProperties();
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "service-instance"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "service-instance"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
AAINQInventoryResponseItem vfModuleItem = new AAINQInventoryResponseItem();
vfModuleItem.modelName = "vf-module";
@@ -108,14 +108,14 @@ public class AAINQInventoryResponseItemTest {
vfModuleItem.vfModule.widgetModelVersion = "example-widget-model-version-val-83317";
vfModuleItem.vfModule.contrailServiceInstanceFqdn = "example-contrail-service-instance-fqdn-val-86796";
vfModuleItem.extraProperties = new AAINQExtraProperties();
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "vf-module"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
- aaiNQInventoryResponseItems.inventoryResponseItems.add(serviceItem);
- aaiNQInventoryResponseItems.inventoryResponseItems.add(vfModuleItem);
+ aaiNQInventoryResponseItems.getInventoryResponseItems().add(serviceItem);
+ aaiNQInventoryResponseItems.getInventoryResponseItems().add(vfModuleItem);
aaiNQInventoryResponseItem.items = aaiNQInventoryResponseItems;
aaiNQInventoryResponseItem.modelName = "model-name";
AAINQServiceInstance serviceInstance = new AAINQServiceInstance();
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemsTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemsTest.java
index 89ce586b6..df6b19959 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemsTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQInventoryResponseItemsTest.java
@@ -54,11 +54,11 @@ public class AAINQInventoryResponseItemsTest {
serviceItem.serviceInstance.serviceInstanceLocationId = "dhv-test-service-instance-location-id1";
serviceItem.serviceInstance.resourceVersion = "1485366092";
serviceItem.extraProperties = new AAINQExtraProperties();
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "service-instance"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "service-instance"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
AAINQInventoryResponseItem vfModuleItem = new AAINQInventoryResponseItem();
vfModuleItem.modelName = "vf-module";
@@ -75,11 +75,11 @@ public class AAINQInventoryResponseItemsTest {
vfModuleItem.vfModule.widgetModelVersion = "example-widget-model-version-val-83317";
vfModuleItem.vfModule.contrailServiceInstanceFqdn = "example-contrail-service-instance-fqdn-val-86796";
vfModuleItem.extraProperties = new AAINQExtraProperties();
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "vf-module"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AAINQInventoryResponseItem genericVNFItem = new AAINQInventoryResponseItem();
genericVNFItem.modelName = "generic-vnf";
@@ -100,16 +100,16 @@ public class AAINQInventoryResponseItemsTest {
genericVNFItem.genericVNF.personaModelId = "acc6edd8-a8d4-4b93-afaa-0994068be14c";
genericVNFItem.genericVNF.personaModelVersion = "1.0";
genericVNFItem.extraProperties = new AAINQExtraProperties();
- genericVNFItem.extraProperties.extraProperty = new LinkedList<>();
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
+ genericVNFItem.extraProperties.setExtraProperty(new LinkedList<>());
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
genericVNFItem.items = new AAINQInventoryResponseItems();
- genericVNFItem.items.inventoryResponseItems = new LinkedList<>();
- genericVNFItem.items.inventoryResponseItems.add(serviceItem);
- genericVNFItem.items.inventoryResponseItems.add(vfModuleItem);
+ genericVNFItem.items.setInventoryResponseItems(new LinkedList<>());
+ genericVNFItem.items.getInventoryResponseItems().add(serviceItem);
+ genericVNFItem.items.getInventoryResponseItems().add(vfModuleItem);
AAINQInventoryResponseItem cloudItem = new AAINQInventoryResponseItem();
cloudItem.cloudRegion = new AAINQCloudRegion();
@@ -125,8 +125,8 @@ public class AAINQInventoryResponseItemsTest {
tenantItem.tenant.tenantName = "dhv-test-tenant-name";
tenantItem.tenant.resourceVersion = "1485366334";
tenantItem.items = new AAINQInventoryResponseItems();
- tenantItem.items.inventoryResponseItems = new LinkedList<>();
- tenantItem.items.inventoryResponseItems.add(cloudItem);
+ tenantItem.items.setInventoryResponseItems(new LinkedList<>());
+ tenantItem.items.getInventoryResponseItems().add(cloudItem);
AAINQInventoryResponseItem vserverItem = new AAINQInventoryResponseItem();
vserverItem.vserver = new AAINQVServer();
vserverItem.vserver.vserverId = "dhv-test-vserver";
@@ -138,10 +138,10 @@ public class AAINQInventoryResponseItemsTest {
vserverItem.vserver.isClosedLoopDisabled = false;
vserverItem.vserver.resourceVersion = "1485366417";
vserverItem.items = new AAINQInventoryResponseItems();
- vserverItem.items.inventoryResponseItems = new LinkedList<>();
- vserverItem.items.inventoryResponseItems.add(genericVNFItem);
- vserverItem.items.inventoryResponseItems.add(tenantItem);
- aaiNQInventoryResponseItems.inventoryResponseItems.add(vserverItem);
+ vserverItem.items.setInventoryResponseItems(new LinkedList<>());
+ vserverItem.items.getInventoryResponseItems().add(genericVNFItem);
+ vserverItem.items.getInventoryResponseItems().add(tenantItem);
+ aaiNQInventoryResponseItems.getInventoryResponseItems().add(vserverItem);
assertNotNull(aaiNQInventoryResponseItems);
logger.info(Serialization.gsonPretty.toJson(aaiNQInventoryResponseItems));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseTest.java
index 6b1b624ef..5e59429c2 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseTest.java
@@ -41,11 +41,11 @@ public class AAINQResponseTest {
serviceItem.serviceInstance.serviceInstanceLocationId = "dhv-test-service-instance-location-id1";
serviceItem.serviceInstance.resourceVersion = "1485366092";
serviceItem.extraProperties = new AAINQExtraProperties();
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "service-instance"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "service-instance"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
AAINQInventoryResponseItem vfModuleItem = new AAINQInventoryResponseItem();
vfModuleItem.modelName = "vf-module";
@@ -62,11 +62,11 @@ public class AAINQResponseTest {
vfModuleItem.vfModule.widgetModelVersion = "example-widget-model-version-val-83317";
vfModuleItem.vfModule.contrailServiceInstanceFqdn = "example-contrail-service-instance-fqdn-val-86796";
vfModuleItem.extraProperties = new AAINQExtraProperties();
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "vf-module"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AAINQInventoryResponseItem genericVNFItem = new AAINQInventoryResponseItem();
genericVNFItem.modelName = "generic-vnf";
@@ -87,16 +87,16 @@ public class AAINQResponseTest {
genericVNFItem.genericVNF.personaModelId = "acc6edd8-a8d4-4b93-afaa-0994068be14c";
genericVNFItem.genericVNF.personaModelVersion = "1.0";
genericVNFItem.extraProperties = new AAINQExtraProperties();
- genericVNFItem.extraProperties.extraProperty = new LinkedList<>();
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
+ genericVNFItem.extraProperties.setExtraProperty(new LinkedList<>());
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
genericVNFItem.items = new AAINQInventoryResponseItems();
- genericVNFItem.items.inventoryResponseItems = new LinkedList<>();
- genericVNFItem.items.inventoryResponseItems.add(serviceItem);
- genericVNFItem.items.inventoryResponseItems.add(vfModuleItem);
+ genericVNFItem.items.setInventoryResponseItems(new LinkedList<>());
+ genericVNFItem.items.getInventoryResponseItems().add(serviceItem);
+ genericVNFItem.items.getInventoryResponseItems().add(vfModuleItem);
AAINQInventoryResponseItem cloudItem = new AAINQInventoryResponseItem();
cloudItem.cloudRegion = new AAINQCloudRegion();
@@ -112,8 +112,8 @@ public class AAINQResponseTest {
tenantItem.tenant.tenantName = "dhv-test-tenant-name";
tenantItem.tenant.resourceVersion = "1485366334";
tenantItem.items = new AAINQInventoryResponseItems();
- tenantItem.items.inventoryResponseItems = new LinkedList<>();
- tenantItem.items.inventoryResponseItems.add(cloudItem);
+ tenantItem.items.setInventoryResponseItems(new LinkedList<>());
+ tenantItem.items.getInventoryResponseItems().add(cloudItem);
AAINQInventoryResponseItem vserverItem = new AAINQInventoryResponseItem();
vserverItem.vserver = new AAINQVServer();
@@ -126,12 +126,12 @@ public class AAINQResponseTest {
vserverItem.vserver.isClosedLoopDisabled = false;
vserverItem.vserver.resourceVersion = "1485366417";
vserverItem.items = new AAINQInventoryResponseItems();
- vserverItem.items.inventoryResponseItems = new LinkedList<>();
- vserverItem.items.inventoryResponseItems.add(genericVNFItem);
- vserverItem.items.inventoryResponseItems.add(tenantItem);
+ vserverItem.items.setInventoryResponseItems(new LinkedList<>());
+ vserverItem.items.getInventoryResponseItems().add(genericVNFItem);
+ vserverItem.items.getInventoryResponseItems().add(tenantItem);
AAINQResponse aaiResponse = new AAINQResponse();
- aaiResponse.inventoryResponseItems.add(vserverItem);
+ aaiResponse.getInventoryResponseItems().add(vserverItem);
logger.info(Serialization.gsonPretty.toJson(aaiResponse));
}
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseWrapperTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseWrapperTest.java
index ae578f00c..9c4bfafa8 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseWrapperTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAINQResponseWrapperTest.java
@@ -55,11 +55,11 @@ public class AAINQResponseWrapperTest {
serviceItem.serviceInstance.serviceInstanceLocationId = "dhv-test-service-instance-location-id1";
serviceItem.serviceInstance.resourceVersion = "1485366092";
serviceItem.extraProperties = new AAINQExtraProperties();
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "service-instance"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
- serviceItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "service-instance"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ serviceItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
AAINQInventoryResponseItem vfModuleItem = new AAINQInventoryResponseItem();
vfModuleItem.modelName = "vf-module";
@@ -76,11 +76,11 @@ public class AAINQResponseWrapperTest {
vfModuleItem.vfModule.widgetModelVersion = "example-widget-model-version-val-83317";
vfModuleItem.vfModule.contrailServiceInstanceFqdn = "example-contrail-service-instance-fqdn-val-86796";
vfModuleItem.extraProperties = new AAINQExtraProperties();
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
- vfModuleItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "vf-module"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ vfModuleItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AAINQInventoryResponseItem genericVNFItem = new AAINQInventoryResponseItem();
genericVNFItem.modelName = "generic-vnf";
@@ -101,16 +101,16 @@ public class AAINQResponseWrapperTest {
genericVNFItem.genericVNF.personaModelId = "acc6edd8-a8d4-4b93-afaa-0994068be14c";
genericVNFItem.genericVNF.personaModelVersion = "1.0";
genericVNFItem.extraProperties = new AAINQExtraProperties();
- genericVNFItem.extraProperties.extraProperty = new LinkedList<>();
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-type", "widget"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-version", "1.0"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
- genericVNFItem.extraProperties.extraProperty.add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
+ genericVNFItem.extraProperties.setExtraProperty(new LinkedList<>());
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name", "generic-vnf"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-type", "widget"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-version", "1.0"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ genericVNFItem.extraProperties.getExtraProperty().add(new AAINQExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
genericVNFItem.items = new AAINQInventoryResponseItems();
- genericVNFItem.items.inventoryResponseItems = new LinkedList<>();
- genericVNFItem.items.inventoryResponseItems.add(serviceItem);
- genericVNFItem.items.inventoryResponseItems.add(vfModuleItem);
+ genericVNFItem.items.setInventoryResponseItems(new LinkedList<>());
+ genericVNFItem.items.getInventoryResponseItems().add(serviceItem);
+ genericVNFItem.items.getInventoryResponseItems().add(vfModuleItem);
AAINQInventoryResponseItem cloudItem = new AAINQInventoryResponseItem();
cloudItem.cloudRegion = new AAINQCloudRegion();
@@ -126,8 +126,8 @@ public class AAINQResponseWrapperTest {
tenantItem.tenant.tenantName = "dhv-test-tenant-name";
tenantItem.tenant.resourceVersion = "1485366334";
tenantItem.items = new AAINQInventoryResponseItems();
- tenantItem.items.inventoryResponseItems = new LinkedList<>();
- tenantItem.items.inventoryResponseItems.add(cloudItem);
+ tenantItem.items.setInventoryResponseItems(new LinkedList<>());
+ tenantItem.items.getInventoryResponseItems().add(cloudItem);
AAINQInventoryResponseItem vserverItem = new AAINQInventoryResponseItem();
vserverItem.vserver = new AAINQVServer();
@@ -140,15 +140,15 @@ public class AAINQResponseWrapperTest {
vserverItem.vserver.isClosedLoopDisabled = false;
vserverItem.vserver.resourceVersion = "1485366417";
vserverItem.items = new AAINQInventoryResponseItems();
- vserverItem.items.inventoryResponseItems = new LinkedList<>();
- vserverItem.items.inventoryResponseItems.add(genericVNFItem);
- vserverItem.items.inventoryResponseItems.add(tenantItem);
+ vserverItem.items.setInventoryResponseItems(new LinkedList<>());
+ vserverItem.items.getInventoryResponseItems().add(genericVNFItem);
+ vserverItem.items.getInventoryResponseItems().add(tenantItem);
AAINQResponse aaiResponse = new AAINQResponse();
- aaiResponse.inventoryResponseItems.add(vserverItem);
+ aaiResponse.getInventoryResponseItems().add(vserverItem);
AAINQResponseWrapper aaiNQResponseWarapper = new AAINQResponseWrapper();
- aaiNQResponseWarapper.aainqresponse = aaiResponse;
- aaiNQResponseWarapper.requestID = UUID.randomUUID();
+ aaiNQResponseWarapper.setAainqresponse(aaiResponse);
+ aaiNQResponseWarapper.setRequestID(UUID.randomUUID());
assertNotNull(aaiNQResponseWarapper);
logger.info(Serialization.gsonPretty.toJson(aaiNQResponseWarapper));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFInstanceTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFInstanceTest.java
index 4dccca852..31243b8d9 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFInstanceTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFInstanceTest.java
@@ -42,9 +42,9 @@ public class PNFInstanceTest {
@Test
public void test() {
PNFInstance pnfInstance = new PNFInstance();
- pnfInstance.PNFInstanceName = "pnf-instance-name-test";
- pnfInstance.PNFName = "pnf-name-test";
- pnfInstance.PNFSerial = "pnf-serial-test";
+ pnfInstance.setPNFInstanceName("pnf-instance-name-test");
+ pnfInstance.setPNFName("pnf-name-test");
+ pnfInstance.setPNFSerial("pnf-serial-test");
assertNotNull(pnfInstance);
logger.info(Serialization.gsonPretty.toJson(pnfInstance));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFTest.java
index e63250f3f..da3593f01 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/PNFTest.java
@@ -42,8 +42,8 @@ public class PNFTest {
@Test
public void test() {
PNF pnf = new PNF();
- pnf.PNFName = "pnf-name-test";
- pnf.PNFType = PNFType.ENODEB;
+ pnf.setPNFName("pnf-name-test");
+ pnf.setPNFType(PNFType.ENODEB);
assertNotNull(pnf);
logger.info(Serialization.gsonPretty.toJson(pnf));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelatedToPropertyTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelatedToPropertyTest.java
index 9ead0cffa..1b0692944 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelatedToPropertyTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelatedToPropertyTest.java
@@ -45,11 +45,11 @@ public class RelatedToPropertyTest {
RelatedToPropertyItem relatedToPropertyItem = new RelatedToPropertyItem();
relatedToPropertyItem.propertyKey = "model.model-name";
relatedToPropertyItem.propertyValue = "service-instance";
- relatedToProperty.relatedTo.add(relatedToPropertyItem);
+ relatedToProperty.getRelatedTo().add(relatedToPropertyItem);
RelatedToPropertyItem relatedToPropertyItem2 = new RelatedToPropertyItem();
relatedToPropertyItem2.propertyKey = "model.model-name2";
relatedToPropertyItem2.propertyValue = "service-instance2";
- relatedToProperty.relatedTo.add(relatedToPropertyItem2);
+ relatedToProperty.getRelatedTo().add(relatedToPropertyItem2);
assertNotNull(relatedToProperty);
logger.info(Serialization.gsonPretty.toJson(relatedToProperty));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipDataTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipDataTest.java
index 4a3d947c0..5498caeac 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipDataTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipDataTest.java
@@ -46,11 +46,11 @@ public class RelationshipDataTest {
relationshipDataItem.relationshipKey = "relationship-key";
relationshipDataItem.relationshipValue = "relationship-value";
assertNotNull(relationshipDataItem);
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
RelationshipDataItem relationshipDataItem2 = new RelationshipDataItem();
relationshipDataItem2.relationshipKey = "relationship-key2";
relationshipDataItem2.relationshipValue = "relationship-value2";
- relationshipData.relationshipData.add(relationshipDataItem2);
+ relationshipData.getRelationshipData().add(relationshipDataItem2);
assertNotNull(relationshipData);
logger.info(Serialization.gsonPretty.toJson(relationshipData));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipItemTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipItemTest.java
index 2102ebe04..4313e0605 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipItemTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipItemTest.java
@@ -45,7 +45,7 @@ public class RelationshipItemTest {
RelatedToPropertyItem relatedToPropertyItem = new RelatedToPropertyItem();
relatedToPropertyItem.propertyKey = "model.model-name";
relatedToPropertyItem.propertyValue = "service-instance";
- relationshipItem.relatedToProperty.add(relatedToPropertyItem);
+ relationshipItem.getRelatedToProperty().add(relatedToPropertyItem);
assertNotNull(relationshipItem);
logger.info(Serialization.gsonPretty.toJson(relationshipItem));
}
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipListTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipListTest.java
index 3eccb0bdb..3d06b0e6b 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipListTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipListTest.java
@@ -49,19 +49,19 @@ public class RelationshipListTest {
RelatedToPropertyItem relatedToPropertyItem = new RelatedToPropertyItem();
relatedToPropertyItem.propertyKey = "model.model-name";
relatedToPropertyItem.propertyValue = "service-instance";
- relatedToProperty.relatedTo.add(relatedToPropertyItem);
+ relatedToProperty.getRelatedTo().add(relatedToPropertyItem);
RelatedToPropertyItem relatedToPropertyItem2 = new RelatedToPropertyItem();
relatedToPropertyItem2.propertyKey = "model.model-name2";
relatedToPropertyItem2.propertyValue = "service-instance2";
- relatedToProperty.relatedTo.add(relatedToPropertyItem2);
+ relatedToProperty.getRelatedTo().add(relatedToPropertyItem2);
relationship.relatedToProperty = relatedToProperty;
RelationshipDataItem relationshipDataItem = new RelationshipDataItem();
relationshipDataItem.relationshipKey = "relationship-key";
relationshipDataItem.relationshipValue = "relationship-value";
RelationshipData relationshipData = new RelationshipData();
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
relationship.relationshipData = relationshipData;
- relationshipList.relationshipList.add(relationship);
+ relationshipList.getRelationshipList().add(relationship);
assertNotNull(relationshipList);
logger.info(Serialization.gsonPretty.toJson(relationshipList));
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipTest.java
index 76d3f306b..ec55069ca 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/RelationshipTest.java
@@ -48,17 +48,17 @@ public class RelationshipTest {
RelatedToPropertyItem relatedToPropertyItem = new RelatedToPropertyItem();
relatedToPropertyItem.propertyKey = "model.model-name";
relatedToPropertyItem.propertyValue = "service-instance";
- relatedToProperty.relatedTo.add(relatedToPropertyItem);
+ relatedToProperty.getRelatedTo().add(relatedToPropertyItem);
RelatedToPropertyItem relatedToPropertyItem2 = new RelatedToPropertyItem();
relatedToPropertyItem2.propertyKey = "model.model-name2";
relatedToPropertyItem2.propertyValue = "service-instance2";
- relatedToProperty.relatedTo.add(relatedToPropertyItem2);
+ relatedToProperty.getRelatedTo().add(relatedToPropertyItem2);
relationship.relatedToProperty = relatedToProperty;
RelationshipDataItem relationshipDataItem = new RelationshipDataItem();
relationshipDataItem.relationshipKey = "relationship-key";
relationshipDataItem.relationshipValue = "relationship-value";
RelationshipData relationshipData = new RelationshipData();
- relationshipData.relationshipData.add(relationshipDataItem);
+ relationshipData.getRelationshipData().add(relationshipDataItem);
relationship.relationshipData = relationshipData;
assertNotNull(relationship);
logger.info(Serialization.gsonPretty.toJson(relationship));