This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch VMwareVMMigrationWithVolumeInLocalStorage
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard be57f6a793 Fix VMware VM migration with volume in case of local storage
omit 85b7120503 Fix changeOfferingForVolume API to consider storage type in
the disk offering
add c0124e2753 ui: Allow editing host and storage tags in updateHost &
updatStoragePool forms (#6375)
add 8f39a049bb agent: enable ssl only for kvm agent (not in system vms)
(#6371)
add d373f973ba Update VM name, when the new name provided in
updateVirtualMachine API in different case. (#6379)
add c0176b24ab Merge branch '4.16'
add 8aca2b67f0 UI: Fix hypervisor list after zone validation when
registering a template (#6382)
add 0ab0c35549 UI: Add missing tooltips on service offering creation
(#6376)
add b3861d5900 removed unused field (#6383)
add 867cb30efb Add new labels (#6378)
add 07cabb5890 Fix: Cannot import Vmware instances (#6384)
add ea37d757d3 Reword KVM snapshot without memory error message (#6387)
add 57ecdf9ea6 Fix changeOfferingForVolume API to consider storage type in
the disk offering (#6377)
add 1964b7fda3 Fix, change network.disable.rpfilter type from integer to
boolean. (#6380)
add 5f29bc2b80 server: publish ip6 assign event with route, always for vpc
(#6389)
add b15c202ee5 test: add test for importUnmanagedInstance (#6385)
add e15abfc3d5 cks: upgrade k8s to 1.23.3/1.24.0 in smoke test (#6388)
add 2ada6cc1b8 ui: update ja locale translation (#6332)
add 006473ca19 Log exception on keystore build for custom certificate
(#6394)
add 9b754ef08b Merge branch '4.16'
add 5fdd4d211d cks: Get caller user keys if cluster belongs to project
(#6392)
add ffc914d846 Log load bean exception (#6356)
add b62b5c96e8 Prevent NPE on reboot stopped VM and startVM output with
null displayname (#6397)
add 363a2cff82 Backport: kvm: truncate vnc password to 8 chars (#6244)
(#6402)
add 8ae977c233 Merge branch '4.16'
add a29d5d324f 프라이머리 스토리지 시크릿키 누락 수정 (#6407)
add 40dabb6ee7 UI: fix create vpc private gateway for regular user (#6400)
add dc975dff95 [KVM] Enable IOURING only when it is available on the host
(#6399)
add b1c8b5ab37 [KVM] Fix VM migration error due to VNC password on libvirt
limiting versions (#6404)
add 96594aec28 Merge branch '4.16'
add c123c3fd2f remove request listener to prevent untimely session
invalidation (#6393)
add 1ead6c1bac Fix logic check error for update GPU groupDetails (#6405)
add 8440b77ed9 UI: Fix Upgrade kubernetes form (#6417)
add c249e25d74 ui: Fix create kubernetes cluster with ha enabled (#6416)
add 9dbb736488 ui: Display associated VPC network name against vpc tiers -
deploy VM form (#6421)
add 45ea764374 UI: Fix template is deselected if other zone is selected
(#6415)
add 81b7e6e750 Fix extract snapshot from vm snapshot on kvm (#6422)
add 82e0d5d679 Fix UEFI detection on KVM and prevent deployments on non
UEFI enabled hosts (#6423)
add 0f4c3af935 cks: Fix when deployed on a nw without internet access
(#6418)
add c56220fcf2 Updating pom.xml version numbers for release 4.17.0.0
add 038a669d6b Updating pom.xml version numbers for release
4.17.1.0-SNAPSHOT
add 7ed8d54db2 Fix version numbers
add 0bcc609f05 Updating pom.xml version numbers for release
4.18.0.0-SNAPSHOT
add 8333e8fbd7 Fix upgrade version on files
add 9b50e417f7 Add upgrade path for 4.17.1
add 2aca780011 Merge branch '4.17'
add 1feef50b5a Add upgrade path for 4.18.0
add 559e275d76 Fix upgrade schema cleanup
add cb7cbeca25 Fix deploy from ISO with custom disk offering (#6441)
add 78a1602eb9 fixes error when creating volume from the snapshot (#6443)
add 7526c5fc08 Merge branch '4.17'
add 885e749333 fixes the added storage tags issues on adding primary
storage (#6438)
add 22c48363a1 hide project delete button while in this project view
(#6439)
add e20a57dc13 Merge branch '4.17'
add d45d257b9a UI: fix create vpc private gw by regular users (#6445)
add aae0fae950 UI: Fix hypervisor not selected by default when deploying
VM from ISO (#6436)
add 64262d943f Merge branch '4.17'
add a84664fc9d Specify vm snapshot uuid in response over db id in the
async job response (#6449)
add 90a0ee0b6c fix pseudo random behaviour in pool selection (#6307)
add bfe1697721 some component tests fixes (#5442)
add 84eed6db72 Merge branch '4.17'
add 1b716960fc api: Add vpc name and uuid to VMs list response (nics) and
nics response (#6461)
add a32f19b34d Merge branch '4.17'
add 5b9b117301 add a default value for customColumns
add 98bc4415da Revert "some component tests fixes (#5442)"
add 691fd469ea Merge remote-tracking branch 'origin/4.17'
add 25ed664628 Fix main branch by removing unnecessary commits, syncing
4.17 to main
add d6488c5019 ui: add a provider for primary storage when adding zone
wizard (#6429)
add c6f12f37ee ui: add a default value for customColumns (#6462)
add 15c4dcfa44 ui: add groupAction for upgrade router to use newer
template (#6468)
add 8b721a9318 Merge remote-tracking branch 'origin/4.17'
add a1cbe0f3cc Fix VMware VM migration with volume in case of local storage
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 (be57f6a793)
\
N -- N -- N refs/heads/VMwareVMMigrationWithVolumeInLocalStorage
(a1cbe0f3cc)
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:
agent/conf/agent.properties | 2 +-
agent/pom.xml | 2 +-
.../src/main/java/com/cloud/agent/AgentShell.java | 23 -
.../cloud/agent/properties/AgentProperties.java | 7 -
api/pom.xml | 2 +-
.../main/java/com/cloud/network/Ipv6Service.java | 2 -
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../api/command/user/network/CreateNetworkCmd.java | 3 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 10 +-
.../cloudstack/api/response/NicResponse.java | 24 +
client/pom.xml | 2 +-
core/pom.xml | 2 +-
debian/changelog | 12 +
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
engine/components-api/pom.xml | 2 +-
.../main/java/com/cloud/storage/StorageUtil.java | 14 +
engine/network/pom.xml | 2 +-
engine/orchestration/pom.xml | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 11 -
.../engine/orchestration/VolumeOrchestrator.java | 40 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 4 +
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 2 +-
...e41600to41610.java => Upgrade41700to41710.java} | 24 +-
...e41600to41610.java => Upgrade41710to41800.java} | 24 +-
.../src/main/java/com/cloud/vm/UserVmVO.java | 5 +
...cleanup.sql => schema-41700to41710-cleanup.sql} | 2 +-
...21to430-cleanup.sql => schema-41700to41710.sql} | 5 +-
...cleanup.sql => schema-41710to41800-cleanup.sql} | 2 +-
...21to430-cleanup.sql => schema-41710to41800.sql} | 5 +-
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
engine/storage/datamotion/pom.xml | 2 +-
engine/storage/image/pom.xml | 2 +-
engine/storage/integration-test/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../allocator/AbstractStoragePoolAllocator.java | 53 +-
.../AbstractStoragePoolAllocatorTest.java | 113 +
engine/storage/volume/pom.xml | 2 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
framework/db/pom.xml | 2 +-
framework/direct-download/pom.xml | 4 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
.../security/keystore/KeystoreManagerImpl.java | 16 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/project-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 2 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
plugins/dedicated-resources/pom.xml | 2 +-
.../implicit-dedication/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 98 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 12 +-
.../wrapper/LibvirtReadyCommandWrapper.java | 2 +-
.../kvm/storage/KVMStorageProcessor.java | 4 +-
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 21 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 14 +-
.../main/resources/conf/k8s-control-node-add.yml | 35 +-
.../src/main/resources/conf/k8s-control-node.yml | 62 +-
.../src/main/resources/conf/k8s-node.yml | 34 +-
.../main/resources/script/upgrade-kubernetes.sh | 11 +-
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
plugins/network-elements/f5/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
plugins/network-elements/juniper-srx/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
plugins/storage/volume/default/pom.xml | 2 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
plugins/storage/volume/storpool/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../apache/cloudstack/api/command/ListIdpsCmd.java | 7 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
pom.xml | 2 +-
quickcloud/pom.xml | 2 +-
scripts/storage/qcow2/managesnapshot.sh | 46 +-
server/pom.xml | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 11 +
server/src/main/java/com/cloud/api/ApiServlet.java | 165 +-
.../java/com/cloud/api/ApiSessionListener.java | 46 +-
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 54 +-
.../api/auth/DefaultLogoutAPIAuthenticatorCmd.java | 3 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 12 +-
.../main/java/com/cloud/configuration/Config.java | 4 +-
.../deploy/DeploymentPlanningManagerImpl.java | 5 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 81 +-
.../main/java/com/cloud/server/StatsCollector.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 323 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 19 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 4 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 3 -
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
systemvm/pom.xml | 2 +-
test/integration/broken/test_vpc_vm_life_cycle.py | 2 +-
test/integration/component/test_host_ha.py | 49 +-
.../component/test_rootvolume_resize.py | 6 +-
.../test_attach_multiple_volumes.py} | 161 +-
test/integration/smoke/test_kubernetes_clusters.py | 38 +-
.../smoke/test_kubernetes_supported_versions.py | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 152 -
.../smoke/test_vm_lifecycle_unmanage_import.py | 245 +
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/marvin/marvin/config/test_data.py | 12 +
tools/marvin/marvin/lib/base.py | 43 +
tools/marvin/marvin/lib/vcenter.py | 37 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/pom.xml | 2 +-
ui/public/locales/en.json | 2 +
ui/public/locales/ja_JP.json | 5899 ++++++++++++--------
ui/public/locales/pt_BR.json | 2 +
ui/src/config/section/infra/managementServers.js | 4 +-
ui/src/config/section/infra/routers.js | 5 +-
ui/src/config/section/network.js | 8 +-
ui/src/config/section/plugin/quota.js | 2 +-
ui/src/config/section/project.js | 2 +-
ui/src/config/section/storage.js | 14 +-
ui/src/store/modules/user.js | 3 +-
ui/src/views/AutogenView.vue | 2 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 4 +-
ui/src/views/compute/DeployVM.vue | 12 +-
ui/src/views/compute/UpgradeKubernetesCluster.vue | 1 +
ui/src/views/compute/wizard/NetworkSelection.vue | 7 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +-
ui/src/views/infra/AddPrimaryStorage.vue | 5 -
ui/src/views/infra/zone/StaticInputsForm.vue | 47 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 100 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 32 +-
ui/src/views/network/VpcTab.vue | 25 +-
ui/src/views/offering/AddComputeOffering.vue | 4 +-
ui/src/views/storage/CreateVolume.vue | 28 +-
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
.../cloud/utils/component/ComponentContext.java | 11 +-
vmware-base/pom.xml | 2 +-
225 files changed, 5405 insertions(+), 3335 deletions(-)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41600to41610.java =>
Upgrade41700to41710.java} (74%)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41600to41610.java =>
Upgrade41710to41800.java} (74%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41600to41610-cleanup.sql
=> schema-41700to41710-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql
=> schema-41700to41710.sql} (94%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41600to41610-cleanup.sql
=> schema-41710to41800-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql
=> schema-41710to41800.sql} (94%)
create mode 100644
engine/storage/src/test/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocatorTest.java
rename test/integration/{component/test_simultaneous_volume_attach.py =>
smoke/test_attach_multiple_volumes.py} (61%)
create mode 100644 test/integration/smoke/test_vm_lifecycle_unmanage_import.py
