You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/31 10:40:24 UTC
[cloudstack] branch tungsten-integration updated (6bc3eec6f77 -> da600219fe3)
This is an automated email from the ASF dual-hosted git repository.
davidjumani pushed a change to branch tungsten-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 6bc3eec6f77 Merge branch 'main' of github.com:apache/cloudstack into tungsten-integration
add d8c7e34b383 Improve global settings UI to be more intuitive/logical (#5797)
add da600219fe3 Merge branch 'main' of github.com:apache/cloudstack into tungsten-integration
No new revisions were added by this update.
Summary of changes:
.../java/com/cloud/server/ManagementService.java | 9 +
.../org/apache/cloudstack/api/ApiConstants.java | 5 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 +
.../config/ListCfgGroupsByCmd.java} | 56 ++--
.../api/command/admin/config/ListCfgsByCmd.java | 121 +++++--
.../api/response/ConfigurationGroupResponse.java | 64 ++--
.../api/response/ConfigurationResponse.java | 96 ++++++
...nse.java => ConfigurationSubGroupResponse.java} | 33 +-
.../apache/cloudstack/backup/BackupManager.java | 4 +-
.../java/org/apache/cloudstack/ca/CAManager.java | 6 +-
.../cloudstack/config/ApiServiceConfiguration.java | 6 +-
.../org/apache/cloudstack/query/QueryService.java | 12 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 18 +-
.../java/com/cloud/network/IpAddressManager.java | 5 +-
.../java/com/cloud/resource/ResourceManager.java | 6 +-
.../java/com/cloud/storage/StorageManager.java | 25 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 2 +-
.../upgrade/ConfigurationGroupsAggregator.java | 106 ++++++
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade41720to41800.java | 7 +
.../spring-engine-schema-core-daos-context.xml | 2 +
.../resources/META-INF/db/schema-41610to41700.sql | 6 +-
.../resources/META-INF/db/schema-41720to41800.sql | 249 +++++++++++++-
.../manager/ImageStoreProviderManagerImpl.java | 4 +-
.../storage/test/ChildTestConfiguration.java | 14 +-
.../src/test/resources/component.xml | 6 +-
.../apache/cloudstack/config/Configuration.java | 29 +-
.../cloudstack/config/ConfigurationGroup.java | 10 +-
.../cloudstack/config/ConfigurationSubGroup.java | 11 +-
.../framework/config/ConfigDepotAdmin.java | 4 +
.../cloudstack/framework/config/ConfigKey.java | 70 +++-
.../config/dao/ConfigurationGroupDao.java | 10 +-
.../config/dao/ConfigurationGroupDaoImpl.java | 24 +-
.../config/dao/ConfigurationSubGroupDao.java | 27 +-
.../config/dao/ConfigurationSubGroupDaoImpl.java | 131 ++++++++
.../framework/config/impl/ConfigDepotImpl.java | 114 +++++++
.../config/impl/ConfigurationGroupVO.java | 67 ++--
.../config/impl/ConfigurationSubGroupVO.java | 87 +++--
.../framework/config/impl/ConfigurationVO.java | 112 ++++++-
.../spring-framework-config-system-context.xml | 6 +
.../cloudstack/framework/config/ConfigKeyTest.java | 4 +-
.../config/impl/ConfigDepotAdminTest.java | 61 +++-
.../jobs/AsyncJobManagerTestConfiguration.java | 19 +-
.../lifecycle/registry/ExtensionRegistry.java | 4 +-
.../cluster/KubernetesClusterService.java | 20 +-
.../metrics/PrometheusExporterServer.java | 4 +-
.../management/IntegrationTestConfiguration.java | 10 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 4 +-
server/conf/migration-components.xml | 2 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 43 +++
.../main/java/com/cloud/configuration/Config.java | 79 ++++-
.../configuration/ConfigurationManagerImpl.java | 97 +++++-
.../router/VirtualNetworkApplianceManager.java | 20 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 4 +-
.../com/cloud/server/ConfigurationServerImpl.java | 11 +
.../com/cloud/server/ManagementServerImpl.java | 51 +++
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 12 +-
.../agent/lb/IndirectAgentLBServiceImpl.java | 6 +-
.../diagnostics/DiagnosticsServiceImpl.java | 4 +-
.../fileprocessor/DiagnosticsFilesList.java | 12 +-
server/src/test/async-job-component.xml | 2 +
.../java/com/cloud/configuration/ConfigTest.java | 2 +-
.../SecurityGroupManagerTestConfiguration.java | 6 +-
.../java/com/cloud/vm/FirstFitPlannerTest.java | 16 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 18 +
.../java/com/cloud/vpc/VpcTestConfiguration.java | 8 +-
.../cloud/vpc/dao/MockConfigurationDaoImpl.java | 1 -
.../src/test/resources/createNetworkOffering.xml | 2 +
.../SecondaryStorageManagerImpl.java | 2 +-
test/integration/smoke/test_global_settings.py | 106 ++++++
tools/marvin/marvin/lib/base.py | 8 +
ui/public/locales/en.json | 4 +-
ui/src/components/view/ListView.vue | 1 +
ui/src/config/section/config.js | 4 +-
ui/src/style/vars.less | 4 +
ui/src/views/setting/ConfigurationHierarchy.vue | 90 +++++
ui/src/views/setting/ConfigurationTab.vue | 365 +++++++++++++++++++++
ui/src/views/setting/ConfigurationTable.vue | 191 +++++++++++
ui/src/views/setting/ConfigurationValue.vue | 363 ++++++++++++++++++++
.../cloud/usage/UsageManagerTestConfiguration.java | 4 +-
81 files changed, 2868 insertions(+), 376 deletions(-)
copy api/src/main/java/org/apache/cloudstack/api/command/{user/resource/ListHypervisorsCmd.java => admin/config/ListCfgGroupsByCmd.java} (53%)
copy plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiResponseResponse.java => api/src/main/java/org/apache/cloudstack/api/response/ConfigurationGroupResponse.java (54%)
copy api/src/main/java/org/apache/cloudstack/api/response/{GuestOSCategoryResponse.java => ConfigurationSubGroupResponse.java} (63%)
create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/ConfigurationGroupsAggregator.java
copy utils/src/main/java/com/cloud/utils/component/Named.java => framework/config/src/main/java/org/apache/cloudstack/config/ConfigurationGroup.java (84%)
copy api/src/main/java/org/apache/cloudstack/api/ResourceDetail.java => framework/config/src/main/java/org/apache/cloudstack/config/ConfigurationSubGroup.java (80%)
copy engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmProfileDao.java => framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationGroupDao.java (76%)
copy engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountDaoImpl.java => framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationGroupDaoImpl.java (59%)
copy server/src/main/java/com/cloud/server/ConfigurationServer.java => framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationSubGroupDao.java (63%)
create mode 100644 framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationSubGroupDaoImpl.java
copy engine/schema/src/main/java/org/apache/cloudstack/acl/ProjectRoleVO.java => framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigurationGroupVO.java (64%)
copy engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLVO.java => framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigurationSubGroupVO.java (55%)
create mode 100644 ui/src/views/setting/ConfigurationHierarchy.vue
create mode 100644 ui/src/views/setting/ConfigurationTab.vue
create mode 100644 ui/src/views/setting/ConfigurationTable.vue
create mode 100644 ui/src/views/setting/ConfigurationValue.vue