aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/actors
diff options
context:
space:
mode:
authorCharles Cole <cc847m@att.com>2017-09-13 11:00:21 -0500
committerCharles Cole <cc847m@att.com>2017-09-15 10:55:31 -0500
commit54d868eb5750f87506d74067d8e0ef8734015502 (patch)
tree1bbf735f23d2e0e57a29b9e7f6246bb763285740 /controlloop/common/actors
parentd75fd4d5cafa652fa35d6c152f114319b27f7603 (diff)
Modify AAI simulator to support new requests
Updated the AAI simulator to support new AAI queries. Also, modified the post response to allow multiple responses. Added code to ensure the simulators were able to sucessfully start up. Change-Id: I3e855b5e54c073f55fbaadc0064c140695fc1a58 Issue-ID: POLICY-200 Signed-off-by: Charles Cole <cc847m@att.com>
Diffstat (limited to 'controlloop/common/actors')
-rw-r--r--controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java2
-rw-r--r--controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java66
2 files changed, 34 insertions, 34 deletions
diff --git a/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java b/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java
index 31bb5c8d2..dcdf59a56 100644
--- a/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java
+++ b/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java
@@ -94,7 +94,7 @@ public class AppcServiceProviderTest {
public static void setUpSimulator() {
try {
Util.buildAaiSim();
- } catch (InterruptedException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
index 905de98a6..aac90f7a6 100644
--- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
@@ -77,7 +77,7 @@ public class SOActorServiceProvider implements Actor {
private static String serviceItemServiceInstanceId;
- private String serviceItemPersonaModelId;
+ private String serviceItemModelInvariantId;
private String serviceItemModelName;
@@ -89,9 +89,9 @@ public class SOActorServiceProvider implements Actor {
private String vfModuleItemVfModuleName;
- private String vfModuleItemPersonaModelId;
+ private String vfModuleItemModelInvariantId;
- private String vfModuleItemPersonaModelVersion;
+ private String vfModuleItemModelVersionId;
private String vfModuleItemModelName;
@@ -216,17 +216,17 @@ public class SOActorServiceProvider implements Actor {
setVnfItemVnfType(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType);
setVnfItemVnfType(vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf("/")+1));
setVnfItemModelInvariantId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.modelInvariantId);
- setVnfItemModelVersionId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion);
+ setVnfItemModelVersionId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.modelVersionId);
setVnfItemModelName(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue);
setVnfItemModelVersion(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue);
setVnfItemModelNameVersionId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue);
// serviceItem
setServiceItemServiceInstanceId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID);
- setServiceItemPersonaModelId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId);
+ setServiceItemModelInvariantId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.modelInvariantId);
setServiceItemModelName(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue);
setServiceItemModelType(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue);
- setServiceItemModelVersion(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion);
+ setServiceItemModelVersion(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.modelVersionId);
setServiceItemModelNameVersionId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue);
// Find the index for base vf module and non-base vf module
@@ -256,8 +256,8 @@ public class SOActorServiceProvider implements Actor {
setVfModuleItemVfModuleName(vfModuleItemVfModuleName.replace("Vfmodule", "vDNS"));
// vfModuleItem - NOT the base module
- setVfModuleItemPersonaModelId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId);
- setVfModuleItemPersonaModelVersion(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion);
+ setVfModuleItemModelInvariantId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.modelInvariantId);
+ setVfModuleItemModelVersionId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.modelVersionId);
setVfModuleItemModelName(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue);
setVfModuleItemModelNameVersionId(namedQueryResponseWrapper.aainqresponse.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue);
@@ -315,7 +315,7 @@ public class SOActorServiceProvider implements Actor {
(getServiceItemServiceInstanceId() == null) || (getServiceItemModelName() == null) ||
(getServiceItemModelType() == null) || (getServiceItemModelVersion() == null) ||
(getServiceItemModelNameVersionId() == null) || (getVfModuleItemVfModuleName() == null) ||
- (getVfModuleItemPersonaModelId() == null) || (getVfModuleItemPersonaModelVersion() == null) ||
+ (getVfModuleItemModelInvariantId() == null) || (getVfModuleItemModelVersionId() == null) ||
(getVfModuleItemModelName() == null) || (getVfModuleItemModelNameVersionId() == null) ||
(getTenantItemTenantId() == null) || (getCloudRegionItemCloudRegionId() == null)) {
return false;
@@ -368,10 +368,10 @@ public class SOActorServiceProvider implements Actor {
// modelInfo
//
request.requestDetails.modelInfo.modelType = "vfModule";
- request.requestDetails.modelInfo.modelInvariantId = getVfModuleItemPersonaModelId();
+ request.requestDetails.modelInfo.modelInvariantId = getVfModuleItemModelInvariantId();
request.requestDetails.modelInfo.modelNameVersionId = getVfModuleItemModelNameVersionId();
request.requestDetails.modelInfo.modelName = getVfModuleItemModelName();
- request.requestDetails.modelInfo.modelVersion = getVfModuleItemPersonaModelVersion();
+ request.requestDetails.modelInfo.modelVersion = getVfModuleItemModelVersionId();
//
// requestInfo
//
@@ -389,7 +389,7 @@ public class SOActorServiceProvider implements Actor {
relatedInstanceListElement1.relatedInstance.instanceId = getServiceItemServiceInstanceId();
relatedInstanceListElement1.relatedInstance.modelInfo = new SOModelInfo();
relatedInstanceListElement1.relatedInstance.modelInfo.modelType = "service";
- relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = getServiceItemPersonaModelId();
+ relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = getServiceItemModelInvariantId();
relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = getServiceItemModelNameVersionId();
relatedInstanceListElement1.relatedInstance.modelInfo.modelName = getServiceItemModelName();
relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = getServiceItemModelVersion();
@@ -456,14 +456,14 @@ public class SOActorServiceProvider implements Actor {
}
/**
- * @return the vnfItemPersonaModelId
+ * @return the vnfItemModelInvariantId
*/
public String getVnfItemModelInvariantId() {
return this.vnfItemModelInvariantId;
}
/**
- * @param vnfItemPersonaModelId the vnfItemPersonaModelId to set
+ * @param vnfItemModelInvariantId the vnfItemModelInvariantId to set
*/
private void setVnfItemModelInvariantId(String vnfItemModelInvariantId) {
this.vnfItemModelInvariantId = vnfItemModelInvariantId;
@@ -541,17 +541,17 @@ public class SOActorServiceProvider implements Actor {
}
/**
- * @return the serviceItemPersonaModelId
+ * @return the serviceItemModelInvariantId
*/
- public String getServiceItemPersonaModelId() {
- return this.serviceItemPersonaModelId;
+ public String getServiceItemModelInvariantId() {
+ return this.serviceItemModelInvariantId;
}
/**
- * @param serviceItemPersonaModelId the serviceItemPersonaModelId to set
+ * @param serviceItemModeInvariantlId the serviceItemModelInvariantId to set
*/
- private void setServiceItemPersonaModelId(String serviceItemPersonaModelId) {
- this.serviceItemPersonaModelId = serviceItemPersonaModelId;
+ private void setServiceItemModelInvariantId(String serviceItemModelInvariantId) {
+ this.serviceItemModelInvariantId = serviceItemModelInvariantId;
}
/**
@@ -626,32 +626,32 @@ public class SOActorServiceProvider implements Actor {
}
/**
- * @return the vfModuleItemPersonaModelId
+ * @return the vfModuleItemModelInvariantId
*/
- public String getVfModuleItemPersonaModelId() {
- return this.vfModuleItemPersonaModelId;
+ public String getVfModuleItemModelInvariantId() {
+ return this.vfModuleItemModelInvariantId;
}
/**
- * @param vfModuleItemPersonaModelId the vfModuleItemPersonaModelId to set
+ * @param vfModuleItemModelInvariantId the vfModuleItemModelInvariantId to set
*/
- private void setVfModuleItemPersonaModelId(String vfModuleItemPersonaModelId) {
- this.vfModuleItemPersonaModelId = vfModuleItemPersonaModelId;
+ private void setVfModuleItemModelInvariantId(String vfModuleItemModelInvariantId) {
+ this.vfModuleItemModelInvariantId = vfModuleItemModelInvariantId;
}
/**
- * @return the vfModuleItemPersonaModelVersion
+ * @return the vfModuleItemModelVersionId
*/
- public String getVfModuleItemPersonaModelVersion() {
- return this.vfModuleItemPersonaModelVersion;
+ public String getVfModuleItemModelVersionId() {
+ return this.vfModuleItemModelVersionId;
}
/**
- * @param vfModuleItemPersonaModelVersion the vfModuleItemPersonaModelVersion to set
+ * @param vfModuleItemModelVersionId the vfModuleItemModelVersionId to set
*/
- private void setVfModuleItemPersonaModelVersion(
- String vfModuleItemPersonaModelVersion) {
- this.vfModuleItemPersonaModelVersion = vfModuleItemPersonaModelVersion;
+ private void setVfModuleItemModelVersionId(
+ String vfModuleItemModelVersionId) {
+ this.vfModuleItemModelVersionId = vfModuleItemModelVersionId;
}
/**