summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpramod.jamkhedkar <pramod@research.att.com>2019-06-13 22:08:07 -0400
committerpramod.jamkhedkar <pramod@research.att.com>2019-06-13 22:08:33 -0400
commit0c900e8e0e52a69a201312d12df45d4c31a6fdac (patch)
treeed163e0c35ddf281b0f01b678470e66eba4c9f92
parent1353289a194ac20071c51bdb0212cb8db6d11841 (diff)
Fixed SO request creation
Fixed the SO creation from aai custom query. Issue-ID: POLICY-1856 Change-Id: I5842a4dccbd61c774d84c8e897a876eae76d3a79 Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
-rw-r--r--models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java5
-rw-r--r--models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json4
2 files changed, 4 insertions, 5 deletions
diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java
index 1d2c7c9e7..2da0a95af 100644
--- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java
@@ -198,6 +198,7 @@ public class SoActorServiceProvider implements Actor {
soModelInfo.setModelName(policy.getTarget().getModelName());
soModelInfo.setModelVersion(policy.getTarget().getModelVersion());
soModelInfo.setModelVersionId(policy.getTarget().getModelVersionId());
+ soModelInfo.setModelType("vfModule");
return soModelInfo;
} else {
return null;
@@ -601,11 +602,9 @@ public class SoActorServiceProvider implements Actor {
relatedInstanceListElement2.getRelatedInstance().getModelInfo()
.setModelName(aaiCqResponse.getModelVerByVersionId(vnfItem.getModelVersionId()).getModelName());
relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelVersion(
- aaiCqResponse.getModelVerByVersionId(vnfServiceItem.getModelVersionId()).getModelVersion());
+ aaiCqResponse.getModelVerByVersionId(vnfItem.getModelVersionId()).getModelVersion());
- relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelCustomizationName(
- vnfItem.getVnfType().substring(vnfItem.getVnfType().lastIndexOf('/') + 1));
relatedInstanceListElement2.getRelatedInstance().getModelInfo()
.setModelCustomizationId(vnfItem.getModelCustomizationId());
diff --git a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json
index 8b3c24f65..1aa914422 100644
--- a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json
+++ b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json
@@ -340,7 +340,7 @@
"model-ver": {
"model-version-id": "189a5070-3bd5-45ac-8a1d-c84ca40b277b",
"model-name": "vFWCL_vFWSNK bbefb8ce-2bde",
- "model-version": "1.0",
+ "model-version": "2.0",
"model-description": "vendor software product",
"resource-version": "1556724755172",
"model-elements": {
@@ -3867,4 +3867,4 @@
}
}
]
-} \ No newline at end of file
+}