From a09178865ebe7bfd74427d4806fc01fa779992bf Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 22 Oct 2020 14:15:02 +0000 Subject: [PATCH] Revert gerrit9831 "provide juju parameters to the config primitives" This reverts commit def3b2c49087460a513acc5d4af1fb20d4f09d0c. Change-Id: I25eee726ce8b2c57c1c254edd7d03fbfc3d93b82 Signed-off-by: tierno --- osm_lcm/ns.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 7160b99..2a0e8b4 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -3521,7 +3521,8 @@ class NsLcm(LcmBase): self._write_op_status(nslcmop_id, stage) return error_detail_list - def _map_primitive_params(self, primitive_desc, params, instantiation_params): + @staticmethod + def _map_primitive_params(primitive_desc, params, instantiation_params): """ Generates the params to be provided to charm before executing primitive. If user does not provide a parameter, The default-value is used. If it is between < > it look for a value at instantiation_params @@ -3569,7 +3570,6 @@ class NsLcm(LcmBase): if primitive_desc["name"] == "config": if "ns_config_info" in instantiation_params: calculated_params["ns_config_info"] = instantiation_params["ns_config_info"] - calculated_params["VCA"] = self.vca_config return calculated_params def _look_for_deployed_vca(self, deployed_vca, member_vnf_index, vdu_id, vdu_count_index, kdu_name=None, -- 2.25.1