Respect --skip-resource when deleting.

tdb · tdb · commit 1d4aabab2e7b · 2024-07-25T20:20:56.000+01:00
When running project cleanup and using the --skip-resource flag, this
flag is only used during the --dry-run stage. This change ensures it is
also used when deleting the resources which fixes the bug mentioned below.

Closes-Bug: #2074109
Change-Id: I8e50fd14dcde069b932cc8ec4bb4fc809f7d2eb7
diff --git a/openstackclient/common/project_cleanup.py b/openstackclient/common/project_cleanup.py
@@ -150,5 +150,8 @@ def take_action(self, parsed_args):
             self.log.warning(_('Deleting resources'))
 
             project_connect.project_cleanup(
-                dry_run=False, status_queue=status_queue, filters=filters
+                dry_run=False,
+                status_queue=status_queue,
+                filters=filters,
+                skip_resources=parsed_args.skip_resource,
             )
diff --git a/openstackclient/tests/unit/common/test_project_cleanup.py b/openstackclient/tests/unit/common/test_project_cleanup.py
@@ -83,7 +83,12 @@ def test_project_cleanup_with_filters(self):
                 filters=filters,
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters=filters),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters=filters,
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -114,7 +119,12 @@ def test_project_cleanup_with_auto_approve(self):
                 filters={},
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -144,7 +154,12 @@ def test_project_cleanup_with_project(self):
                 filters={},
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -230,7 +245,12 @@ def test_project_cleanup_with_auth_project(self):
                 filters={},
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -260,7 +280,12 @@ def test_project_cleanup_with_skip_resource(self):
                 filters={},
                 skip_resources=[skip_resource],
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=[skip_resource],
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 

Original file line number	Diff line number	Diff line change
`@@ -150,5 +150,8 @@ def take_action(self, parsed_args):`
`150`	`150`	`self.log.warning(_('Deleting resources'))`
`151`	`151`
`152`	`152`	`project_connect.project_cleanup(`
`153`		`- dry_run=False, status_queue=status_queue, filters=filters`
	`153`	`+ dry_run=False,`
	`154`	`+ status_queue=status_queue,`
	`155`	`+ filters=filters,`
	`156`	`+ skip_resources=parsed_args.skip_resource,`
`154`	`157`	`)`