@@ -3677,6 +3677,8 @@ def release_orphaned_resources(self, vrf_del_list, is_rollback=False):
3677
3677
- allocatedFlag is False
3678
3678
- entityName == vrf
3679
3679
- fabricName == self.fabric
3680
+ - switchName is not None
3681
+ - ipAddress is not None
3680
3682
3681
3683
```json
3682
3684
[
@@ -3730,6 +3732,9 @@ def release_orphaned_resources(self, vrf_del_list, is_rollback=False):
3730
3732
continue
3731
3733
if item .get ("id" ) is None :
3732
3734
continue
3735
+ # Resources with no ipAddress or switchName
3736
+ # are invalid and of Fabric's scope and
3737
+ # should not be attempted to be deleted here.
3733
3738
if not item .get ("ipAddress" ):
3734
3739
continue
3735
3740
if not item .get ("switchName" ):
@@ -3742,6 +3747,8 @@ def release_orphaned_resources(self, vrf_del_list, is_rollback=False):
3742
3747
3743
3748
if len (delete_ids ) == 0 :
3744
3749
return
3750
+ msg = f"Releasing orphaned resources with IDs:{ delete_ids } "
3751
+ self .log .debug (msg )
3745
3752
self .release_resources_by_id (delete_ids )
3746
3753
3747
3754
def push_to_remote (self , is_rollback = False ):
@@ -3774,6 +3781,7 @@ def push_to_remote(self, is_rollback=False):
3774
3781
for vrf_name in self .diff_delete :
3775
3782
vrf_del_list .append (vrf_name )
3776
3783
if vrf_del_list :
3784
+ msg += f"VRF(s) to be deleted: { vrf_del_list } ."
3777
3785
self .release_orphaned_resources (vrf_del_list , is_rollback )
3778
3786
3779
3787
self .push_diff_create (is_rollback )
0 commit comments