@@ -428,34 +428,34 @@ def set_parentuid(self):
428
428
def vg_probe (self , data ):
429
429
# Mapping the parameters with the existing data for comparision
430
430
params_mapping = (
431
- ('ownershipgroup' , data [ 'owner_name' ] ),
432
- ('noownershipgroup' , not bool (data [ 'owner_name' ] )),
433
- ('nosafeguardpolicy' , not bool (data [ 'safeguarded_policy_name' ] )),
434
- ('nosnapshotpolicy' , not bool (data [ 'snapshot_policy_name' ] )),
431
+ ('ownershipgroup' , data . get ( 'owner_name' , '' ) ),
432
+ ('noownershipgroup' , not bool (data . get ( 'owner_name' , '' ) )),
433
+ ('nosafeguardpolicy' , not bool (data . get ( 'safeguarded_policy_name' , '' ) )),
434
+ ('nosnapshotpolicy' , not bool (data . get ( 'snapshot_policy_name' , '' ) )),
435
435
)
436
436
437
437
props = dict ((k , getattr (self , k )) for k , v in params_mapping if getattr (self , k ) and getattr (self , k ) != v )
438
438
439
- if self .safeguardpolicyname and self .safeguardpolicyname != data [ 'safeguarded_policy_name' ] :
439
+ if self .safeguardpolicyname and self .safeguardpolicyname != data . get ( 'safeguarded_policy_name' , '' ) :
440
440
props ['safeguardedpolicy' ] = self .safeguardpolicyname
441
441
# If policy is changed, existing policystarttime will be erased so adding time without any check
442
442
if self .policystarttime :
443
443
props ['policystarttime' ] = self .policystarttime
444
444
elif self .safeguardpolicyname :
445
- if self .policystarttime and self .policystarttime + '00' != data [ 'safeguarded_policy_start_time' ] :
445
+ if self .policystarttime and self .policystarttime + '00' != data . get ( 'safeguarded_policy_start_time' , '' ) :
446
446
props ['safeguardedpolicy' ] = self .safeguardpolicyname
447
447
props ['policystarttime' ] = self .policystarttime
448
- elif self .snapshotpolicy and self .snapshotpolicy != data [ 'snapshot_policy_name' ] :
448
+ elif self .snapshotpolicy and self .snapshotpolicy != data . get ( 'snapshot_policy_name' , '' ) :
449
449
props ['snapshotpolicy' ] = self .snapshotpolicy
450
450
if self .policystarttime :
451
451
props ['policystarttime' ] = self .policystarttime
452
452
elif self .snapshotpolicy :
453
- if self .policystarttime and self .policystarttime + '00' != data [ 'snapshot_policy_start_time' ] :
453
+ if self .policystarttime and self .policystarttime + '00' != data . get ( 'snapshot_policy_start_time' , '' ) :
454
454
props ['snapshotpolicy' ] = self .snapshotpolicy
455
455
props ['policystarttime' ] = self .policystarttime
456
456
457
457
# Adding snapshotpolicysuspended to props
458
- if self .snapshotpolicysuspended and self .snapshotpolicysuspended != data [ 'snapshot_policy_suspended' ] :
458
+ if self .snapshotpolicysuspended and self .snapshotpolicysuspended != data . get ( 'snapshot_policy_suspended' , '' ) :
459
459
props ['snapshotpolicysuspended' ] = self .snapshotpolicysuspended
460
460
461
461
self .log ("volumegroup props = %s" , props )
0 commit comments