From 2133020f219c8ec31c748d0a3ff9c063aa15dde9 Mon Sep 17 00:00:00 2001 From: "Modaboina, Kusumakumari (km583p)" Date: Fri, 14 Sep 2018 17:01:04 -0400 Subject: scopeOverlap errorfix actionrequest fr force=false Issue-ID: APPC-1188 Change-Id: Ife6666e80025a595c5a8f840a00d0882ac80ed71 Signed-off-by: Modaboina, Kusumakumari (km583p) --- .../onap/appc/requesthandler/impl/RequestValidatorImpl.java | 1 + .../org/onap/appc/requesthandler/model/RequestModel.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'appc-dispatcher/appc-request-handler/appc-request-handler-core/src') diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java index e97f7c05f..da571bd15 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java @@ -396,6 +396,7 @@ public class RequestValidatorImpl extends AbstractRequestValidatorImpl { request.getActionIdentifier().setVnfId(null); } + request.setTargetId(record.getTargetId()); inProgressRequests.add(request); } diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/RequestModel.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/RequestModel.java index 692f5a4aa..61da106c4 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/RequestModel.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/RequestModel.java @@ -4,8 +4,6 @@ * ================================================================================ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ - * Copyright (C) 2017 Amdocs - * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -33,6 +31,8 @@ public class RequestModel { private String action; @JsonProperty("action-identifiers") private ActionIdentifierModel actionIdentifier; + @JsonProperty("target-id") + private String targetId; public ActionIdentifierModel getActionIdentifier() { return actionIdentifier; @@ -49,5 +49,13 @@ public class RequestModel { public void setAction(String action) { this.action = action; } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } } -- cgit 1.2.3-korg