summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Williams <marcus.williams@intel.com>2017-08-16 00:54:38 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-16 00:54:38 +0000
commit833fe6d45ceb8c0f4534972d6422ce568598da89 (patch)
tree413344d3ef93a87cffeb1adb8c4092b53fc9e7be
parentdf9fe6a1a709ea601a6eed3089682a2535daeafa (diff)
parent01316dc253aa962d0eeda3eef19c715832b2dbfc (diff)
Merge "Action-Identifier to support vf-module-id"
-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
-rw-r--r--appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java1
-rw-r--r--appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang5
4 files changed, 18 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()) {
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