summaryrefslogtreecommitdiffstats
path: root/appc-dispatcher
diff options
context:
space:
mode:
authorKalpesh Chaniyara <kalpeshkumar.chaniyara@amdocs.com>2017-08-15 14:45:00 +0530
committerKalpesh Chaniyara <kalpeshkumar.chaniyara@amdocs.com>2017-08-15 14:46:36 +0530
commit01316dc253aa962d0eeda3eef19c715832b2dbfc (patch)
treeeb43a51d16c5fd55e70e3e6e6f9933a56a90688d /appc-dispatcher
parent0df7ab4f7ef0bfb21797775ec41fcdfb94e2270c (diff)
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 <kalpeshkumar.chaniyara@amdocs.com>
Diffstat (limited to 'appc-dispatcher')
-rw-r--r--appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java10
-rw-r--r--appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java3
2 files changed, 12 insertions, 1 deletions
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<String, String> additionalContext;
if ((additionalContext = workflowRequest.getRequestContext().getAdditionalContext())!=null) {
for (Map.Entry<String, String> entry : additionalContext.entrySet()) {