This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 8a87eaaec9c [NSX] Add ACL types support (#8224)
add cfd6bffacf2 PULL_REQUEST_TEMPLATE.md: fix spelling (#8220)
add d0f3233fda3 edge-zone,kvm,iso,cks: allow k8s deployment with
direct-download iso (#8142)
add b79e3937b46 UI: fix scale vm if first disk offering is dymamic (#8213)
add 05b9b6e2e77 Merge branch '4.18' into main
add df4cd2aae42 Inject hypervisor type and volume format on Quota tariffs
(#8138)
add 96b07d797b7 Fix flaky tungsten test using comparator (#8232)
add 04061f12e5a storagetype API param in list service/disk offerings
(#8215)
add b7835d02d25 Fix deploy as is VM start after template deletion (#8115)
add c7100c3d751 Merge release branch 4.18 to main
add 1f29f6f0409 Public IP quarantine feature (#7378)
add be4a648f5ab Create global configuration to allow changing the default
nic adapter for user VMs in VMware (#7954)
add 267a457efc5 Externalize KVM HA heartbeat frequency (#6892)
add cc45bffdbd3 Improved concatenation way in PropertiesStorage.java
(#7486)
add 0735b91037d api: introduce domainid and account parameter in
createTemplate API (#8210)
add 60017723357 multi local storage handling for kvm (#6699)
add 6eb04a86a6b Fixed Hashmap Key value comparision (#8238)
add db27c0ad2a2 Set number of hours per month with actual number in Quota
(#7210)
add adbb5520ca5 Database VIEW management via separated files (#7417)
add c7ed4ca272c schema: revert incorrect removal of oauth changes in #7417
(#8245)
add eaa4123068a VNF: fix UI bugs and polish (#8227)
add 1a2dbebe489 Let Prometheus exporter plugin support utf8 characters
(#8228)
add 1b56a8e8733 Fixed spelling and added missing states to response (#8248)
add 98d643efe6c Merge release branch 4.18 to main
add 5c7e4b7edc8 api: add ipaddress argument to disassociateIPAddress
(#8222)
add f0b757e91ea [StepSecurity] ci: Harden GitHub Actions (#8209)
add b0a9949775b ui: include domain and account field for createTemplate
forms (#8257)
add 60b399f8758 Fix create private gateway rollback (#8244)
add 3c7c75bacfd Clear pool id if volume allocation fails (#8202)
add 8f390873772 Fix typo in ssvm check script (#8191)
add 956efb27d93 allow filtering of listDiskOffering and
listServiceOffering APIs by account or project (#7082)
add a31f2116282 Merge remote-tracking branch 'remote/4.18'
add 26b01f6f3be Flexible tags for hosts and storage pools (#7489)
add cb62ce67671 Global ACL for VPCs (#7150)
new 33b494aebf1 Merge branch 'main' into nsx-integration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yml | 3 +
.github/workflows/ci.yml | 6 +-
.github/workflows/rat.yml | 3 +
.github/workflows/ui.yml | 3 +
PULL_REQUEST_TEMPLATE.md | 6 +-
agent/conf/agent.properties | 12 +
.../cloud/agent/dao/impl/PropertiesStorage.java | 7 +-
.../cloud/agent/properties/AgentProperties.java | 38 ++-
.../java/com/cloud/agent/api/StoragePoolInfo.java | 7 +
.../java/com/cloud/network/NetworkService.java | 8 +
.../java/com/cloud/network/PublicIpQuarantine.java | 24 +-
api/src/main/java/com/cloud/network/VNF.java | 1 -
.../main/java/com/cloud/server/ResourceTag.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 8 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 +
.../api/command/admin/host/ListHostsCmd.java | 4 +
.../api/command/admin/host/UpdateHostCmd.java | 7 +
.../admin/storage/CreateStoragePoolCmd.java | 7 +
.../command/admin/storage/ListStoragePoolsCmd.java | 29 +-
.../admin/storage/UpdateStoragePoolCmd.java | 7 +
.../user/address/DisassociateIPAddrCmd.java | 68 ++++-
.../user/address/ListQuarantinedIpsCmd.java | 51 ++++
.../user/address/RemoveQuarantinedIpCmd.java | 72 +++++
.../user/address/UpdateQuarantinedIpCmd.java | 75 +++++
.../api/command/user/iso/RegisterIsoCmd.java | 7 +
.../user/network/CreateNetworkACLListCmd.java | 36 ++-
.../user/offering/ListDiskOfferingsCmd.java | 15 +-
.../user/offering/ListServiceOfferingsCmd.java | 15 +-
.../command/user/template/CreateTemplateCmd.java | 129 ++++----
.../api/response/AcquireIPAddressResponse.java | 2 +-
.../cloudstack/api/response/HostResponse.java | 12 +
.../cloudstack/api/response/IPAddressResponse.java | 2 +-
.../api/response/IpQuarantineResponse.java | 130 ++++++++
.../api/response/PortableIpResponse.java | 2 +-
.../api/response/StoragePoolResponse.java | 12 +
.../org/apache/cloudstack/query/QueryService.java | 4 +
.../user/template/CreateTemplateCmdTest.java | 16 +
.../api/storage/PrimaryDataStoreParameters.java | 10 +
.../java/com/cloud/network/IpAddressManager.java | 48 +++
.../src/main/java/com/cloud/host/HostTagVO.java | 16 +
.../src/main/java/com/cloud/host/HostVO.java | 24 +-
.../src/main/java/com/cloud/host/dao/HostDao.java | 6 +
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 103 +++++--
.../main/java/com/cloud/host/dao/HostTagsDao.java | 10 +-
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 39 ++-
.../java/com/cloud/network/dao/IPAddressDao.java | 3 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 20 ++
.../java/com/cloud/network/dao/IPAddressVO.java | 9 -
.../dao/PublicIpQuarantineDao.java} | 17 +-
.../network/dao/PublicIpQuarantineDaoImpl.java | 71 +++++
.../com/cloud/network/vo/PublicIpQuarantineVO.java | 131 ++++++++
.../java/com/cloud/network/vpc/NetworkACLVO.java | 7 +
.../java/com/cloud/storage/StoragePoolTagVO.java | 28 ++
.../com/cloud/storage/dao/StoragePoolTagsDao.java | 6 +-
.../cloud/storage/dao/StoragePoolTagsDaoImpl.java | 25 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 28 ++
.../storage/datastore/db/PrimaryDataStoreDao.java | 8 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 46 ++-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41810to41900.sql | 331 ++-------------------
.../META-INF/db/views/cloud.async_job_view.sql | 129 ++++++++
.../META-INF/db/views/cloud.data_center_view.sql | 59 ++++
.../META-INF/db/views/cloud.disk_offering_view.sql | 82 +++++
.../META-INF/db/views/cloud.domain_router_view.sql | 126 ++++++++
.../META-INF/db/views/cloud.host_view.sql | 111 +++++++
.../db/views/cloud.network_offering_view.sql | 85 ++++++
.../db/views/cloud.service_offering_view.sql | 114 +++++++
.../META-INF/db/views/cloud.snapshot_view.sql | 107 +++++++
.../META-INF/db/views/cloud.storage_pool_view.sql | 68 +++++
.../META-INF/db/views/cloud.template_view.sql | 131 ++++++++
.../META-INF/db/views/cloud.user_view.sql | 65 ++++
.../META-INF/db/views/cloud.user_vm_view.sql | 215 +++++++++++++
.../src/test/java/com/cloud/host/HostVOTest.java | 145 +++++----
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 24 +-
.../storage/image/TemplateDataFactoryImpl.java | 49 +--
.../allocator/AbstractStoragePoolAllocator.java | 4 +
.../ClusterScopeStoragePoolAllocator.java | 6 +-
.../allocator/LocalStoragePoolAllocator.java | 5 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 8 +-
.../volume/datastore/PrimaryDataStoreHelper.java | 2 +-
.../src/main/java/com/cloud/utils/db/Filter.java | 4 +
.../main/java/com/cloud/utils/db/GenericDao.java | 2 +
.../java/com/cloud/utils/db/GenericDaoBase.java | 23 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 14 +-
.../quota/activationrule/presetvariables/Host.java | 10 +
.../presetvariables/PresetVariableHelper.java | 46 ++-
.../activationrule/presetvariables/Storage.java | 11 +
.../activationrule/presetvariables/Value.java | 20 ++
.../cloudstack/quota/QuotaManagerImplTest.java | 6 +-
.../presetvariables/PresetVariableHelperTest.java | 288 +++++++++++-------
.../activationrule/presetvariables/ValueTest.java | 14 +
.../manager/allocator/impl/RandomAllocator.java | 15 +-
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 10 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 1 -
.../hypervisor/kvm/storage/KVMStoragePool.java | 12 +-
.../kvm/storage/KVMStoragePoolManager.java | 6 +-
.../kvm/storage/KVMStorageProcessor.java | 59 ++--
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 8 +-
.../hypervisor/vmware/manager/VmwareManager.java | 8 +
.../vmware/manager/VmwareManagerImpl.java | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 18 +-
.../version/KubernetesVersionManagerImpl.java | 20 +-
.../version/AddKubernetesSupportedVersionCmd.java | 10 +-
.../KubernetesSupportedVersionResponse.java | 8 +
.../cloudstack/metrics/PrometheusExporterImpl.java | 9 +-
.../metrics/PrometheusExporterServerImpl.java | 19 +-
.../network/tungsten/service/TungstenApiTest.java | 2 +
.../ElastistorPrimaryDataStoreLifeCycle.java | 2 +
.../lifecycle/DateraPrimaryDataStoreLifeCycle.java | 2 +
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 84 ++----
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 2 +
.../NexentaPrimaryDataStoreLifeCycle.java | 2 +
.../ScaleIOPrimaryDataStoreLifeCycle.java | 2 +
.../SolidFirePrimaryDataStoreLifeCycle.java | 2 +
.../SolidFireSharedPrimaryDataStoreLifeCycle.java | 2 +
.../manager/allocator/impl/FirstFitAllocator.java | 11 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 21 ++
.../java/com/cloud/api/query/QueryManagerImpl.java | 124 +++++++-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 1 +
.../cloud/api/query/dao/StoragePoolJoinDao.java | 3 +
.../api/query/dao/StoragePoolJoinDaoImpl.java | 58 ++++
.../java/com/cloud/api/query/vo/HostJoinVO.java | 7 +
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 45 ++-
.../deploy/DeploymentPlanningManagerImpl.java | 14 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 7 +
.../com/cloud/network/IpAddressManagerImpl.java | 129 +++++++-
.../java/com/cloud/network/NetworkServiceImpl.java | 98 +++++-
.../com/cloud/network/router/NetworkHelper.java | 3 +
.../cloud/network/router/NetworkHelperImpl.java | 5 +
.../cloud/network/vpc/NetworkACLServiceImpl.java | 131 +++++---
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 61 ++--
.../com/cloud/resource/ResourceManagerImpl.java | 22 +-
.../resource/RollingMaintenanceManagerImpl.java | 7 +-
.../com/cloud/server/ManagementServerImpl.java | 12 +
.../java/com/cloud/storage/StorageManagerImpl.java | 140 ++++++++-
.../com/cloud/storage/VolumeApiServiceImpl.java | 44 ++-
.../cloud/storage/listener/StoragePoolMonitor.java | 2 +-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 1 +
.../cloud/template/HypervisorTemplateAdapter.java | 27 +-
.../configuration/ConfigurationManagerTest.java | 10 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 211 +++++++++----
.../com/cloud/network/IpAddressManagerTest.java | 211 +++++++++++--
.../com/cloud/network/NetworkServiceImplTest.java | 248 ++++++++++++---
.../network/vpc/NetworkACLServiceImplTest.java | 145 ++++++---
.../com/cloud/network/vpc/VpcManagerImplTest.java | 23 ++
.../com/cloud/storage/StorageManagerImplTest.java | 30 ++
.../cloud/storage/VolumeApiServiceImplTest.java | 89 ++++--
.../storage/listener/StoragePoolMonitorTest.java | 4 +-
.../java/com/cloud/user/MockUsageEventDao.java | 5 +
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 22 ++
.../networkoffering/CreateNetworkOfferingTest.java | 50 ++--
.../src/test/resources/createNetworkOffering.xml | 1 +
systemvm/agent/scripts/ssvm-check.sh | 6 +-
test/integration/smoke/test_global_acls.py | 245 +++++++++++++++
test/integration/smoke/test_network.py | 62 +++-
test/integration/smoke/test_quarantined_ips.py | 329 ++++++++++++++++++++
tools/apidoc/gen_toc.py | 3 +
tools/marvin/marvin/lib/base.py | 14 +-
ui/public/locales/en.json | 28 +-
ui/public/locales/pt_BR.json | 1 +
ui/src/components/header/CreateMenu.vue | 19 ++
ui/src/components/view/DetailsTab.vue | 8 +-
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/config/section/infra/primaryStorages.js | 2 +-
ui/src/config/section/network.js | 1 +
ui/src/config/section/storage.js | 9 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 8 +-
ui/src/views/compute/DeployVnfAppliance.vue | 11 +-
ui/src/views/compute/MigrateVMStorage.vue | 2 +-
ui/src/views/compute/MigrateWizard.vue | 2 +-
ui/src/views/compute/ScaleVM.vue | 23 +-
.../views/compute/wizard/NetworkConfiguration.vue | 8 +-
.../views/image/AddKubernetesSupportedVersion.vue | 56 +++-
ui/src/views/image/TemplateVnfSettings.vue | 3 +-
ui/src/views/infra/AddPrimaryStorage.vue | 32 +-
ui/src/views/network/IpAddressesTab.vue | 4 +-
ui/src/views/storage/CreateTemplate.vue | 92 +++++-
ui/tests/mockData/MigrateWizard.mock.json | 6 +
utils/src/main/java/com/cloud/utils/DateUtil.java | 5 +
utils/src/main/java/com/cloud/utils/FileUtil.java | 33 ++
.../utils/jsinterpreter/JsInterpreter.java | 17 +-
.../utils/jsinterpreter/TagAsRuleHelper.java | 51 ++++
.../utils/jsinterpreter/JsInterpreterTest.java | 18 ++
184 files changed, 5984 insertions(+), 1244 deletions(-)
copy
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Host.java
=> api/src/main/java/com/cloud/network/PublicIpQuarantine.java (67%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/address/ListQuarantinedIpsCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/address/RemoveQuarantinedIpCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateQuarantinedIpCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/IpQuarantineResponse.java
copy engine/schema/src/main/java/com/cloud/{host/dao/HostTagsDao.java =>
network/dao/PublicIpQuarantineDao.java} (69%)
create mode 100644
engine/schema/src/main/java/com/cloud/network/dao/PublicIpQuarantineDaoImpl.java
create mode 100644
engine/schema/src/main/java/com/cloud/network/vo/PublicIpQuarantineVO.java
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.async_job_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.data_center_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.disk_offering_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.domain_router_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.network_offering_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.service_offering_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.snapshot_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.storage_pool_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.template_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.user_view.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
create mode 100644 test/integration/smoke/test_global_acls.py
create mode 100644 test/integration/smoke/test_quarantined_ips.py
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/TagAsRuleHelper.java
