From 69ba19aad1f04c9db1979664e01d1448c3e5df1e Mon Sep 17 00:00:00 2001 From: hongyuzhao Date: Tue, 6 Aug 2019 11:19:35 +0800 Subject: [PATCH] fix bug for delete vserver in aai Change-Id: Iadcdd91f58a3bfaa41d299d5a96a935697145f51 Issue-ID: VFC-1462 Signed-off-by: hongyuzhao --- lcm/ns_vnfs/biz/handle_notification.py | 4 ++-- lcm/ns_vnfs/biz/notify_lcm.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lcm/ns_vnfs/biz/handle_notification.py b/lcm/ns_vnfs/biz/handle_notification.py index b9077800..010ca3fa 100644 --- a/lcm/ns_vnfs/biz/handle_notification.py +++ b/lcm/ns_vnfs/biz/handle_notification.py @@ -234,7 +234,7 @@ class HandleVnfLcmOocNotification(object): cloud_owner, cloud_region_id = split_vim_to_owner_region(vim_id) # query vim_info from aai - vim_info = get_vim_by_id(vim_id) + vim_info = get_vim_by_id({"cloud_owner": cloud_owner, 'cloud_regionid': cloud_region_id}) tenant_id = vim_info["tenantId"] data = { "vserver-id": vserver_id, @@ -273,7 +273,7 @@ class HandleVnfLcmOocNotification(object): try: cloud_owner, cloud_region_id = split_vim_to_owner_region(vim_id) # query vim_info from aai, get tenant - vim_info = get_vim_by_id(vim_id) + vim_info = get_vim_by_id({"cloud_owner": cloud_owner, 'cloud_regionid': cloud_region_id}) tenant_id = vim_info["tenantId"] # query vserver instance in aai, get resource_version diff --git a/lcm/ns_vnfs/biz/notify_lcm.py b/lcm/ns_vnfs/biz/notify_lcm.py index 22a24241..3119e0db 100644 --- a/lcm/ns_vnfs/biz/notify_lcm.py +++ b/lcm/ns_vnfs/biz/notify_lcm.py @@ -107,7 +107,7 @@ class NotifyLcm(object): try: cloud_owner, cloud_region_id = split_vim_to_owner_region(vim_id) # query vim_info from aai, get tenant - vim_info = get_vim_by_id(vim_id) + vim_info = get_vim_by_id({"cloud_owner": cloud_owner, 'cloud_regionid': cloud_region_id}) tenant_id = vim_info["tenantId"] # query vserver instance in aai, get resource_version @@ -281,7 +281,7 @@ class NotifyLcm(object): cloud_owner, cloud_region_id = split_vim_to_owner_region(vim_id) # query vim_info from aai - vim_info = get_vim_by_id(vim_id) + vim_info = get_vim_by_id({"cloud_owner": cloud_owner, 'cloud_regionid': cloud_region_id}) tenant_id = vim_info["tenantId"] data = { "vserver-id": vserver_id, -- 2.16.6