fix bug for delete vserver in aai

Change-Id: Iadcdd91f58a3bfaa41d299d5a96a935697145f51
Issue-ID: VFC-1462
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>

diff --git a/lcm/ns_vnfs/biz/handle_notification.py b/lcm/ns_vnfs/biz/handle_notification.py
index b907780..010ca3f 100644 (file)
--- 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 22a2424..3119e0d 100644 (file)
--- 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,