summaryrefslogtreecommitdiffstats
path: root/adapters/mso-adapter-utils/src/main/java/org/onap
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-10-31 10:21:22 -0400
committerRob Daugherty <rd472p@att.com>2018-10-31 10:38:00 -0400
commit6b4910cc194286bccb2a63f63d12bfefcdb7fb3f (patch)
treef140576b3c42c0b575bfe5ab0cf11bffc23f708e /adapters/mso-adapter-utils/src/main/java/org/onap
parent9390b58f5e502bfdf5d0127a4cc5b45e12f17cb6 (diff)
parenta233b62a56517e06ce63b8d801bcdebd6df18af5 (diff)
10/31: merge casablanca to master
Commit: 649c4e85cc991ffe9c13fd3fab4cc3a303faa656 Subject: Fix Error, Check that vimID is present Issue: SO-1156 https://gerrit.onap.org/r/#/c/71247/ Commit: 959493d3274d2f2749586248cf31ee12b730e2af Subject: Bug fixes October 26th Issue: SO-1169 https://gerrit.onap.org/r/#/c/71343/ Commit: 373c057bfa82583f615ea46814ad3cdf9ea8d669 Subject: Resolve vf_module_id setting bug Issue: SO-1165 https://gerrit.onap.org/r/#/c/71270/ Commit: 6c2c8a66fade016f74b51bdfea3ba04494530b97 Issue: SO-1102 Subject: Pnf Spring Environment correction https://gerrit.onap.org/r/#/c/71137/ Change-Id: I22b4566050f627e1f1428aacdb52ec4d4fe75733 Issue-ID: SO-1173 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'adapters/mso-adapter-utils/src/main/java/org/onap')
-rw-r--r--adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java25
1 files changed, 18 insertions, 7 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
index 076e03b6b3..8f71af4dfe 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
@@ -76,7 +76,7 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin{
public static final String VF_MODULE_ID = "vf_module_id";
public static final String TEMPLATE_TYPE = "template_type";
public static final List<String> MULTICLOUD_INPUTS =
- Arrays.asList(OOF_DIRECTIVES, SDNC_DIRECTIVES, GENERIC_VNF_ID, VF_MODULE_ID, TEMPLATE_TYPE);
+ Arrays.asList(OOF_DIRECTIVES, SDNC_DIRECTIVES, TEMPLATE_TYPE);
private static final Logger logger = LoggerFactory.getLogger(MsoMulticloudUtils.class);
@@ -157,18 +157,29 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin{
for (String key: MULTICLOUD_INPUTS) {
if (!stackInputs.isEmpty() && stackInputs.containsKey(key)) {
- if ( key == OOF_DIRECTIVES) {oofDirectives = (String) stackInputs.get(key);}
- if ( key == SDNC_DIRECTIVES) {sdncDirectives = (String) stackInputs.get(key);}
- if ( key == GENERIC_VNF_ID) {genericVnfId = (String) stackInputs.get(key);}
- if ( key == VF_MODULE_ID) {vfModuleId = (String) stackInputs.get(key);}
- if ( key == TEMPLATE_TYPE) {templateType = (String) stackInputs.get(key);}
- if (logger.isDebugEnabled()) {
+ if (key == OOF_DIRECTIVES) {
+ oofDirectives = (String) stackInputs.get(key);
+ }
+ if (key == SDNC_DIRECTIVES) {
+ sdncDirectives = (String) stackInputs.get(key);
+ }
+ if (key == TEMPLATE_TYPE) {
+ templateType = (String) stackInputs.get(key);
+ }
+ if (logger.isDebugEnabled()) {
logger.debug(String.format("Found %s: %s", key, stackInputs.get(key)));
}
stackInputs.remove(key);
}
}
+ if (!stackInputs.isEmpty() && stackInputs.containsKey("VF_MODULE_ID")){
+ vfModuleId = (String) stackInputs.get("VF_MODULE_ID");
+ }
+ if (!stackInputs.isEmpty() && stackInputs.containsKey("GENERIC_VNF_ID")){
+ genericVnfId = (String) stackInputs.get("GENERIC_VNF_ID");
+ }
+
// create the multicloud payload
CreateStackParam stack = createStackParam(stackName, heatTemplate, stackInputs, timeoutMinutes, environment, files, heatFiles);