This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 08069a37378 4.21/main Health Check, please don't merge this!
add 8c579538f97 CKS: Allow affinity group selection during cluster
creation (#12386)
add 93239e09f19 Add conserve mode for VPC offerings (#12487)
add 3bd5410f9aa Add support to clone existing offerings and update them
(#12357)
add b744824f658 Add code owners for nsx network elements plugin (#12838)
add 120a43648b8 set width of dropdown select items for Network Offering
during add tier dialog (#11899)
add 58916eb6080 Use lateral join (introduced in MySQL 8.0.14) with
subquery on user_statistics table in account_view for netstats (#12631)
add c3d6a8cff72 server: fix templatetype during iso upload (#12151)
add db836229564 ui: fix create network from global create menu (#12677)
add 7aa0558c5b9 ui: avoid 404 after deleting template zones (#12681)
add 71daf84c9e8 Show security group selection in Basic zone VM deployment
and fix SG listing for cross-domain deployments (#12775)
add 7f7d0b02e14 Remove unnecessary stubbings in
ManagementServerMaintenanceManagerImplTest (#11914) (#12623)
add 2359061f663 api: remove required flag of gatewayid in
CreateStaticRouteCmd (#12786)
add 27bce46a8e3 Clear System VM IP from NICs for PublicNetworkGuru (#11992)
add 3b42fbf3b24 Fixing CI failures (#12789)
add 70489448831 [Fix] VMware to KVM migration instances listing failure
(#12766)
add 09ee0927e9b [4.22] Prevent Load Balancer rule creation when adding a
VM from a different network (#12785)
add e93ae1a4f45 New config key "allow.import.volume.with.backing.file" to
skip volume backing (#12809)
add bce55945ece Mark VMs in error state when expunge fails during destroy
operation (#12749)
add 7107d28db82 [VMware to KVM] Add guest OS for importing VM based on the
source VM OS (#12802)
add 7c3637a2f58 Fix duplicate dummy templates, and update guest os for
dummy template (#12780)
add d6c39772b21 Set management server id from cookies after saml login
(#12858)
add 84676afd5cc Check for null host before proceeding with VM volume
operations in managed storage while restoring VM (#12879)
add c1af36f8fc9 [4.22] Prevent unmanaging or reinstalling a VM if it is
part of a CKS cluster (#12800)
add 1bff543e58e Merge branch '4.22'
add 69fd9228e9b 4.21/main Health Check, please don't merge this!
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (08069a37378)
\
N -- N -- N refs/heads/healthcheck-main (69fd9228e9b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/CODEOWNERS | 2 +
.github/workflows/ci.yml | 1 +
.../cloud/configuration/ConfigurationService.java | 34 +-
api/src/main/java/com/cloud/event/EventTypes.java | 8 +
.../kubernetes/cluster/KubernetesCluster.java | 2 +-
.../cluster/KubernetesServiceHelper.java | 3 +
.../java/com/cloud/network/NetworkService.java | 2 +
.../network/lb/LoadBalancingRulesService.java | 2 +-
.../java/com/cloud/network/vpc/VpcOffering.java | 2 +
.../cloud/network/vpc/VpcProvisioningService.java | 5 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 3 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 3 +
.../main/java/com/cloud/vm/VmDetailConstants.java | 1 +
.../cloudstack/affinity/AffinityGroupService.java | 1 -
.../cloudstack/affinity/AffinityProcessorBase.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 9 +
...fferingCmd.java => CloneBackupOfferingCmd.java} | 87 +-
.../admin/backup/ImportBackupOfferingCmd.java | 5 +-
.../admin/network/CloneNetworkOfferingCmd.java | 113 ++
.../admin/network/CreateNetworkOfferingCmd.java | 460 +------
...fferingCmd.java => NetworkOfferingBaseCmd.java} | 109 +-
...kOfferingCmd.java => CloneDiskOfferingCmd.java} | 42 +-
.../admin/offering/CloneServiceOfferingCmd.java | 65 +-
.../api/command/admin/vm/ImportVmCmd.java | 12 +
.../api/command/admin/vpc/CloneVPCOfferingCmd.java | 109 ++
.../command/admin/vpc/CreateVPCOfferingCmd.java | 15 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 9 +-
.../api/command/user/guest/ListGuestOsCmd.java | 9 +
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 28 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 1 -
.../api/response/FirewallRuleResponse.java | 8 +
.../api/response/UnmanagedInstanceResponse.java | 24 +
.../api/response/VpcOfferingResponse.java | 12 +
.../cloudstack/api/response/VpcResponse.java | 8 +
.../apache/cloudstack/backup/BackupManager.java | 7 +
.../volume/VolumeImportUnmanageService.java | 13 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 19 +
.../apache/cloudstack/vm/UnmanagedVMsManager.java | 2 +
.../admin/backup/CloneBackupOfferingCmdTest.java | 301 +++++
.../admin/network/CloneNetworkOfferingCmdTest.java | 324 +++++
.../offering/CloneServiceOfferingCmdTest.java | 669 ++++++++++
.../command/admin/vpc/CloneVpcOfferingCmdTest.java | 299 +++++
.../java/com/cloud/network/IpAddressManager.java | 2 +
.../network/lb/LoadBalancingRulesManager.java | 2 +-
.../java/com/cloud/network/vpc/VpcManager.java | 5 +
.../engine/orchestration/NetworkOrchestrator.java | 7 +-
.../java/com/cloud/network/vpc/VpcOfferingVO.java | 12 +
.../java/com/cloud/storage/dao/GuestOSDao.java | 2 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 6 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 12 +
.../com/cloud/upgrade/dao/Upgrade42200to42210.java | 51 +
.../datastore/db/SnapshotDataStoreDaoImpl.java | 14 +-
.../META-INF/db/schema-42200to42210-cleanup.sql | 2 +
.../resources/META-INF/db/schema-42200to42210.sql | 2 +
.../resources/META-INF/db/schema-42210to42300.sql | 16 +
.../db/views/cloud.account_netstats_view.sql | 31 -
.../META-INF/db/views/cloud.account_view.sql | 15 +-
.../META-INF/db/views/cloud.vpc_offering_view.sql | 1 +
.../motion/StorageSystemDataMotionStrategy.java | 4 +-
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 2 +
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 2 +
.../KubernetesClusterAffinityGroupMapVO.java | 44 +-
.../cluster/KubernetesClusterEventTypes.java | 1 +
.../cluster/KubernetesClusterManagerImpl.java | 292 +++-
.../cluster/KubernetesClusterService.java | 3 +
.../cluster/KubernetesServiceHelperImpl.java | 102 ++
.../KubernetesClusterActionWorker.java | 85 ++
.../KubernetesClusterDestroyWorker.java | 1 +
...ernetesClusterResourceModifierActionWorker.java | 75 +-
.../KubernetesClusterScaleWorker.java | 49 +-
.../KubernetesClusterStartWorker.java | 24 +-
...a => KubernetesClusterAffinityGroupMapDao.java} | 11 +-
.../KubernetesClusterAffinityGroupMapDaoImpl.java | 72 +
.../cluster/CreateKubernetesClusterCmd.java | 17 +-
.../cluster/ScaleKubernetesClusterCmd.java | 4 +-
...> UpdateKubernetesClusterAffinityGroupCmd.java} | 61 +-
.../api/response/KubernetesClusterResponse.java | 48 +
.../spring-kubernetes-service-context.xml | 1 +
.../KubernetesClusterAffinityGroupMapVOTest.java | 87 ++
.../cluster/KubernetesClusterHelperImplTest.java | 145 --
.../cluster/KubernetesClusterManagerImplTest.java | 473 +++++++
.../cluster/KubernetesServiceHelperImplTest.java | 316 +++++
.../KubernetesClusterActionWorkerTest.java | 99 ++
.../cloud/network/lb/LoadBalanceRuleHandler.java | 2 +-
.../contrail/management/ContrailManagerImpl.java | 2 +-
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 3 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 20 +-
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 1 +
.../com/cloud/api/query/vo/VpcOfferingJoinVO.java | 8 +
.../configuration/ConfigurationManagerImpl.java | 886 ++++++++++++-
.../deploy/DeploymentPlanningManagerImpl.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 41 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 5 +
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../network/firewall/FirewallManagerImpl.java | 27 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 110 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 388 +++++-
.../com/cloud/server/ManagementServerImpl.java | 41 +-
.../com/cloud/template/TemplateManagerImpl.java | 3 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 132 +-
.../affinity/AffinityGroupServiceImpl.java | 11 +
.../cloudstack/backup/BackupManagerImpl.java | 75 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 15 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 100 +-
.../ConfigurationManagerCloneIntegrationTest.java | 1054 +++++++++++++++
.../ConfigurationManagerImplTest.java | 240 +++-
.../cloud/network/as/AutoScaleManagerImplTest.java | 4 +-
.../network/firewall/FirewallManagerTest.java | 98 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 18 +-
.../lb/LoadBalancingRulesManagerImplTest.java | 52 +
.../com/cloud/network/vpc/VpcManagerImplTest.java | 23 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 54 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 25 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 5 +
.../cloudstack/backup/BackupManagerTest.java | 107 ++
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 55 +-
.../test_kubernetes_cluster_affinity_groups.py | 931 +++++++++++++
.../integration/smoke/test_domain_vpc_offerings.py | 167 ++-
test/integration/smoke/test_secondary_storage.py | 16 +-
test/integration/smoke/test_vpc_conserve_mode.py | 314 +++++
tools/marvin/marvin/lib/base.py | 2 +
ui/public/locales/en.json | 22 +
ui/src/components/CheckBoxSelectPair.vue | 7 +
ui/src/components/offering/ComputeOfferingForm.vue | 812 ++++++++++++
ui/src/components/offering/DiskOfferingForm.vue | 507 +++++++
ui/src/composables/useServiceCapabilityParams.js | 153 +++
ui/src/config/section/compute.js | 23 +-
ui/src/config/section/offering.js | 51 +-
ui/src/permission.js | 1 +
.../compute/ChangeKubernetesClusterAffinity.vue | 200 +++
ui/src/views/compute/CreateAffinityGroup.vue | 173 +++
ui/src/views/compute/CreateKubernetesCluster.vue | 155 ++-
ui/src/views/compute/DeployVM.vue | 6 +
.../compute/wizard/SecurityGroupSelection.vue | 26 +-
ui/src/views/image/TemplateZones.vue | 14 +-
ui/src/views/network/CreateNetwork.vue | 2 +-
ui/src/views/network/LoadBalancing.vue | 36 +-
ui/src/views/network/PortForwarding.vue | 42 +-
ui/src/views/network/PublicIpResource.vue | 28 +-
ui/src/views/network/VpcTiersTab.vue | 10 +-
ui/src/views/offering/AddComputeOffering.vue | 812 +-----------
ui/src/views/offering/AddDiskOffering.vue | 492 +------
ui/src/views/offering/AddNetworkOffering.vue | 95 +-
ui/src/views/offering/AddVpcOffering.vue | 44 +-
ui/src/views/offering/CloneBackupOffering.vue | 432 ++++++
ui/src/views/offering/CloneComputeOffering.vue | 674 ++++++++++
ui/src/views/offering/CloneDiskOffering.vue | 279 ++++
...etworkOffering.vue => CloneNetworkOffering.vue} | 1391 +++++++++++---------
.../{AddVpcOffering.vue => CloneVpcOffering.vue} | 608 +++++----
ui/src/views/tools/ImportUnmanagedInstance.vue | 37 +-
ui/src/views/tools/ManageInstances.vue | 21 +-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 27 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 16 +-
.../hypervisor/vmware/util/VmwareHelperTest.java | 23 +
156 files changed, 13759 insertions(+), 3543 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/{ImportBackupOfferingCmd.java
=> CloneBackupOfferingCmd.java} (63%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/CloneNetworkOfferingCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/network/{CreateNetworkOfferingCmd.java
=> NetworkOfferingBaseCmd.java} (88%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/offering/{DeleteDiskOfferingCmd.java
=> CloneDiskOfferingCmd.java} (60%)
copy
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java
=>
api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CloneServiceOfferingCmd.java
(53%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CloneVPCOfferingCmd.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/backup/CloneBackupOfferingCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/network/CloneNetworkOfferingCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CloneServiceOfferingCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CloneVpcOfferingCmdTest.java
delete mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql
copy
engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java
=>
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterAffinityGroupMapVO.java
(61%)
copy
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/{KubernetesClusterDetailsDao.java
=> KubernetesClusterAffinityGroupMapDao.java} (66%)
create mode 100644
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterAffinityGroupMapDaoImpl.java
copy
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/{UpgradeKubernetesClusterCmd.java
=> UpdateKubernetesClusterAffinityGroupCmd.java} (66%)
create mode 100644
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterAffinityGroupMapVOTest.java
delete mode 100644
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterHelperImplTest.java
create mode 100644
server/src/test/java/com/cloud/configuration/ConfigurationManagerCloneIntegrationTest.java
create mode 100644
test/integration/component/test_kubernetes_cluster_affinity_groups.py
create mode 100644 test/integration/smoke/test_vpc_conserve_mode.py
create mode 100644 ui/src/components/offering/ComputeOfferingForm.vue
create mode 100644 ui/src/components/offering/DiskOfferingForm.vue
create mode 100644 ui/src/composables/useServiceCapabilityParams.js
create mode 100644 ui/src/views/compute/ChangeKubernetesClusterAffinity.vue
create mode 100644 ui/src/views/compute/CreateAffinityGroup.vue
create mode 100644 ui/src/views/offering/CloneBackupOffering.vue
create mode 100644 ui/src/views/offering/CloneComputeOffering.vue
create mode 100644 ui/src/views/offering/CloneDiskOffering.vue
copy ui/src/views/offering/{AddNetworkOffering.vue =>
CloneNetworkOffering.vue} (56%)
copy ui/src/views/offering/{AddVpcOffering.vue => CloneVpcOffering.vue} (59%)
