From 54d868eb5750f87506d74067d8e0ef8734015502 Mon Sep 17 00:00:00 2001 From: Charles Cole Date: Wed, 13 Sep 2017 11:00:21 -0500 Subject: 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 --- .../aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java | 3 +++ .../aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java | 6 ++++++ .../aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java | 6 ++++++ 3 files changed, 15 insertions(+) (limited to 'controlloop/common/model-impl/aai/src/main/java') diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java index beec3204d..d2bff6b7b 100644 --- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java +++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java @@ -78,6 +78,9 @@ public class AAINQGenericVNF implements Serializable { @SerializedName("model-invariant-id") public String modelInvariantId; + + @SerializedName("model-version-id") + public String modelVersionId; public AAINQGenericVNF() { } diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java index c6efac781..ed7d9225a 100644 --- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java +++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java @@ -49,6 +49,12 @@ public class AAINQServiceInstance implements Serializable { @SerializedName("resource-version") public String resourceVersion; + @SerializedName("model-invariant-id") + public String modelInvariantId; + + @SerializedName("model-version-id") + public String modelVersionId; + public AAINQServiceInstance() { } diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java index d3249d834..07c4303c2 100644 --- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java +++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java @@ -64,6 +64,12 @@ public class AAINQVfModule implements Serializable { @SerializedName("contrail-service-instance-fqdn") public String contrailServiceInstanceFqdn; + @SerializedName("model-invariant-id") + public String modelInvariantId; + + @SerializedName("model-version-id") + public String modelVersionId; + public AAINQVfModule() { } } -- cgit 1.2.3-korg