From 01316dc253aa962d0eeda3eef19c715832b2dbfc Mon Sep 17 00:00:00 2001 From: Kalpesh Chaniyara Date: Tue, 15 Aug 2017 14:45:00 +0530 Subject: [PATCH 1/1] Action-Identifier to support vf-module-id As of now LCM Request Identifier supports vnf-id, vnfc-name and vserver-id. This change supports vf-module-id as action identifier and its value is set in DG context with key input.action-identifiers.vf-module-id when invoking DG Issue-Id : APPC-142 Change-Id: I65d44b073d32e39eaba183b8ce47584441921f3c Signed-off-by: Kalpesh Chaniyara --- .../org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java | 10 ++++++++++ .../org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java | 3 ++- .../openecomp/appc/provider/lcm/util/RequestInputBuilder.java | 1 + .../appc-provider-model/src/main/yang/appc-provider-lcm.yang | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java index d3e8cd492..6aa9ef507 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java @@ -29,6 +29,7 @@ public class ActionIdentifiers { private String serviceInstanceId; private String vnfId; private String vnfcName; + private String vfModuleId; private String vServerId; public String getServiceInstanceId() { @@ -63,11 +64,20 @@ public class ActionIdentifiers { this.vServerId = vServerId; } + public String getVfModuleId() { + return vfModuleId; + } + + public void setVfModuleId(String vfModuleId) { + this.vfModuleId = vfModuleId; + } + @Override public String toString() { return "ActionIdentifiers{" + "serviceInstanceId='" + serviceInstanceId + '\'' + ", vnfId='" + vnfId + '\'' + + ", vfModuleId ='" + vfModuleId + '\'' + ", vnfcName='" + vnfcName + '\'' + ", vServerId='" + vServerId + '\'' + '}'; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java index 257321169..b47060539 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java @@ -175,7 +175,8 @@ public class WorkFlowManagerImpl implements WorkFlowManager{ workflowParams.put("input.action-identifiers.vnf-id",workflowRequest.getVnfContext().getId()); workflowParams.put("input.action-identifiers.vnfc-name",workflowRequest.getRequestContext().getActionIdentifiers().getVnfcName()!=null?workflowRequest.getRequestContext().getActionIdentifiers().getVnfcName():""); workflowParams.put("input.action-identifiers.service-instance-id",workflowRequest.getRequestContext().getActionIdentifiers().getServiceInstanceId()!=null?workflowRequest.getRequestContext().getActionIdentifiers().getServiceInstanceId():""); - workflowParams.put("input.action-identifiers.vserver-id",workflowRequest.getRequestContext().getActionIdentifiers().getVserverId()!=null?workflowRequest.getRequestContext().getActionIdentifiers().getVserverId():""); + workflowParams.put("input.action-identifiers.vf-module-id",workflowRequest.getRequestContext().getActionIdentifiers().getVfModuleId()!=null?workflowRequest.getRequestContext().getActionIdentifiers().getVfModuleId():""); + workflowParams.put("input.action-identifiers.vserver-id",workflowRequest.getRequestContext().getActionIdentifiers().getVserverId()!=null?workflowRequest.getRequestContext().getActionIdentifiers().getVserverId():""); final Map additionalContext; if ((additionalContext = workflowRequest.getRequestContext().getAdditionalContext())!=null) { for (Map.Entry entry : additionalContext.entrySet()) { diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java index 495fa82a6..c323aa5e5 100644 --- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java +++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java @@ -140,6 +140,7 @@ public class RequestInputBuilder { actionIds.setVnfcName(actionIdentifiers.getVnfcName()); actionIds.setvServerId(actionIdentifiers.getVserverId()); actionIds.setVnfId(actionIdentifiers.getVnfId()); + actionIds.setVfModuleId(actionIdentifiers.getVfModuleId()); this.requestContext.setActionIdentifiers(actionIds); ActionLevel actionLevel = readActionLevel(actionIds); diff --git a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang index b149abea5..d72b551a8 100644 --- a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang +++ b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang @@ -269,6 +269,11 @@ module appc-provider-lcm { type string; mandatory false; } + leaf vf-module-id { + description "identifies the VF module to which this action is to be applied."; + type string; + mandatory false; + } leaf vnfc-name { description "identifies the VNFC to which this action is to be applied. Some actions apply only to a component within a VNF (e.g. RESTART is -- 2.16.6