Empty remove list will cause failure on glance sync

Empty remove list will cause failure on glance sync

Change-Id: I2433cd66b18239d1e12b6d2691327f4c534db1ec
Closes-Bug: #1446095
This commit is contained in:
Jerry Cai 2015-04-20 16:35:12 +08:00
parent 9bb53746ce
commit e58fed6bf1
1 changed files with 4 additions and 0 deletions

View File

@ -1787,6 +1787,8 @@ class PowerVCImageManager(service.Service):
# We do not want to update bdm from pvc and
# we do not want to update the empty bdm info to pvc
if not remove_list:
remove_list = []
if remove_list and constants.BDM_KEY in remove_list:
remove_list.remove(constants.BDM_KEY)
if field_dict and constants.BDM_KEY in field_dict:
@ -2063,6 +2065,8 @@ class PowerVCImageManager(service.Service):
# We do not want to update bdm from pvc and
# we do not want to update the empty bdm info to pvc
if not remove_list:
remove_list = []
if constants.BDM_KEY in remove_list:
remove_list.remove(constants.BDM_KEY)
if add_update_dict and constants.BDM_KEY in add_update_dict: