server: add support for sorting zones in UI/API #3242

yadvr · 2019-03-28T09:44:08Z

Problem: Not able to configure a sort order for the zones that are listed in various views in the UI.

Root Cause: There is no mechanism to accept sort key for existing zones or UI widget, that would allow to listing zones in the UI in a certain order.

Solution: The order of zones in listed in various views in the UI can now be configured through the newly added “sort_key” field added for the zone. It can be set using updateZone API by providing “sort_key” parameter for a zone, or by reordering the items in the zones list in the UI. UI has been updated to show ordering controls in zones list view. Database changes include updating table “data_center” by adding “sort_key” column (containing integer values and defaults to zero).

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)

borisstoyanov · 2019-03-28T13:35:15Z

@blueorangutan package

blueorangutan · 2019-03-28T13:36:09Z

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

blueorangutan · 2019-03-28T14:41:30Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2660

borisstoyanov

LGTM, user now is able to sort zones

borisstoyanov · 2019-04-05T12:59:31Z

@blueorangutan test

blueorangutan · 2019-04-05T12:59:42Z

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

blueorangutan · 2019-04-05T21:44:05Z

Trillian test result (tid-3477)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29717 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3242-t3477-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 69 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_provision_certificate	`Error`	121.07	test_certauthority_root.py

DaanHoogland

clean implementation but somewhat based on not so clean legacy.

DaanHoogland · 2019-04-10T10:05:49Z

api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java

    @Parameter(name = ApiConstants.LOCAL_STORAGE_ENABLED, type = CommandType.BOOLEAN, description = "true if local storage offering enabled, false otherwise")
    private Boolean localStorageEnabled;

+    @Parameter(name = ApiConstants.SORT_KEY, type = CommandType.INTEGER, description = "sort key of the disk offering, integer")


this is not the sortkey for the diskoffering, is it? (c&p?)

Yes @DaanHoogland , I'll fix.

DaanHoogland · 2019-04-10T10:07:42Z

api/src/main/java/org/apache/cloudstack/query/QueryService.java

+    ConfigKey<Boolean> AllowUserViewDestroyedVM = new ConfigKey<>("Advanced", Boolean.class, "allow.user.view.destroyed.vm", "false",
            "Determines whether users can view their destroyed or expunging vm ", true, ConfigKey.Scope.Account);

