Provide option to force delete the project #4617

ravening · 2021-01-26T11:20:13Z

Description

Provide a cleanup flag so that the project will
be deleted only when there are no resources left
in the project. If users click on delete project
by mistake then everything is deleted.

Ui changes ported from apache/cloudstack-primate#848

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Pearl1594 · 2021-01-27T11:38:57Z

server/src/main/java/com/cloud/projects/ProjectManagerImpl.java

+            List<NetworkVO> networks = _networkDao.listByOwner(project.getProjectAccountId());
+            List<? extends Vpc> vpcs = _vpcMgr.getVpcsForAccount(project.getProjectAccountId());
+
+            Optional<String> message = Stream.of(userTemplates, vmSnapshots, vms, volumes, networks, vpcs)


Overall, LGTM. But would it be better, if we could inform the user about all the resources that are tied to the project as opposed to the first one that's found - by doing something like this:

List<String> message = Stream.of(userTemplates, vmSnapshots, vms, volumes, networks, vpcs) .filter(entity -> !entity.isEmpty()) .map(entity -> entity.size() + " " + entity.get(0).getEntityType().getSimpleName()) .collect(Collectors.toList()); ... String msg = String.join(",", message) + " to clean up"; CloudRuntimeException e = new CloudRuntimeException("Can't delete the project yet because it has " + msg); ...

Such that the end error would look like:

Or is this too much info??

@Pearl1594 I can do that

rohityadavcloud · 2021-03-06T09:21:54Z

@blueorangutan package

blueorangutan · 2021-03-06T09:23:06Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-03-06T09:57:20Z

Packaging result: ✖centos7 ✖centos8 ✖debian. JID-2880

rohityadavcloud · 2021-06-17T07:31:51Z

@ravening can you investigate the build failure, I'll rekick as well
@blueorangutan package

blueorangutan · 2021-06-17T07:32:03Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-06-17T08:43:32Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 254

sureshanaparti · 2021-06-24T12:32:05Z

@blueorangutan test

blueorangutan · 2021-06-24T12:33:02Z

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2021-06-24T12:55:32Z

Trillian Build Failed (tid-1092)

davidjumani · 2021-07-19T07:02:38Z

@blueorangutan package

blueorangutan · 2021-07-19T07:03:03Z

@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-07-19T07:04:27Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 583

davidjumani · 2021-07-19T07:05:31Z

@ravening Can you fix the conflicts ? Thanks

nvazquez · 2021-07-27T03:04:52Z

Hi @ravening can you please fix the conflicts?

rohityadavcloud · 2021-08-09T08:50:29Z

ping @ravening

ravening · 2021-08-18T08:56:17Z

@rhtyd @nvazquez @davidjumani done

api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java

weizhouapache

code lgtm

nvazquez · 2021-08-19T04:16:37Z

@blueorangutan package

blueorangutan · 2021-08-19T04:17:03Z

@nvazquez a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-08-19T05:13:13Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 922

nvazquez · 2021-08-19T05:19:46Z

@blueorangutan test

blueorangutan · 2021-09-03T13:27:25Z

Trillian test result (tid-1958)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34884 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4617-t1958-kvm-centos7.zip
Smoke tests completed. 87 look OK, 2 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestDeployVmWithAffinityGroup>:teardown	`Error`	138.15	test_affinity_groups_projects.py
test_07_project_resources_account_delete	`Error`	5.43	test_projects.py
test_08_cleanup_after_project_delete	`Error`	5.83	test_projects.py
ContextSuite context=TestProjectResources>:teardown	`Error`	6.89	test_projects.py
ContextSuite context=TestProjectSuspendActivate>:teardown	`Error`	65.97	test_projects.py

rohityadavcloud · 2021-09-15T05:29:08Z

@ravening can you review and fix the failing project related smoketests?

rohityadavcloud · 2021-09-22T19:11:11Z

Ping @ravening

rohityadavcloud · 2021-09-22T19:21:58Z

@blueorangutan package

blueorangutan · 2021-09-22T19:23:03Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-09-22T20:18:31Z

Packaging result: ✖️ el7 ✔️ el8 ✖️ debian ✖️ suse15. SL-JID 1364

ravening · 2021-09-23T07:28:40Z

Ping @ravening

@rhtyd will look into it

be deleted only when there are no resources left in the project. If users click on delete project by mistake then everything is deleted.

ravening · 2021-09-23T09:16:38Z

@rhtyd @nvazquez fixed travis issues.. can you trigger it again?

weizhouapache · 2021-09-23T09:19:47Z

@blueorangutan package

blueorangutan · 2021-09-23T09:20:03Z

