From 6de0af739f85377cf07f6f0ad8118d63e9e8578c Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Sun, 3 Nov 2019 19:43:20 +0200 Subject: vfModule upgrade: don't fallback on mismatching newest model Issue-ID: VID-603 Change-Id: I96a0d4ed3a6717a4f1ee7c285dc71e2d7d695302 Signed-off-by: Ittay Stern --- .../src/main/java/org/onap/vid/job/command/ResourceCommand.kt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt') diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt index 60a579e30..a266dd002 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt +++ b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt @@ -35,6 +35,7 @@ import org.onap.vid.model.Action import org.onap.vid.model.RequestReferencesContainer import org.onap.vid.model.serviceInstantiation.BaseResource import org.onap.vid.mso.RestMsoImplementation +import org.onap.vid.mso.model.ModelInfo import org.onap.vid.utils.JACKSON_OBJECT_MAPPER import org.onap.vid.utils.getEnumFromMapOfStrings import org.slf4j.MDC @@ -408,6 +409,9 @@ abstract class ResourceCommand( return commandParentData.parentData } + protected fun serviceModelInfoFromRequest(): ModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.SERVICE_MODEL_INFO) + protected fun serviceInstanceIdFromRequest(): String = commandParentData.getInstanceId(CommandParentData.CommandDataKey.SERVICE_INSTANCE_ID) + protected open fun addMyselfToChildrenData(commandParentData: CommandParentData, request: BaseResource) { // Nothing by default } -- cgit 1.2.3-korg