+    ConfigKey<Boolean> SortKeyAscending = new ConfigKey<>("Advanced", Boolean.class, "sortkey.algorithm", "true",


so true means that all lists for all users are sorted ascending? (if one of template, disk offering, service offering, network offering or zone)

Yes @DaanHoogland . That's how global config seems to have been designed and used.

Can you rectify the description to reflect the general use-case of the config key @anuragaw ?

Fixing @rhtyd

yadvr · 2019-05-10T18:14:50Z

@anuragaw can you help fix the conflicts?

This adds support to allow admins to sort zones, and based on the sorted order the zones will be listed in UI and API. Signed-off-by: Rohit Yadav <[email protected]>

Signed-off-by: Rohit Yadav <[email protected]>

yadvr · 2019-05-30T10:55:52Z

Thanks @shwstppr
@blueorangutan package

blueorangutan · 2019-05-30T10:56:28Z

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

blueorangutan · 2019-05-30T12:13:36Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2814

anuragaw

@borisstoyanov has found a regression on most recent branch. Please hold off merging.

This adds support to allow admins to sort zones, and based on the sorted order the zones will be listed in UI and API. Signed-off-by: Rohit Yadav <[email protected]>

Signed-off-by: Rohit Yadav <[email protected]>

anuragaw

Fixed the bug. @borisstoyanov - can we please test again?

anuragaw · 2019-06-06T10:41:21Z

@blueorangutan package

blueorangutan · 2019-06-06T10:41:57Z

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

anuragaw · 2019-06-06T10:54:03Z

@blueorangutan package

blueorangutan · 2019-06-06T10:54:57Z

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

blueorangutan · 2019-06-06T11:05:20Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2852

blueorangutan · 2019-06-06T11:18:49Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2853

borisstoyanov · 2019-06-07T05:21:07Z

@blueorangutan test

blueorangutan · 2019-06-07T05:22:01Z

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

borisstoyanov

LGTM, attached test results
test_results.xlsx

blueorangutan · 2019-06-07T15:18:16Z

Trillian test result (tid-3663)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33979 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3242-t3663-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_direct_download.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 69 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_upload_direct_download_certificates	`Failure`	0.04	test_direct_download.py
test_04_rvpc_privategw_static_routes	`Failure`	949.68	test_privategw_acl.py

yadvr · 2019-06-19T12:32:46Z

Lgtm @anuragaw

yadvr added this to the 4.13.0.0 milestone Mar 28, 2019

yadvr requested review from PaulAngus and borisstoyanov March 28, 2019 09:44

yadvr mentioned this pull request Mar 28, 2019

server: add support for sorting zones in UI/api shapeblue/cloudstack#32

Closed

5 tasks

yadvr force-pushed the zones-ui-sorting branch from eee2df3 to 0de5eb2 Compare March 28, 2019 09:53

yadvr added component:api component:UI labels Mar 28, 2019

yadvr mentioned this pull request Apr 5, 2019

[WIP] server: add support for sorting zones in UI/api #3226

Closed

5 tasks

borisstoyanov approved these changes Apr 5, 2019

View reviewed changes

DaanHoogland reviewed Apr 10, 2019

View reviewed changes

Anurag Awasthi and others added 3 commits May 30, 2019 14:44

server: add support for sorting zones in UI/api

6e899b7

This adds support to allow admins to sort zones, and based on the sorted order the zones will be listed in UI and API. Signed-off-by: Rohit Yadav <[email protected]>

db changes for the schema

c46466b

Signed-off-by: Rohit Yadav <[email protected]>

Fix typo in parameter description

360d642

shwstppr force-pushed the zones-ui-sorting branch from 08729ce to 360d642 Compare May 30, 2019 10:28

anuragaw suggested changes Jun 6, 2019

View reviewed changes

Anurag Awasthi and others added 2 commits June 6, 2019 15:22

server: add support for sorting zones in UI/api

e1f0dcf

This adds support to allow admins to sort zones, and based on the sorted order the zones will be listed in UI and API. Signed-off-by: Rohit Yadav <[email protected]>

db changes for the schema

889e1ba

Signed-off-by: Rohit Yadav <[email protected]>

anuragaw reviewed Jun 6, 2019

View reviewed changes

Anurag Awasthi added 2 commits June 6, 2019 16:21

Make config key description more clear

ee426cd

Declare selection filter with sortkey and algo when listing zones

20f0ebe

anuragaw force-pushed the zones-ui-sorting branch from ab6f151 to 20f0ebe Compare June 6, 2019 10:53

borisstoyanov approved these changes Jun 7, 2019

View reviewed changes

yadvr changed the title ~~[WIP DO NOT MERGE] server: add support for sorting zones in UI/API~~ server: add support for sorting zones in UI/API Jun 19, 2019

yadvr merged commit 90cd8aa into apache:master Jun 19, 2019

weizhouapache mentioned this pull request Sep 28, 2020

Zones are returned in a random order #3934

Closed

server: add support for sorting zones in UI/API #3242

server: add support for sorting zones in UI/API #3242

Uh oh!

Conversation

yadvr commented Mar 28, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Uh oh!

borisstoyanov commented Mar 28, 2019

Uh oh!

blueorangutan commented Mar 28, 2019

Uh oh!

blueorangutan commented Mar 28, 2019

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

borisstoyanov commented Apr 5, 2019

Uh oh!

blueorangutan commented Apr 5, 2019

Uh oh!

blueorangutan commented Apr 5, 2019

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Apr 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

anuragaw Apr 10, 2019

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Apr 10, 2019

Choose a reason for hiding this comment

Uh oh!

anuragaw Apr 10, 2019

Choose a reason for hiding this comment

Uh oh!

yadvr Apr 12, 2019

Choose a reason for hiding this comment

Uh oh!

anuragaw Apr 12, 2019

Choose a reason for hiding this comment

Uh oh!

yadvr commented May 10, 2019

Uh oh!

yadvr commented May 30, 2019

Uh oh!

blueorangutan commented May 30, 2019

Uh oh!

blueorangutan commented May 30, 2019

Uh oh!

anuragaw left a comment

Choose a reason for hiding this comment

Uh oh!

anuragaw left a comment

Choose a reason for hiding this comment

Uh oh!

anuragaw commented Jun 6, 2019

Uh oh!

blueorangutan commented Jun 6, 2019

Uh oh!

anuragaw commented Jun 6, 2019

Uh oh!

blueorangutan commented Jun 6, 2019

Uh oh!

blueorangutan commented Jun 6, 2019

Uh oh!

blueorangutan commented Jun 6, 2019

Uh oh!

borisstoyanov commented Jun 7, 2019

Uh oh!

blueorangutan commented Jun 7, 2019

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Jun 7, 2019

Uh oh!

yadvr commented Mar 28, 2019 •

edited

Loading

DaanHoogland Apr 10, 2019 •

edited

Loading