diff options
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitreview b/.gitreview index bee75df7b..e853ac9ee 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=gerrit.onap.org port=29418 project=policy/models.git +defaultbranch=dublin 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 +} |