@weizhouapache a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-09-23T09:58:25Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 1375

sureshanaparti · 2021-09-24T04:34:42Z

@blueorangutan test

blueorangutan · 2021-09-24T04:38:04Z

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2021-09-24T04:38:34Z

Trillian Build Failed (tid-2191)

sureshanaparti · 2021-09-24T05:13:34Z

@blueorangutan test

blueorangutan · 2021-09-24T05:15:05Z

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2021-09-24T15:59:17Z

Trillian test result (tid-2193)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 37337 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4617-t2193-kvm-centos7.zip
Smoke tests completed. 89 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

ravening mentioned this pull request Jan 26, 2021

Provide cleanup option to force deleting a project #4453

Closed

1 task

DaanHoogland requested a review from Pearl1594 January 27, 2021 09:19

Pearl1594 approved these changes Jan 27, 2021

View reviewed changes

shwstppr added this to the 4.16.0.0 milestone Feb 8, 2021

rohityadavcloud closed this Jun 17, 2021

rohityadavcloud reopened this Jun 17, 2021

ravening force-pushed the cleanup-project branch from 7b1bf04 to df66682 Compare August 18, 2021 08:55

weizhouapache reviewed Aug 18, 2021

View reviewed changes

api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java Outdated Show resolved Hide resolved

weizhouapache approved these changes Aug 18, 2021

View reviewed changes

nvazquez approved these changes Aug 19, 2021

View reviewed changes

weizhouapache reopened this Sep 3, 2021

rohityadavcloud closed this Sep 15, 2021

rohityadavcloud reopened this Sep 15, 2021

nvazquez added component:projects type:enhancement labels Sep 16, 2021

ravening and others added 2 commits September 23, 2021 09:44

Provide a cleanup flag so that the project will

5304e1c

be deleted only when there are no resources left in the project. If users click on delete project by mistake then everything is deleted.

fix travis failures

1845d02

ravening force-pushed the cleanup-project branch from df66682 to 1845d02 Compare September 23, 2021 09:15

sureshanaparti closed this Sep 24, 2021

sureshanaparti reopened this Sep 24, 2021

nvazquez merged commit a9c42fd into apache:main Sep 26, 2021

weizhouapache mentioned this pull request Jun 5, 2023

cs_project.py: pass cleanup=true in deleteProject API ngine-io/ansible-collection-cloudstack#122

Merged

weizhouapache mentioned this pull request Jul 25, 2023

Default value of force should be false for template delete operation #7731

Merged

10 tasks

Provide option to force delete the project #4617

Provide option to force delete the project #4617

Uh oh!

Conversation

ravening commented Jan 26, 2021

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

Pearl1594 Jan 27, 2021

Choose a reason for hiding this comment

Uh oh!

ravening Feb 1, 2021

Choose a reason for hiding this comment

Uh oh!

rohityadavcloud commented Mar 6, 2021

Uh oh!

blueorangutan commented Mar 6, 2021

Uh oh!

blueorangutan commented Mar 6, 2021

Uh oh!

rohityadavcloud commented Jun 17, 2021

Uh oh!

blueorangutan commented Jun 17, 2021

Uh oh!

blueorangutan commented Jun 17, 2021

Uh oh!

sureshanaparti commented Jun 24, 2021

Uh oh!

blueorangutan commented Jun 24, 2021

Uh oh!

blueorangutan commented Jun 24, 2021

Uh oh!

davidjumani commented Jul 19, 2021

Uh oh!

blueorangutan commented Jul 19, 2021

Uh oh!

blueorangutan commented Jul 19, 2021

Uh oh!

davidjumani commented Jul 19, 2021

Uh oh!

nvazquez commented Jul 27, 2021

Uh oh!

rohityadavcloud commented Aug 9, 2021

Uh oh!

ravening commented Aug 18, 2021

Uh oh!

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Aug 19, 2021

Uh oh!

blueorangutan commented Aug 19, 2021

Uh oh!

blueorangutan commented Aug 19, 2021

Uh oh!

nvazquez commented Aug 19, 2021

Uh oh!

blueorangutan commented Sep 3, 2021

Uh oh!

rohityadavcloud commented Sep 15, 2021

Uh oh!

rohityadavcloud commented Sep 22, 2021

Uh oh!

rohityadavcloud commented Sep 22, 2021

Uh oh!

blueorangutan commented Sep 22, 2021

Uh oh!

blueorangutan commented Sep 22, 2021

Uh oh!

ravening commented Sep 23, 2021

Uh oh!

ravening commented Sep 23, 2021

Uh oh!

weizhouapache commented Sep 23, 2021