From ff5cef64d0ed027482be5949ca44931fcf8b7025 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 14 Mar 2011 10:10:10 -0700 Subject: [PATCH] bug 8944: default page size for list* API commands is taken from global config params now. The name of the parameter is "default.page.size", default value is 50 status 8944: resolved fixed --- .../com/cloud/server/ManagementServer.java | 2 ++ .../cloud/api/commands/ListAccountsCmd.java | 2 +- .../com/cloud/api/commands/ListAlertsCmd.java | 2 +- .../cloud/api/commands/ListAsyncJobsCmd.java | 2 +- .../cloud/api/commands/ListCapacityCmd.java | 28 +++++++++---------- .../com/cloud/api/commands/ListCfgsByCmd.java | 2 +- .../cloud/api/commands/ListClustersCmd.java | 2 +- .../api/commands/ListDiskOfferingsCmd.java | 2 +- .../api/commands/ListDomainChildrenCmd.java | 2 +- .../cloud/api/commands/ListDomainsCmd.java | 2 +- .../com/cloud/api/commands/ListEventsCmd.java | 2 +- .../com/cloud/api/commands/ListHostsCmd.java | 2 +- .../com/cloud/api/commands/ListIsosCmd.java | 2 +- .../commands/ListLoadBalancerRulesCmd.java | 2 +- .../api/commands/ListNetworkGroupsCmd.java | 2 +- .../ListPortForwardingServicesCmd.java | 2 +- .../api/commands/ListPreallocatedLunsCmd.java | 2 +- .../commands/ListPublicIpAddressesCmd.java | 2 +- .../api/commands/ListResourceLimitsCmd.java | 2 +- .../cloud/api/commands/ListRoutersCmd.java | 2 +- .../api/commands/ListServiceOfferingsCmd.java | 2 +- .../cloud/api/commands/ListSnapshotsCmd.java | 2 +- .../api/commands/ListStoragePoolsCmd.java | 2 +- .../cloud/api/commands/ListSystemVMsCmd.java | 2 +- .../cloud/api/commands/ListTemplatesCmd.java | 2 +- .../com/cloud/api/commands/ListUsersCmd.java | 2 +- .../com/cloud/api/commands/ListVMsCmd.java | 2 +- .../api/commands/ListVlanIpRangesCmd.java | 2 +- .../cloud/api/commands/ListVolumesCmd.java | 2 +- .../src/com/cloud/configuration/Config.java | 4 ++- .../cloud/server/ManagementServerImpl.java | 13 +++++++++ setup/db/data-217to218.sql | 1 + 32 files changed, 60 insertions(+), 42 deletions(-) create mode 100644 setup/db/data-217to218.sql diff --git a/core/src/com/cloud/server/ManagementServer.java b/core/src/com/cloud/server/ManagementServer.java index 5cc55ae1f34..5691a7115a1 100644 --- a/core/src/com/cloud/server/ManagementServer.java +++ b/core/src/com/cloud/server/ManagementServer.java @@ -2187,5 +2187,7 @@ public interface ManagementServer { Long getDomainIdForVlan(long vlanDbId); + + Integer getDefaultPageSize(); } diff --git a/server/src/com/cloud/api/commands/ListAccountsCmd.java b/server/src/com/cloud/api/commands/ListAccountsCmd.java index c307630562f..eca3e5821b7 100644 --- a/server/src/com/cloud/api/commands/ListAccountsCmd.java +++ b/server/src/com/cloud/api/commands/ListAccountsCmd.java @@ -103,7 +103,7 @@ public class ListAccountsCmd extends BaseCmd{ } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListAlertsCmd.java b/server/src/com/cloud/api/commands/ListAlertsCmd.java index 4654a1f764a..973fcf67ee2 100644 --- a/server/src/com/cloud/api/commands/ListAlertsCmd.java +++ b/server/src/com/cloud/api/commands/ListAlertsCmd.java @@ -60,7 +60,7 @@ public class ListAlertsCmd extends BaseCmd{ Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java index 19aaf959383..f86bb2521c0 100644 --- a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java +++ b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java @@ -60,7 +60,7 @@ public class ListAsyncJobsCmd extends BaseCmd { Date startDate = (Date)params.get(BaseCmd.Properties.START_TZDATE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListCapacityCmd.java b/server/src/com/cloud/api/commands/ListCapacityCmd.java index d6c3628ba1c..08b2bb2dc7a 100644 --- a/server/src/com/cloud/api/commands/ListCapacityCmd.java +++ b/server/src/com/cloud/api/commands/ListCapacityCmd.java @@ -18,23 +18,23 @@ package com.cloud.api.commands; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.HashMap; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; -import java.util.List; -import java.util.Map; +import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.StringTokenizer; - -import org.apache.log4j.Logger; - +import java.util.StringTokenizer; + +import org.apache.log4j.Logger; + import com.cloud.api.BaseCmd; import com.cloud.api.ServerApiException; import com.cloud.capacity.CapacityVO; import com.cloud.server.Criteria; -import com.cloud.storage.StoragePoolVO; import com.cloud.storage.Storage.StoragePoolType; +import com.cloud.storage.StoragePoolVO; import com.cloud.utils.Pair; public class ListCapacityCmd extends BaseCmd{ @@ -67,12 +67,12 @@ public class ListCapacityCmd extends BaseCmd{ Long hostId = (Long)params.get(BaseCmd.Properties.HOST_ID.getName()); String type = (String)params.get(BaseCmd.Properties.TYPE.getName()); Integer page = (Integer)params.get(BaseCmd.Properties.PAGE.getName()); - Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); + Long pageSize = (Long)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 1000000; + Long pageSizeNum = null; if (pageSize != null) { - pageSizeNum = pageSize.intValue(); + pageSizeNum = pageSize; } if (page != null) { int pageNum = page.intValue(); @@ -81,7 +81,7 @@ public class ListCapacityCmd extends BaseCmd{ } } - Criteria c = new Criteria ("capacityType", Boolean.TRUE, startIndex, Long.valueOf(pageSizeNum)); + Criteria c = new Criteria ("capacityType", Boolean.TRUE, startIndex, pageSizeNum); c.addCriteria(Criteria.DATACENTERID, zoneId); c.addCriteria(Criteria.PODID, podId); c.addCriteria(Criteria.HOSTID, hostId); diff --git a/server/src/com/cloud/api/commands/ListCfgsByCmd.java b/server/src/com/cloud/api/commands/ListCfgsByCmd.java index 7780ed85119..fe2524287a0 100644 --- a/server/src/com/cloud/api/commands/ListCfgsByCmd.java +++ b/server/src/com/cloud/api/commands/ListCfgsByCmd.java @@ -60,7 +60,7 @@ public class ListCfgsByCmd extends BaseCmd { Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 100; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListClustersCmd.java b/server/src/com/cloud/api/commands/ListClustersCmd.java index c08eaebfe93..627e3df957d 100644 --- a/server/src/com/cloud/api/commands/ListClustersCmd.java +++ b/server/src/com/cloud/api/commands/ListClustersCmd.java @@ -64,7 +64,7 @@ public class ListClustersCmd extends BaseCmd { Integer pageSize = (Integer) params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java index 4e01bfde306..29bea6bdbb7 100644 --- a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java @@ -64,7 +64,7 @@ public class ListDiskOfferingsCmd extends BaseCmd { Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java index 1063176db74..e294cfb1b43 100644 --- a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java @@ -77,7 +77,7 @@ public class ListDomainChildrenCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListDomainsCmd.java b/server/src/com/cloud/api/commands/ListDomainsCmd.java index fc984d3e6ce..f476a1a64f9 100644 --- a/server/src/com/cloud/api/commands/ListDomainsCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainsCmd.java @@ -77,7 +77,7 @@ public class ListDomainsCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListEventsCmd.java b/server/src/com/cloud/api/commands/ListEventsCmd.java index 4f377cf0838..d4a4160ec3f 100644 --- a/server/src/com/cloud/api/commands/ListEventsCmd.java +++ b/server/src/com/cloud/api/commands/ListEventsCmd.java @@ -110,7 +110,7 @@ public class ListEventsCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListHostsCmd.java b/server/src/com/cloud/api/commands/ListHostsCmd.java index 4b0cb28c1b3..33ed58d9fab 100644 --- a/server/src/com/cloud/api/commands/ListHostsCmd.java +++ b/server/src/com/cloud/api/commands/ListHostsCmd.java @@ -79,7 +79,7 @@ public class ListHostsCmd extends BaseCmd { Integer pageSize = (Integer) params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListIsosCmd.java b/server/src/com/cloud/api/commands/ListIsosCmd.java index 939525a1a3a..0be77c3f8bb 100644 --- a/server/src/com/cloud/api/commands/ListIsosCmd.java +++ b/server/src/com/cloud/api/commands/ListIsosCmd.java @@ -124,7 +124,7 @@ public class ListIsosCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java index 30ee3353742..ea98dbdbd35 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java @@ -111,7 +111,7 @@ public class ListLoadBalancerRulesCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java index f1668d98e8f..b80241261e6 100644 --- a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java @@ -105,7 +105,7 @@ public class ListNetworkGroupsCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java index 5a73bcb8f1f..0441de07b58 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java @@ -93,7 +93,7 @@ public class ListPortForwardingServicesCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java index 5badeba93f5..d9acc64d693 100644 --- a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java +++ b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java @@ -61,7 +61,7 @@ public class ListPreallocatedLunsCmd extends BaseCmd { Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java index b3ab68ab5f1..93eda93a636 100644 --- a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java +++ b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java @@ -112,7 +112,7 @@ public class ListPublicIpAddressesCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java index e64616de024..2bb3f44d952 100644 --- a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java +++ b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java @@ -128,7 +128,7 @@ public class ListResourceLimitsCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListRoutersCmd.java b/server/src/com/cloud/api/commands/ListRoutersCmd.java index 09b0f0ca60a..908ea11c734 100644 --- a/server/src/com/cloud/api/commands/ListRoutersCmd.java +++ b/server/src/com/cloud/api/commands/ListRoutersCmd.java @@ -95,7 +95,7 @@ public class ListRoutersCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java index 9e95a5d4594..024aabe6f1c 100644 --- a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java @@ -73,7 +73,7 @@ public class ListServiceOfferingsCmd extends BaseCmd { Long domainId = (Long)params.get(BaseCmd.Properties.DOMAIN_ID.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java index 0355bcab24b..50246e11d48 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java @@ -105,7 +105,7 @@ public class ListSnapshotsCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java index a69e564d411..4a876e9d6ee 100644 --- a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java +++ b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java @@ -73,7 +73,7 @@ public class ListStoragePoolsCmd extends BaseCmd{ Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java index 6e89a7035e1..a43744f15b0 100644 --- a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java @@ -71,7 +71,7 @@ public class ListSystemVMsCmd extends BaseCmd { Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index 1e1f30505cf..effab9ac095 100755 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -115,7 +115,7 @@ public class ListTemplatesCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListUsersCmd.java b/server/src/com/cloud/api/commands/ListUsersCmd.java index 5fbaf8b0e9b..6b2c198bf6f 100644 --- a/server/src/com/cloud/api/commands/ListUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListUsersCmd.java @@ -81,7 +81,7 @@ public class ListUsersCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListVMsCmd.java b/server/src/com/cloud/api/commands/ListVMsCmd.java index 21ba2dae1ed..cf09bbe40a2 100644 --- a/server/src/com/cloud/api/commands/ListVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMsCmd.java @@ -116,7 +116,7 @@ public class ListVMsCmd extends BaseCmd { } Long startIndex = Long.valueOf(0); - int pageSizeNum = 500; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java index 07480065a77..009707f1cce 100644 --- a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java +++ b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java @@ -74,7 +74,7 @@ public class ListVlanIpRangesCmd extends BaseCmd { Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java index bd22964efeb..0359087af1e 100644 --- a/server/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java @@ -109,7 +109,7 @@ public class ListVolumesCmd extends BaseCmd{ } Long startIndex = Long.valueOf(0); - int pageSizeNum = 50; + int pageSizeNum = getManagementServer().getDefaultPageSize(); if (pageSize != null) { pageSizeNum = pageSize.intValue(); } diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index e5486db7b6a..269aa771999 100644 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -177,7 +177,9 @@ public enum Config { CloudIdentifier("Hidden", ManagementServer.class, String.class, "cloud.identifier", null, "A unique identifier for the cloud.", null), SSOKey("Hidden", ManagementServer.class, String.class, "security.singlesignon.key", null, "A Single Sign-On key used for logging into the cloud", null), SSOAuthTolerance("Advanced", ManagementServer.class, Long.class, "security.singlesignon.tolerance.millis", "300000", "The allowable clock difference in milliseconds between when an SSO login request is made and when it is received.", null), - HashKey("Hidden", ManagementServer.class, String.class, "security.hash.key", null, "for generic key-ed hash", null); + HashKey("Hidden", ManagementServer.class, String.class, "security.hash.key", null, "for generic key-ed hash", null), + + DefaultPageSize("Advanced", ManagementServer.class, Integer.class, "default.page.size", "50", "Default page size for API list* commands", null); private final String _category; private final Class _componentClass; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index c800980e6f4..860f8e11345 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -355,6 +355,7 @@ public class ManagementServerImpl implements ManagementServer { private final Map _configs; private String _domain; + private Integer _defaultPageSize; private int _consoleProxyPort = ConsoleProxyManager.DEFAULT_PROXY_VNC_PORT; // private int _consoleProxyUrlPort = // ConsoleProxyManager.DEFAULT_PROXY_URL_PORT; @@ -505,6 +506,13 @@ public class ManagementServerImpl implements ManagementServer { if (_instance == null) { _instance = "DEFAULT"; } + + //get default page size from configuration + _defaultPageSize = Integer.valueOf(_configs.get("default.page.size")); + if (_defaultPageSize == null) { + _defaultPageSize = 50; + } + } protected Map getConfigs() { @@ -8474,5 +8482,10 @@ public class ManagementServerImpl implements ManagementServer { return accountVlanMaps.get(0).getDomainId(); } } + + @Override + public Integer getDefaultPageSize() { + return _defaultPageSize; + } } diff --git a/setup/db/data-217to218.sql b/setup/db/data-217to218.sql new file mode 100644 index 00000000000..26e234c8002 --- /dev/null +++ b/setup/db/data-217to218.sql @@ -0,0 +1 @@ +INSERT INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'default.page.size', '50', 'Default page size for API list* commands');