diff options
| author |   Eric Multanen <eric.w.multanen@intel.com> | 2018-11-13 08:25:05 -0800 |
|---|---|---|
| committer | Eric Multanen <eric.w.multanen@intel.com> | 2018-11-13 21:52:03 -0800 |
| commit | 743c0ec3e756309476dadf2b4067f03edbdbaedf (patch) | |
| tree | 7e444fe88b7b89e3ead24e38c891911ec197fea7 /adapters/mso-adapter-utils | |
| parent | 156bcc91b6ee96dd9fbb0223f70cd1b1ac1ebd86 (diff) | |
Fix issues with mulicloud adapter parameters
Use the static final string variable for the parameter
key values instead of literal string of the variable name.
Also, vf_module_id and vnf_id (generic vnf id for multicloud)
are already part of the required input list, so they are
not needed to be added to the list of inputs.
Change-Id: I2b0bbf385e4114f0432673a3d7e8c9d652226f0a
Issue-ID: SO-1210
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Diffstat (limited to 'adapters/mso-adapter-utils')
| -rw-r--r-- | adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java | 10 |
1 files changed, 5 insertions, 5 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 8f71af4dfe..d036468808 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 @@ -72,7 +72,7 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin{ public static final String OOF_DIRECTIVES = "oof_directives"; public static final String SDNC_DIRECTIVES = "sdnc_directives"; - public static final String GENERIC_VNF_ID = "generic_vnf_id"; + public static final String VNF_ID = "vnf_id"; 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 = @@ -173,11 +173,11 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin{ } } - if (!stackInputs.isEmpty() && stackInputs.containsKey("VF_MODULE_ID")){ - vfModuleId = (String) stackInputs.get("VF_MODULE_ID"); + 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"); + if (!stackInputs.isEmpty() && stackInputs.containsKey(VNF_ID)){ + genericVnfId = (String) stackInputs.get(VNF_ID); } // create the multicloud payload |