Fixed SO request creation

[policy/models.git] / models-interactions / model-actors / actor.so / src / main / java / org / onap / policy / controlloop / actor / so / SoActorServiceProvider.java

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 1d2c7c9..2da0a95 100644 (file)
--- 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());