From: David Garcia Date: Wed, 9 Sep 2020 13:40:44 +0000 (+0200) Subject: Fix bug 1206: add relations between VNF and VDU X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fheads%2Fv7.0;p=osm%2FLCM.git Fix bug 1206: add relations between VNF and VDU Change-Id: Ibad63bd0dc3692018c2c14487ab6923390a152c5 Signed-off-by: David Garcia (cherry picked from commit b3972b9d8f791732f836bf101de62a192adf23f2) --- diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 489c436..bcd675b 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -2067,10 +2067,13 @@ class NsLcm(LcmBase): to_vca_endpoint = None vca_list = deep_get(db_nsr, ('_admin', 'deployed', 'VCA')) for vca in vca_list: - if vca.get('vdu_id') == r.get('entities')[0].get('id') and vca.get('config_sw_installed'): + key_to_check = "vdu_id" + if vca.get("vdu_id") is None: + key_to_check = "vnfd_id" + if vca.get(key_to_check) == r.get('entities')[0].get('id') and vca.get('config_sw_installed'): from_vca_ee_id = vca.get('ee_id') from_vca_endpoint = r.get('entities')[0].get('endpoint') - if vca.get('vdu_id') == r.get('entities')[1].get('id') and vca.get('config_sw_installed'): + if vca.get(key_to_check) == r.get('entities')[1].get('id') and vca.get('config_sw_installed'): to_vca_ee_id = vca.get('ee_id') to_vca_endpoint = r.get('entities')[1].get('endpoint') if from_vca_ee_id and to_vca_ee_id: