Squashed commit of the following: commit 16d079513032016a0cc946bbc97a751b5430adde Merge: 584c1cfbe0 f286f01516 Author: Rohit Yadav Date: Mon Jul 5 11:55:58 2021 +0530 Merge remote-tracking branch 'origin/4.15' into main commit 584c1cfbe0211347d94972ffdc142fca5007b42b Author: Hoang Nguyen Date: Mon Jul 5 13:23:38 2021 +0700 ui: secondary storage - Display text and change the badge color of the Read-only column (#5176) * change badge color and display text of read-only secondary storage * change readonly label to access Fixes #5169 commit 9533054599764534af00c3204c3490325ea550a7 Author: j-porsche Date: Mon Jul 5 08:23:06 2021 +0200 ui: Changes of the german translation (#5173) commit f286f0151697ed6b05b65b8c95a89be525d38073 Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Mon Jul 5 08:21:07 2021 +0200 kvm: fix VM HA on zone-wide storage pools (#5164) commit 665142701d5532e42dfcabbbccdc55c24495463a Author: Pearl Dsilva Date: Mon Jul 5 11:50:10 2021 +0530 server: Fix NPE when no recipients configured for sending alerts (#5154) * Fix NPE when no recipients configured for sending alerts * Adding logs * Address comments commit 50bf2861c01a5dccb27b8c053d681f76f17ade83 Author: Pearl Dsilva Date: Mon Jul 5 11:48:43 2021 +0530 server: Fix NPE during destroy VM (#5142) commit 0a7dafd851c38381f68a6f7c566fdc0b769d6913 Merge: 6e8c114288 d916e416ec Author: Rohit Yadav Date: Fri Jul 2 23:00:43 2021 +0530 Merge remote-tracking branch 'origin/4.15' into main commit d916e416ecf7688e6e757361c0ebd91c0120e48c Author: Rohit Yadav Date: Fri Jul 2 22:56:35 2021 +0530 Updating pom.xml version numbers for release 4.15.2.0-SNAPSHOT Signed-off-by: Rohit Yadav commit 337e8c7cffda3dfb28d577abbd6eca7a0f9b0eec Merge: 9ee6a57311 379454caae Author: Rohit Yadav Date: Fri Jul 2 22:55:37 2021 +0530 Merge tag '4.15.1.0' into 4.15 commit 6e8c114288aeb8631f5a99edd2d4171fd7baef8f Merge: f81d79da8e 9ee6a57311 Author: Rohit Yadav Date: Fri Jul 2 22:54:51 2021 +0530 Merge remote-tracking branch 'origin/4.15' into main commit f81d79da8e2c1bbd484e2a35c643b212f7694b9f Author: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Fri Jul 2 16:48:33 2021 +0530 Updated some offensive words in kubernetes plugin/service with inclusive words/terms. (#5171) commit 293dd4d8efd56d753e714af684469c69ee50c505 Author: Pearl Dsilva Date: Thu Jul 1 19:49:41 2021 +0530 volume: Fix deletion of Uploaded volumes (#5125) Fixes issue with deletion of Uploaded volumes commit 5fd970d88f25a7b4be01b4f6eb8b0421088b83a3 Author: Abhishek Kumar Date: Thu Jul 1 19:30:51 2021 +0530 db, server: refactor host_view to prevent duplicate entries (#4796) Signed-off-by: Abhishek Kumar commit 9ee6a57311562c89ab90d524bb63d4769c655465 Author: davidjumani Date: Thu Jul 1 15:58:39 2021 +0530 ui: deployvm - Add option to stay on page (#4843) * ui: deployvm - Add option to stay on page * Moving option to a dropdown commit 0d72886ee310271272f8d51f435131a5e7401b6d Author: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Thu Jul 1 10:12:59 2021 +0530 Replace the DB properties having master and slave(s), with source and replica(s) respectively, on Upgrade for inclusiveness (#5162) Updates the DB properties (with strict / full property string search) having master and slave(s), with source and replica(s) respectively on upgrade (for inclusiveness). Signed-off-by: Suresh Kumar Anaparti commit 4645863b25acc8510a75aa1d26ed73bd99339f01 Author: davidjumani Date: Thu Jul 1 09:45:21 2021 +0530 tests: Fix test failures for Local storage and Basic zones (#5106) tests: Fix test failures for Local storage and Basic (SG) zones * Skip migrate vm when localstorage enabled * Fix test_direct_download.py * Skip test_03_create_network_domain_network_offering in basic zones * Skip test_03_create_vpc_domain_vpc_offering in basic zones * Skip test_01_add_primary_storage_disabled_host if localstorageenabled commit 7835c0812062381c7e5dd5ab9d719297cd3187dc Author: dahn Date: Tue Jun 29 09:36:08 2021 +0200 tests: formatting and cleanup fixes for test_volumes (#5146) * (auto) formatting and cleanup fixes * ssh fail and detach in all cases * message format and removed overcleaning Co-authored-by: Daan Hoogland commit 9fd38c4da093e85564d2465d55292ee575abfb08 Author: Rakesh Date: Tue Jun 29 09:33:31 2021 +0200 server: Display proper names in error message (#5140) Display the proper account and other names rather than the uuid representation of the object commit 9ac3925936c385065ff6629d3bb7e0b46b579500 Author: Wei Zhou Date: Tue Jun 29 09:22:24 2021 +0200 server: list routers by healthchecksfailed (#4886) * server: list routers by healthchecksfailed * #4886: fix build error * #4886: ignore global setting Co-authored-by: Wei Zhou commit ee2c9cead24b490bdbcbd0d93d95e9f754fc6ac2 Author: davidjumani Date: Tue Jun 29 04:37:03 2021 +0530 tests: Skip test_persistent_networks if kvm and ovs (#5128) * tests: Skip test_persistent_networks if kvm and ovs * Skip if any host has ovs * addressing comments commit 379454caae76279329c52aa6ae3eea389741d935 Author: Rohit Yadav Date: Mon Jun 28 15:27:27 2021 +0530 Updating pom.xml version numbers for release 4.15.1.0 Signed-off-by: Rohit Yadav commit f58b72f6f7f79c86f77f1050616ba6d08bcf6939 Merge: 5edcf33ff0 53963256d8 Author: Rohit Yadav Date: Sun Jun 27 18:25:46 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit 53963256d85aef95928bbdddd87963c78721e183 Author: DK101010 <57522802+DK101010@users.noreply.github.com> Date: Sun Jun 27 03:10:30 2021 +0200 server: Bug/false positive success message vm start (#5148) * add throws statement during the retry process * Update engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java Co-authored-by: dahn Co-authored-by: DK101010 Co-authored-by: dahn commit aa809727a8ebcdd9178cc5594ab9fc4691cf5e38 Author: Pearl Dsilva Date: Sat Jun 26 18:16:36 2021 +0530 Fix configuration of ntp server list in systemVMs (#5160) commit 5edcf33ff0c7c7322434f3e6d28eedf0fdcc0a9d Author: Pearl Dsilva Date: Fri Jun 25 12:33:54 2021 +0530 vxlan: Fix failure to delete vxlan (#5079) commit d82909318f64b6bcc2dec83174c2e6475071ba98 Author: slavkap <51903378+slavkap@users.noreply.github.com> Date: Fri Jun 25 09:34:36 2021 +0300 server: Fix of delete of Ceph's snapshots from secondary storage (#5130) This PR fixes the deletion will be handled by DefaultSnapshotStrategy::deleteSnapshot #4797 commit 29109b43328e014dfe6c8ccae8a3a1779fd7df6b Author: davidjumani Date: Fri Jun 25 01:20:31 2021 +0530 db: Cleanup obsolete tables (#5002) * db: Cleanup unused tables * Removing volume_host_ref references * Removing template_host_ref references * fix space issue * Fix fk constraint * Removing certificate table * Revert "Removing certificate table" This reverts commit fa24e6483f339903ce895e26e3409a1751620a3f. * Addressing comments commit 1a7bfa98d8c818108337474bdc02a36cb2ea9122 Author: davidjumani Date: Fri Jun 25 01:16:50 2021 +0530 Follow consistent vo table name convention (#5004) commit a4448b4409bcfc002526f629b1f06c71bf882683 Author: Pearl Dsilva Date: Thu Jun 24 19:22:55 2021 +0530 ui: Notify users of new VM password on resetting VM's SSH key (#5153) commit 5195f8b4b7f05ee3203c3d9083f4e003cb4b171c Author: davidjumani Date: Thu Jun 24 11:08:39 2021 +0530 packaging: Create cloud user and group if not present (#5115) commit b9712c65ca319022ea8decec9b0bc945a720ba24 Author: Abhishek Kumar Date: Thu Jun 24 11:07:58 2021 +0530 ui: fix missing component in SearchView (#5123) TooltipButton was not added as Vue component. It was leading to error in page load. Signed-off-by: Abhishek Kumar commit faa57434abfe81103387078494fc56d6ef6c479c Author: Rakesh Date: Thu Jun 24 07:37:06 2021 +0200 systemvm: Change logrotate interval to hourly (#5132) * Change logrotate interval to hourly The logrotate config says interval as hourly but it relies on timer service to be invoked but in timer the frequency is mentioned as 12h. So it wont be invoked every hour. So change the frequency to hourly * Add change to vpc router commit 0eeb094949e70c242daebe2917f24f811cf007c7 Author: Hoang Nguyen Date: Thu Jun 24 12:36:05 2021 +0700 ui: watch the systemVM for enabling quickview when newly resource (#5137) commit 347f8a5a73ab469c5a630e6dc736a0392dc1c37a Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Thu Jun 24 07:35:24 2021 +0200 VR: fix source cidr of egress rules are not applied (#5143) This reverts change in commit https://github.com/apache/cloudstack/commit/065fa1c849dd09dd734778913bc50c844aa0aee3#diff-c78f7f699938cf529cbcef26bda2ed93630b58f336986fd0753fbfa1a6adbc43L103-R103 commit 53c2e19d5f010feed2d161f1275568b1d66f7746 Author: Gabriel Beims Bräscher Date: Thu Jun 24 02:33:46 2021 -0300 ui: Fix UI issue when deploying VM with rootdisksize (GB now, not in bytes) (#5150) commit 4f6851f4c057a9524231e75285ba2f5257ff640b Author: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Fri Jun 18 20:40:11 2021 +0530 Some missed inclusivity changes - use inclusive words/terms as appropriate. (#5131) commit 3a51540c24932d573564c56124231e3d527e2909 Author: Pearl Dsilva Date: Fri Jun 18 19:27:22 2021 +0530 ui: Notify vm password on reinstall of VM (for password enabled templates) (#5129) * ui: Notify vm password on reinstall of VM (for password enabled templates) * refactor commit 8e33cf715948e4d17e323ac8e83fd22c6195ed7b Author: slavkap <51903378+slavkap@users.noreply.github.com> Date: Fri Jun 18 04:21:49 2021 +0300 kvm: fix of detach volume while OS is in boot state (#4572) * fix of detach volume while OS is in boot state * check that the VM could be accessed trough ssh commit 2ececbf9942f966e9a637d758c66c073599de988 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Thu Jun 17 04:51:30 2021 -0300 kvm: Improve logs on agent start (#4958) This PR intends to improve logging on agent start to facilitate troubleshooting. Co-authored-by: Daniel Augusto Veronezi Salvador Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> commit 85e4abf52231968233f39e62747541837d644189 Author: davidjumani Date: Thu Jun 17 12:55:31 2021 +0530 ui: Show default nic/network in infocard (#5080) commit a3f39db62b6e48e0e9677839f6bc6807be5b32be Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Thu Jun 17 03:27:52 2021 -0300 server: Remove meaningless password regeneration on resetSSHKeyForVirtualMachine (#4819) On API `resetSSHKeyForVirtualMachine`, ACS also regenerates VM password when it uses a template with `Password Enabled` as true; there is already anAPI to reset VM password, therefore, the reset SSH keys API should not reset the VM SSH password as well. Besides running a meaningless process, the VM's password regeneration slows down the main process and may cause a confusion in operations due to password change in the VM without being explicity requested. Co-authored-by: Daniel Augusto Veronezi Salvador commit d2ab350a40cffe4eacf625e1648db7c12341f2cb Merge: 07cabbe7ac 46a3032178 Author: nicolas Date: Wed Jun 16 15:38:18 2021 -0300 Merge branch '4.15' into main commit 46a303217839a8abe22de300fce982a8ad662308 Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Wed Jun 16 17:49:42 2021 +0200 server: set correct gateway when update vm nic on shared networks (#5105) This PR fixes the issue that nic has wrong gateway after updating vm nic. Steps to reproduce the issue (1) create shared network (in advanced zone or advanced zone with sg) (2) create new shared network (with same startip/endip/netmask, but different gateway). (3) create a vm in new network (4) stop vm and update vm nic ip address Expected result: The vm has correct gateway and netmask (of second network) Actual result: The vm has wrong gateway and netmask (of first network) commit 326e03bc9c5fbcc22e676f46ec005919f0bdc3d7 Author: Pearl Dsilva Date: Wed Jun 16 17:58:46 2021 +0530 ui: Fix typo in error message on login page (#5118) commit 2e32c2fcd9c59be7a0697922717b603f63fa7ab3 Author: dahn Date: Wed Jun 16 12:55:54 2021 +0200 travis: allow big contents from error output in marvin tests (#5113) Co-authored-by: Daan Hoogland commit 07cabbe7ac4379a69591db88e3ad4f0b7f0d095f Author: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Wed Jun 16 12:45:27 2021 +0530 scaleio: Updated PowerFlex/ScaleIO gateway client with some improvements. (#5037) - Added connection manager to the gateway client. - Renew the client session on '401 Unauthorized' response. - Refactored the gateway client calls, for GET and POST methods. - Consume the http entity content after login/(re)authentication and close the content stream if exists. - Updated storage pool client connection timeout configuration 'storage.pool.client.timeout' to non-dynamic. - Added storage pool client max connections configuration 'storage.pool.client.max.connections' (default: 100) to specify the maximum connections for the ScaleIO storage pool client. - Updated unit tests. and blocked the attach volume operation for uploaded volume on ScaleIO/PowerFlex storage pool commit 67182dc49b0420e4b77dffbe5131d0ead03387d5 Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Wed Jun 16 05:22:31 2021 +0200 vxlan: arp does not work between hosts as multicast group is communicated over physical nic instead of linux bridge (#5078) * vxlan: arp does not work between hosts as multicast group is communicated over physical nic instead of linux bridge when linux bridge is setup (refer to http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started/en/latest/networking/vxlan.html#configure-product-to-use-vxlan-plugin) and used as the kvm traffic label of physical networks, the vms on different hosts cannot reach each other. (1) does not work: ``` /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh -v 1001 -p eth1 -b brvx-1001 -o add ``` "bridge fdb" shows ``` 00:00:00:00:00:00 dev vxlan1001 dst 239.0.3.233 via eth1 self permanent ``` (2) this works: ``` /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh -v 1001 -p cloudbr1 -b brvx-1001 -o add ``` "bridge fdb" shows ``` 00:00:00:00:00:00 dev vxlan1001 dst 239.0.3.233 via cloudbr1 self permanent ``` * vxlan: fix issue if kvm network label is not set commit 1c36ea9b4f21edfb865ce2f5b846cf0d437a25f3 Author: Gabriel Beims Bräscher Date: Tue Jun 15 18:25:20 2021 -0300 Enhance Documentation for changeServiceForVirtualMachine and scaleVirtualMachine (#5101) commit e962f0f27181a367eb8c9f54f64b995f935a5085 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Tue Jun 15 18:18:26 2021 -0300 Unify SMTP mail sending (#4954) * Add mail dependencies * Create util to send SMTP mail * Add unit tests to SMTP mail sender * Use SMTP mail util on quota alert * Use SMTP mail util on alert * Use SMTP mail util on project * Use SMTP mail util on usage alert * Remove copyright line in license header Co-authored-by: Gabriel Beims Bräscher * Remove copyright line in license header Co-authored-by: Gabriel Beims Bräscher * Remove copyright line in license header Co-authored-by: Gabriel Beims Bräscher * Remove copyright line in license header Co-authored-by: Gabriel Beims Bräscher * Remove copyright line in license header Co-authored-by: Gabriel Beims Bräscher Co-authored-by: Daniel Augusto Veronezi Salvador Co-authored-by: Gabriel Beims Bräscher commit 006d0fe4c43adf7c2f2d4add2cccc711d7108a14 Author: Abhishek Kumar Date: Tue Jun 15 16:58:38 2021 +0530 ui: show read from ova only for ova format (#5108) Fixes #5107 Signed-off-by: Abhishek Kumar commit b6e4329aa34e5378865612fb6cf27fbda1794e0a Author: fermosan <78906279+fermosan@users.noreply.github.com> Date: Tue Jun 15 13:01:49 2021 +0300 ui: Greek (Hellenic) translation (#5109) Modifications in TranslationMenu.vue as well commit bc12833ccfa20eaa4a3e3379ae279e1bbb306021 Author: Gabriel Beims Bräscher Date: Mon Jun 14 04:19:55 2021 -0300 server: Failed to scale between Service Offerings with the same root disk size (#5095) * Cover a case where resizing root disk failed; add isNotPossibleToResize method. * remove format from resize validation * Revert if-conditional changes that removed ImageFormat.ISO validation * Add JUnit tests for VolumeApiServiceImpl.isNotPossibleToResize * Fix checkstyle of test Class * Use _templateDao.findByIdIncludingRemoved instead of _templateDao.findById * Prevent null serviceOfferingView and Mock findByIdIncludingRemoved instead of findById commit 9dd0acf8c9809ed819aa98430c48183f42d68312 Author: Abhishek Kumar Date: Fri Jun 11 20:07:07 2021 +0530 ui: add action syncStoragePool (#5098) Added action in UI for syncStoragePool API for DatastoreCluster type primary storages. Fixes #5086 Signed-off-by: Abhishek Kumar commit 12b2e80d82abd90e17d233c34b4f3bf7847a1d6d Author: Harikrishna Date: Fri Jun 11 20:06:06 2021 +0530 vmware: Fix fetching chain_info of the volumes. It is used to assume datastore names are in the form of UUIDs but it can be any name. So fetch chain_info based on the datastore name. (#5097) his PR fixes the problem of not updating the chain info or setting chain info to null after volume migrations. Problem: While fetching the volume chain info, management server assumes datastore name to be a UUID (this is true only for NFS storages added by CloudStack) but datastore name can be with any name. Solution: To fetch the volume chain info, use datastore name instead of UUID. The fix is made in the flow of following API operations migrateVirtualMachine migrateVirtualMachineWithVolume migrateVolume commit bf6266188c89a5487383f216333ae10e878d2c10 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Thu Jun 10 11:51:45 2021 -0300 Improve logs on RemoteAccessVpnManagerImpl (#4960) Co-authored-by: Daniel Augusto Veronezi Salvador commit a5a368e353582186e7e404f7e922866667686577 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Thu Jun 10 11:38:41 2021 -0300 Improve logs on ProcessRunner (#4703) Co-authored-by: Daniel Augusto Veronezi Salvador commit a0788f58164b299c40fbd9f6b96892db86bf2172 Merge: 083646b3c3 9d9da01626 Author: Rohit Yadav Date: Thu Jun 10 12:39:44 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit 9d9da01626b571d9f4c6d0f68767500a8264c038 Author: Nicolas Vazquez Date: Thu Jun 10 04:06:53 2021 -0300 vmware: Fix lsilogcsas controller for deploy-as-is (#5076) * Fix lsilogcsas controller for deploy-as-is * Add virtual scsi controller type * Rename virtual scsi key commit 277739168908e0821a4e46c08425a1c463d77fa2 Author: Peinthor Rene Date: Wed May 26 12:30:45 2021 +0200 maven: Use https for jenkins repo, to fix build with newer maven (#5039) Maven 3.8.1 blocks non-secure repo connections per default. (cherry picked from commit f1c83a0b05844fce21e1ba8af31831773ddf239e) Signed-off-by: Rohit Yadav commit da382993c37019852390fe7b51c36df7492a76ca Author: Abhishek Kumar Date: Wed Jun 9 12:10:01 2021 +0530 ui: fix focus in deployvm form (#5089) Fixes #5087 Signed-off-by: Abhishek Kumar commit b0f2112dc2b0d1ced917924f60900d3c17574ca2 Author: slavkap <51903378+slavkap@users.noreply.github.com> Date: Wed Jun 9 08:45:07 2021 +0300 kvm: Fix of some UEFI related issues (#5072) * Fix of some UEFI related issues 1 - fix of attach/detach ISO of VM with UEFI boot type 2 - if OS type of an ISO is categorized as "Other" the bus type of the disk will be set to "sata" * Simplify the validation of OS types commit 1afcd823e004a744b8a613b99a2cf26051decb46 Author: Gabriel Beims Bräscher Date: Wed Jun 9 02:44:18 2021 -0300 server: Root disk size should be listed in GB at listServiceOffering (#5085) * Root disk size should be listed in GB at listServiceOffering * Update UI to handle rootdisk size in GB instead of Bytes commit 083646b3c3f05f4100c5de0c28b231109ebc98c3 Author: Harikrishna Date: Tue Jun 8 17:10:00 2021 +0530 server: VM dynamic scaling option granularity (#4643) This PR introduces new granularity levels to configure VM dynamic scalability. Previously VM is configured to be dynamically scalable based on the template and global setting. Now we bringing this option to configure at service offering and VM level also. VM can dynamically scale only when all flags are ON at VM level, template, service offering and global setting. If any of the flags is set to false then VM cannot be scalable. This result will be persisted in DB for each VM and will be honoured for that VM till it is updated. We are introducing 'dynamicscalingallowed' parameter with permitted values of true or false for deployVM API and createServiceOffering API. Following are the API parameter changes: createServiceOffering API: dynamicscalingenabled: an optional parameter of type Boolean with default value “true”. deployVirtualMachine API: dynamicscalingenabled: an optional parameter of type Boolean with default value “true”. Following are the UI changes: Service offering creation has ON/OFF switch for dynamic scaling enabled with default value true commit 1286ffd37b70053c66596746a968cf594bfc84ed Merge: 958182481e 8fe0ff854b Author: Rohit Yadav Date: Tue Jun 8 15:51:38 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit 958182481e200afa95f04022fe37044393085265 Author: Suresh Kumar Anaparti Date: Tue Jun 8 15:44:53 2021 +0530 cloudstack: make code more inclusive Inclusivity changes for CloudStack - Change default git branch name from 'master' to 'main' (post renaming/changing default git branch to 'main' in git repo) - Rename some offensive words/terms as appropriate for inclusiveness. This PR updates the default git branch to 'main', as part of #4887. Signed-off-by: Suresh Kumar Anaparti Signed-off-by: Rohit Yadav commit 8fe0ff854b6c3983ea777f2d1c4c18c16bdd54b9 Author: Pearl Dsilva Date: Tue Jun 8 13:00:10 2021 +0530 ui: remove redundant columns in list VMs view (#5084) commit d10cdb495ff7a051498cbbde5e2f917386bcd78b Merge: 5aefd3e204 d0e3745797 Author: Rohit Yadav Date: Mon Jun 7 15:34:52 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit d0e37457977ca19c01fb1ae256552ad58ea994a8 Author: davidjumani Date: Mon Jun 7 15:34:33 2021 +0530 ui: Fix error when no ipv6 address (#5081) commit 3ee563905d2ef8f5361370b5c0ab32b0b69e7068 Author: Gabriel Beims Bräscher Date: Sat Jun 5 13:55:01 2021 -0300 kvm: Check for VLAN or VXLAN in NetworkDaoImpl.listByPhysicalNetworkPvlan (#5074) This PR fixes #5071; where it was reported an issue when creating a network with VXLAN. commit 5aefd3e2049b99bdaa0d3451704b6859dd431873 Merge: d184e282b2 937def533a Author: Rohit Yadav Date: Wed Jun 2 14:03:54 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit 937def533aa11b45974ffb82aac14a4da4fc7750 Author: Abhishek Kumar Date: Wed Jun 2 13:48:59 2021 +0530 ui: fix adduser form (#5063) AddUser form wrongly shows the account dropdown when adding a user for an account. Account dropdown remains empty in the form. When an account is not selected prior to opening the form, the account input should be required. Signed-off-by: Abhishek Kumar commit b25823213b6f0715acf2dd7d6873d10f8937b3e4 Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Tue Jun 1 17:27:26 2021 +0200 vr: remove old ips with same mac address in dhcpentry databag (#5059) This PR fixes #5058 when start a vm, the old entries in databag for the vm (with same mac addresses) should be removed then set again, to avoid duplicated records in dhcpentry databag and also /etc/dhcphosts.txt Testing with Isolated networks: (1) stop vm, change vm ip address, start vm vm info is updated in /etc/dhcphosts.txt and /etc/cloudstack/dhcpentry.json (2) stop vm, expunge vm. vm is removed from /etc/dhcphosts.txt and /var/lib/misc/dnsmasq.leases Testing with VPC: (1) create vm in 2 vpc tiers vm has 2 entries in /etc/dhcphosts.txt, and /etc/cloudstack/dhcpentry.json (2) stop vm, change ip addresses, change nics order, start vm entries are updated in /etc/dhcphosts.txt and /etc/cloudstack/dhcpentry.json (3) remove a nic from vm (hot unplug) vm nic is removed from /etc/dhcphosts.txt and /var/lib/misc/dnsmasq.leases entry in /etc/cloudstack/dhcpentry.json is updated. commit 8c7e39eb890d44b45b239f7c84281c24999cda69 Author: Rohit Yadav Date: Tue Jun 1 20:55:57 2021 +0530 xenserver: attempt eject and destroying patch VBD separately (#5053) Loop through all VMs and try to eject and remove systemvm.iso VBD upon host connect. Signed-off-by: Rohit Yadav commit 5a841159c5b47752301d36bd1a9f71af80e2736e Author: Harikrishna Date: Tue Jun 1 20:55:23 2021 +0530 vmware: Create fcd folder on local storage in VMware vSphere (#5057) This PR fixes the issue of missing fcd folder in local storage in case of VMware vSphere. with this fix, a folder with name fcd is created whenever local storage is initiated. commit 704b24e68f8a2a2b06f3c8e2f8fee0c84a17c29c Author: davidjumani Date: Tue Jun 1 17:34:19 2021 +0530 server: Fix string format error (#5061) commit d184e282b21f49a981defb9b87d80d6637fa0f3d Merge: b2fd548035 d04fa0201d Author: Rohit Yadav Date: Mon May 31 20:01:09 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit d04fa0201d65f1c11129950b98f2cd387e141f0d Author: Pearl Dsilva Date: Mon May 31 18:59:48 2021 +0530 server: usage generated for destroyed VMs with no backups (#5017) Fixes: #4990 When a VM associated with a backup offering is destroyed/expunged, the backup offering isn't unassigned, and despite the VM having no backups present, backup usage is generated. This PR prevent usage record generation when there are no backups present for a VM with a backup offering associated to it. This is done by ensuring that usage event for backups is generated only when a the backup size > 0 commit b2fd548035e36417efcc753e09aa421d407484cd Author: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Mon May 31 18:58:11 2021 +0530 ui: Remove 'CONTRIBUTING.md' from ui directory (not relevant now as the repo already has a 'CONTRIBUTING.md' in its root directory) (#5054) commit 065ee9ecd3483074ce82b3ee36577ea6a2e53217 Author: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Mon May 31 12:36:35 2021 +0200 ui: Removed download icon when iso is not extractable for users (#5028) When an ISO is not marked as extractable, the download button should not be displayed in the UI. Fixes: #4535 commit 57e4e3b6b1438abca3577790718cbd4803cb0767 Merge: b104aca587 fbc8610f6e Author: Rohit Yadav Date: Mon May 31 16:04:42 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit fbc8610f6e715e659aadce875cd39b4a10360bd4 Merge: 86508b7a31 a78f676037 Author: Rohit Yadav Date: Mon May 31 15:54:56 2021 +0530 Merge remote-tracking branch 'origin/4.14' into 4.15 commit a78f676037042f1ac97d7eca808e0892972d66a7 Author: Gabriel Beims Bräscher Date: Mon May 31 07:22:26 2021 -0300 engine: fix network with SG disabled still has security group script adding rules on KVM (#5049) This PR fixes #5047 which can be reproduced on Zones with _(I) Advanced Networks, (II) Security Groups enabled for the Zone, (III) network offering without Security Groups_; for instance, `DefaultSharedNetworkOffering` which does not list Security Group as supported service. The issue is due to the following code inside the method `VirtualMachineManagerImpl.orchestrateReboot`: [VirtualMachineManagerImpl.java#L3340](https://github.com/apache/cloudstack/blob/280c13a4bb103dd748ec304bfe0714a148c24602/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java#L3340). ``` final Answer rebootAnswer = cmds.getAnswer(RebootAnswer.class); if (rebootAnswer != null && rebootAnswer.getResult()) { if (dc.isSecurityGroupEnabled() && vm.getType() == VirtualMachine.Type.User) { List affectedVms = new ArrayList(); affectedVms.add(vm.getId()); _securityGroupManager.scheduleRulesetUpdateToHosts(affectedVms, true, null); } return; } ``` commit 86508b7a31e9a687a84a0173c15babf55d11eb28 Author: Nicolas Vazquez Date: Mon May 31 06:40:04 2021 -0300 vmware: Fix worker VM numeric invalid value (#5032) commit b0cb087bd02cbf503234e292c32a7105c74cff21 Author: Abhishek Kumar Date: Mon May 31 14:30:11 2021 +0530 server: fixes NPE on empty vmware.root.disk.controller config (#5045) * server: fixes NPE on empty vmware.root.disk.controller config When global config - vmware.root.disk.controller is set to empty and template is registered with deployasis, server will throw NPE while deploying a VM. This change fixes the problem by using default value of the config in this case. Signed-off-by: Abhishek Kumar * use StringUtils utility Co-authored-by: Pearl Dsilva * fix indentation Signed-off-by: Abhishek Kumar Co-authored-by: Pearl Dsilva commit b104aca587e2c118fcf46f7fb92afe37fe3785f1 Merge: a3cdd1f836 dafa377086 Author: Abhishek Kumar Date: Mon May 31 09:47:33 2021 +0530 Merge remote-tracking branch 'apache/4.15' commit dafa377086ecfefd320e2152e93012a6243b28e0 Author: Abhishek Kumar Date: Sat May 29 22:31:04 2021 +0530 secondary-storage: fix account template directory size (#5048) Signed-off-by: Abhishek Kumar commit 4ec337fd2a9c93f2a8072d885791e18152c39fcc Author: Abhishek Kumar Date: Sat May 29 16:15:40 2021 +0530 ui: pass requireshvm param for register/upload template API (#5050) Signed-off-by: Abhishek Kumar commit a3cdd1f836e40a4b4444af738780a337ee7aac1d Author: Gabriel Beims Bräscher Date: Fri May 28 05:45:30 2021 -0300 Allow deploy Admin VMs and VRs in disabled zones/pods/clusters (#3600) commit 6531ee587198ca2789ab0f53e9f3c3dccdd009d4 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Fri May 28 05:15:51 2021 -0300 Externalize config to set min memory/cpu with division by overprovisi… (#4722) Co-authored-by: Daniel Augusto Veronezi Salvador Co-authored-by: dahn commit f1c83a0b05844fce21e1ba8af31831773ddf239e Author: Peinthor Rene Date: Wed May 26 12:30:45 2021 +0200 maven: Use https for jenkins repo, to fix build with newer maven (#5039) Maven 3.8.1 blocks non-secure repo connections per default. commit 42e3b115790a093edecfb1173eebaaedbfcfa123 Author: Rohit Yadav Date: Wed May 26 15:06:58 2021 +0530 systemvmtemplate: update to Debian 10.9 (#5038) Update package ISO to Debian 10.9 Signed-off-by: Rohit Yadav commit a0d9acec6f3926ef31430a2be0c2737b30eb5ebb Author: slavkap <51903378+slavkap@users.noreply.github.com> Date: Tue May 25 17:56:43 2021 +0300 fix: create template with Marvin (#4631) * undefined params * if we define those params, when invoking the functions create_from_volume/create_from_snapshot will be created two templates * according to the API docs createTemplate command does not accept account and domainid commit 06744c16ba308a01ef839d4d3154260423e514e8 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Tue May 25 06:42:53 2021 -0300 Externalize OOBM background task's interval (#4881) * Externalize OOBM background task's interval * Rename variable Co-authored-by: Daniel Augusto Veronezi Salvador commit 1e13855612a6548d64c8504201b2e0f076fdeb6e Author: Sina Kashipazha Date: Tue May 25 11:23:53 2021 +0200 Add startdate formate to documents. (#5026) Add startdate formate to documents. commit 4b7fa4e63060842ce4d9eac74c0f66988a83fe9a Merge: 270fc19eec d47e273329 Author: Abhishek Kumar Date: Mon May 24 16:43:53 2021 +0530 Merge remote-tracking branch 'apache/4.15' Signed-off-by: Abhishek Kumar commit d47e2733299a77f0e3aa90c0eb23da06e1efd376 Author: slavkap <51903378+slavkap@users.noreply.github.com> Date: Fri May 21 12:49:04 2021 +0300 server: Prevent NPE if hypervisor's capabilities are null (#5029) If the hypervisor's capabilities are null, CloudRuntimeException will be thrown; Format the error message. commit c6ba3d1bea7ab0123b35551376fd858a2016bce2 Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Fri May 21 11:45:54 2021 +0200 ui: Make 'ACL' field as mandatory and add warning message for default_allow and default_deny (#5003) Co-authored-by: Wei Zhou commit 5cbc1d9b18353b71f79fd208f00340df58a5c856 Author: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Fri May 21 11:45:24 2021 +0200 Fixed invalid ostypeid when not using deployasis (#5033) commit 5f734f718eb80cfccc83604892b20ec6068e6589 Author: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Wed May 19 11:03:16 2021 +0200 vmware: Disk controller vmware deploy as is (#5006) Fixes #4344 commit 2eae0f5385fb76eb9d554e5460ef1da56936579b Author: Pearl Dsilva Date: Wed May 19 13:00:17 2021 +0530 SystemVM: Set agent state to disconnected on Stopping the systemVM (#5010) Fixes: #4972 This PR sets systevms' agent state to disconnected when it is stopped. Currently, when a systemVM (Console Proxy VM / Secondary storage VM) is stopped, the agent state still appears to be 'Up' commit 270fc19eecb491953c225ff7bb942d45306b4106 Merge: 426f14b6ed 65672b77fb Author: Abhishek Kumar Date: Wed May 19 12:08:54 2021 +0530 Merge remote-tracking branch 'apache/4.15' commit 65672b77fb4c4122c63f372fcf355a2b9d2f2857 Author: Rohit Yadav Date: Tue May 18 22:09:14 2021 +0530 setup: pass password in quotes for cloudstack-setup-databases (#5025) Fixes issue of passing password and management secret key with special characters. Signed-off-by: Rohit Yadav commit 426f14b6ed87c3dc072ee1d95d84892fc624bcf0 Merge: 6b9f3fb501 06454ff92e Author: Abhishek Kumar Date: Tue May 18 15:19:20 2021 +0530 Merge remote-tracking branch 'apache/4.15' Signed-off-by: Abhishek Kumar commit 06454ff92ece7dd4998294fbe7b8d7214d83924d Author: slavkap <51903378+slavkap@users.noreply.github.com> Date: Mon May 17 16:45:29 2021 +0300 tests: Fix in Marvin migrate_vm_with_volume (#5023) Cannot migrate VM to another storage, because 'migrateto' is overriden. commit 2286c8d2bf97810b7c55bf7a389c603a7074a751 Merge: dc91a1fd4d e2183ed666 Author: Rohit Yadav Date: Fri May 14 23:19:06 2021 +0530 Merge remote-tracking branch 'origin/4.14' into 4.15 commit dc91a1fd4d61e0d5fc21ee626089753ed5b44e86 Author: Abhishek Kumar Date: Fri May 14 23:16:15 2021 +0530 server: destroy ssvm, cpvm on last host maintenance (#4644) * server: destroy ssvm, cpvm on last host maintenance When a single or last UP host enters into maintenance just stopping SSVM and CPVM will leave behind VMs on hypervisor side. As these system vms will be recreated they can be destroyed. Fixes #3719 Signed-off-by: Abhishek Kumar * fix methods Signed-off-by: Abhishek Kumar * immediately destroy systemvms Signed-off-by: Abhishek Kumar * fix destroy Added bypassHostMaintenance flag in Comma.java class to allow command to be handled by host agent even when host is in maintenace. Flag is set true only for delete commands for ssvm and cpvm. Signed-off-by: Abhishek Kumar * unit test fix Signed-off-by: Abhishek Kumar * fix missing return statement Signed-off-by: Abhishek Kumar * fix VM should be stopped with cleanup before calling expunge else it server may through error with host in PrepareForMaintenance state. Signed-off-by: Abhishek Kumar * refactor Signed-off-by: Abhishek Kumar * rename Signed-off-by: Abhishek Kumar * refactor Signed-off-by: Abhishek Kumar commit 755791089d793751e8d21a91ff0ced005e8b508a Author: Abhishek Kumar Date: Fri May 14 23:15:35 2021 +0530 api/server: cpu, memory values with overprovisioning in metrics response (#4795) * metrics: operprovisioned host cpu allocated Signed-off-by: Abhishek Kumar * changes Signed-off-by: Abhishek Kumar * remove unused Signed-off-by: Abhishek Kumar commit e2183ed666d202cb5c83b3a640160bea52ab18fa Author: Wei Zhou Date: Fri May 14 19:44:39 2021 +0200 forceha: fix two issues when (1)stop vm from inside (2) force remove host (#4647) * forceha: fix vm is not started if it is poweroff from inside steps to reproduce the issue (1) make sure force.ha is true in global setting. if not, change it to true, and restart mgt server (2) create a service offering , ha is not enabled (3) create a vm (4) log into the vm, and power off via cli. expected result: vm is started again by cloudstack actual result: vm is not started. * forceha: fix vms are still running if host is force-removed when host can be force removed, however vms are stopped in cloudstack, but not stopped on host ``` (localcloud) 🐱 > delete host id="a5625393-444d-4d0a-b31d-62baf88a8be1" forced=true { "success": true }``` after some minutes, vms are still runnning on host ``` root@mgt01:~# ssh node63 virsh list Id Name State --------------------------- 1 i-2-19-VM running 2 i-2-11-VM running ``` error message are ``` Cannot transmit host 2 to Enabled state com.cloud.utils.fsm.NoTransitionException: No next resource state found for current state = Enabled event = DeleteHost at com.cloud.resource.ResourceManagerImpl.resourceStateTransitTo(ResourceManagerImpl.java:1216) at com.cloud.resource.ResourceManagerImpl$1.doInTransactionWithoutResult(ResourceManagerImpl.java:907) ``` * forceha: Make ForceHA dynamic commit cc7f4265640d6faf8f50ce2e5892da5a6913241d Author: Pearl Dsilva Date: Fri May 14 23:14:12 2021 +0530 ui: Allow IP range creation for Physical Network - Guest Traffic in Basic Zones (#5020) * ui: Allow IP range creation for Physical Network - Guest Traffic * get guest network only for basic zone commit 57c82866020a635a46b8253c901a839c48ec5389 Author: Abhishek Kumar Date: Fri May 14 23:13:43 2021 +0530 ui: pass podid for basic zone createvlaniprange (#5022) While add IP range for a basic zone, podid parameter must be passed with createVlanIpRange. Signed-off-by: Abhishek Kumar commit 1b28ea1ebb81f4a61bc7d705ffaa1563794030be Author: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Thu May 13 11:01:47 2021 +0200 network: fix dhcp/password/metadata issues on shared networks with multiple subnets (#5013) * #4943: apply iptables for password and metadata * #4943: fix wrong ip alias * #4943: revert previous change and add ip_aliases Co-authored-by: Wei Zhou commit aa289542f01fd838e3573550d24bd8142b2dea0c Author: Nicolas Vazquez Date: Thu May 13 06:00:34 2021 -0300 vmware: Fix deploy-as-is not honoured on upload from local (#5015) * Fix deploy-as-is not honoured on upload from local * Missing param commit 4ecef4bfb486dd78c8406b4f203c24cb7521117b Author: Abhishek Kumar Date: Wed May 12 16:20:17 2021 +0530 ui: prevent same string docHelp override (#5014) Prevent same string docHelp suffix override. List all existing docHelp suffixes in the config file during the build process. Updated apache/cloudstack-documentation#199 Signed-off-by: Abhishek Kumar commit 6b9f3fb5015c29bbfaee0b08220174541ce40ab0 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Tue May 11 04:12:59 2021 -0300 Improve logs on KVMHAVMActivityChecker (#4705) Co-authored-by: Daniel Augusto Veronezi Salvador commit 493d6a08d2b948a6fa226867b912e2f041c2efc1 Author: Pearl Dsilva Date: Mon May 10 20:48:44 2021 +0530 ui: Display Zone Name instead of Zone UUID in list view (#5011) commit 99f2919ef475bf134a8dbb3e325a1bc808df562a Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Mon May 10 11:26:55 2021 -0300 Improve logs on kvmvmactivity.sh (#4704) Co-authored-by: Daniel Augusto Veronezi Salvador commit cc2c6e91cbe0113a78b9dfa0d894eb37e9276b06 Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Mon May 10 05:22:47 2021 -0300 Improve logs on HAManagerImpl (#4707) Co-authored-by: Daniel Augusto Veronezi Salvador commit 3674e80219d0be9e940bd948060fa10a467e4b7e Author: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> Date: Mon May 10 04:47:42 2021 -0300 Improve logs on SecondaryStorageManagerImpl and few refactors (#4955) Co-authored-by: Daniel Augusto Veronezi Salvador commit cb167072a176054edfef2fdee403d0f71c3c7052 Merge: ee5f92e292 32e3bbdcc5 Author: Rohit Yadav Date: Fri May 7 16:37:42 2021 +0530 Merge remote-tracking branch 'origin/4.15' Signed-off-by: Rohit Yadav commit 32e3bbdcc57874bc4914fb50e9c66adea7668f06 Author: Harikrishna Date: Fri May 7 16:30:54 2021 +0530 VMware Datastore Cluster primary storage pool synchronisation (#4871) Datastore cluster as a primary storage support is already there. But if any changes at vCenter to datastore cluster like addition/removal of datastore is not synchronised with CloudStack directly. It needs removal of primary storage from CloudStack and add it again to CloudStack. Here synchronisation of datastore cluster is fixed without need to remove or add the datastore cluster. 1. A new API is introduced syncStoragePool which takes datastore cluster storage pool UUID as the parameter. This API checks if there any changes in the datastore cluster and updates management server accordingly. 2. During synchronisation if a new child datastore is found in datastore cluster, then management server will create a new child storage pool in database under the datastore cluster. If the new child storage pool is already added as an individual storage pool then the existing storage pool entry will be converted to child storage pool (instead of creating a new storage pool entry) 3. During synchronisaton if the existing child datastore in CloudStack is found to be removed on vCenter then management server removes that child datastore from datastore cluster and makes it an individual storage pool. The above behaviour is on par with the vCenter behaviour when adding and removing child datastore. commit 1eea9c59394ce1f8d78b07b8a8e9c2bc9fe6ef18 Author: Abhishek Kumar Date: Fri May 7 16:28:16 2021 +0530 ui: add tooltips for actions in tab (#4842) Adds tooltips for buttons in tabs Signed-off-by: Abhishek Kumar commit f5e665cd634aaadb6316c3954e18b99c0212665f Author: Rohit Yadav Date: Fri May 7 00:03:16 2021 +0530 server: NPE may cause management server to not start (#5001) This NPE may happen when a VM is marked removed in the DB but not its nics on a shared network. This can usually happen due to a failed expunged VM or when an admin manually marks a VM as removed in DB but does not cleanup the nics/network resources. Signed-off-by: Rohit Yadav commit ee5f92e292527b6441f21e932244e0466d7f84f8 Merge: fce84e62ab 21b0b0f84e Author: Rohit Yadav Date: Thu May 6 18:25:04 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit 21b0b0f84ef3060150385d93e02b37ce2124ad30 Author: DK101010 <57522802+DK101010@users.noreply.github.com> Date: Thu May 6 12:43:36 2021 +0200 allow zero as cpu speed value in service offerings (#4986) Co-authored-by: DK101010 commit 165439130911ddac7335845e7887e5f1526ba843 Author: Hoang Nguyen Date: Thu May 6 16:30:25 2021 +0700 ui: update treeview when clicking the refresh button (#4999) Fixes #4975 When a domain is generated by another client, the treeview is modified when clicking the refresh button. commit 645ceecea480a52c9827a45d31a18478c458c2e7 Author: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Thu May 6 10:38:36 2021 +0530 Updated since and validations attributes for the ikeversion and splitconnections parameters of vpn customer gateway cmd(s) (#4996) commit fce84e62ab36baec70206a1fe88d322fe16717b7 Merge: a1f825e7c7 bc80815cf5 Author: Rohit Yadav Date: Thu May 6 00:27:43 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit bc80815cf54c60b8fe9138f07cbc5c0ab1c4afad Author: Pearl Dsilva Date: Wed May 5 12:54:23 2021 +0530 server: Adding VPN options for IKE version and IKE split connections (#4953) IKE version allows selecting ike (autoselect), ikev1, or ikev2. Split connections gives an option of separating the first right subnet from the rest, and kicking out individual statements for each right subnet for better cross-compatibility. Backported from PR: #4137 update per PR suggestion Fixes #3138 Co-authored-by: Greg Goodrich Co-authored-by: Daan Hoogland Co-authored-by: Pearl Dsilva commit a1f825e7c74673c719dcb6e749f7dc3127d8f059 Author: dahn Date: Tue May 4 19:49:37 2021 +0200 python3: Migrate Marvin and smoketests to python3 (#4727) This PR prepares marvin and tests for python3. it was part of #4479, until nose2 was decided to be abandoned from that PR. Re-PR of #4543 and #3730 to enable cooperation Co-authored-by: Daan Hoogland Co-authored-by: Gabriel Beims Bräscher Co-authored-by: Rohit Yadav commit 7a7fd27350397e12f8d54ab89e65e8b8dd9f9b92 Author: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Tue May 4 19:39:19 2021 +0200 setup: Fixed error when passing shell reserved characters to setup databases (#4995) * Fixed error when passing shell reserved charaters to setup databases script for dbsecret * Moved quote to encrypt method commit 1abd10199cee4ba2358a9aed46ed76fe97550216 Merge: cdd1b43943 4df8d7ade3 Author: Rohit Yadav Date: Tue May 4 19:37:45 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit cdd1b43943d4cfb88f21a08cb94d1f4da74a77f4 Author: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Tue May 4 16:05:16 2021 +0200 setup: Fixed error when passing shell reserved characters to setup databases (#4976) * Fixed error when passing shell reserved charaters to setup databases script for dbsecret * Moved quote to encrypt method commit 4df8d7ade3de33ccc8aa8dd74fb40ce2473f82c1 Author: Pearl Dsilva Date: Tue May 4 19:34:53 2021 +0530 ui: Prevent reset of port-forward rules on cancelling a form (#4981) * ui: Prevent reset of port-forward rules on cancelling a form * add check for undefined value commit 1cb8ca69d9e6a670cec98de1652e47c25a5aca5a Author: davidjumani Date: Tue May 4 19:34:11 2021 +0530 ui: Adding success message for DomainActionForm (#4987) commit eb2e5f73d33e2a66d71b2077abb0a72046864f15 Author: davidjumani Date: Tue May 4 19:33:45 2021 +0530 ui: show VR offering when provider is VR (#4988) * ui: show VR offering when provider is VR * send serviceofferingid not index commit 5b6ab3d248bca21d140d6ab6b0bb6b18c0b4f03e Author: Pearl Dsilva Date: Tue May 4 19:33:23 2021 +0530 ui: fix for filtering network offering for VPC tiers (#4989) commit d92022ee5c5498b7c193cd28ef29c5a8f02f1a39 Author: Pearl Dsilva Date: Tue May 4 19:33:13 2021 +0530 ui: Hide reset password button for a running VM (#4991) commit 155636902c48c50b977011794f939572ad211c73 Author: Pearl Dsilva Date: Tue May 4 19:33:00 2021 +0530 ui: Close Create network form from Zones -> Physical Network (Guest) -> Traffic Types view (#4993) commit 0c47d4efd204434dbcef5e7d2b58316903865c92 Author: Abhishek Kumar Date: Fri Apr 30 16:37:24 2021 +0530 ui: show domain paths for offering domain selection (#4979) Signed-off-by: Abhishek Kumar commit 603a83066d20de96498f270b471ff5330452032a Author: davidjumani Date: Fri Apr 30 13:17:14 2021 +0530 ui: rename acl reason to description (#4980) commit 2d176db9a474328dd7655c6a7d5bd20338d9bb21 Author: Pearl Dsilva Date: Fri Apr 30 12:15:09 2021 +0530 centos: Install libgcrypt v1.8.5 required by libvirt 6.0 on CentOS8 (#4970) Fixes: #4969 This PR upgrades the version of libgcrypt that is required by libevirt 6.0 Co-authored-by: Pearl1594 commit ab790c11d5663afb4e2da098aab5701a625fb3b1 Author: Gabriel Beims Bräscher Date: Fri Apr 30 03:29:50 2021 -0300 server: Allow to upgrade service offerings from local <> shared storage pools (#4915) This PR addresses the issue raised at #4545 (Fail to change Service offering from local <> shared storage). When upgrading a VM service offering it is validated if the new offering has the same storage scope (local or shared) as the current offering. I think that the validation makes sense in a way of preventing running Root disks with an offering that does not match the current storage pool. However, the validation only compares both offerings and does not consider that it is possible to migrate Volumes between local <> shared storage pools. The idea behind this implementation is that CloudStack should check the scope of the current storage pool which the ROOT volume is allocated; this, it is possible to migrate the volume between storage pools and list/upgrade according to the offerings that are supported for such pool. This PR also fixes an issue where the API command that lists offerings for a VM should follow the same idea and list based on the storage pool that the volume is allocated and not the previous offering. Fixes: #4545 commit 72f6612971a80f1b87d0a4c9d9d93047cb1af7c1 Author: Olivier Lemasle Date: Fri Apr 30 08:27:56 2021 +0200 server: Increase max length for VMInstanceVO.backupVolumes (#4967) The default length is 255, which caused a truncation of data if the JSON object representing the backup volumes is too big. It caused errors when backups were made on VMs with 3 volumes or more. `vm_instance.backup_volumes` has the type TEXT, which has a maximal length of 65535 characters. Fixes #4965 commit 92f9c9922c6e97a54a8796ea92f15b32162d9805 Author: Pearl Dsilva Date: Fri Apr 30 11:51:28 2021 +0530 ui: Fix Settings Tab view (#4964) Co-authored-by: Pearl Dsilva commit 9349d20dd36c490eeb6e140b9215ca68653a85d1 Author: Nicolas Vazquez Date: Fri Apr 30 01:17:50 2021 -0300 vmware: Make deploy-as-is optional (#4901) * [Vmware] Make deploy-as-is optional * Do not use deployasis on create volume test * Update api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java Co-authored-by: Abhishek Kumar * Update api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java Co-authored-by: Abhishek Kumar * Review comments * Refactor condition to select suitable template Co-authored-by: Abhishek Kumar commit 4742ac15f7be5d3cf6f7e328133cb8589a7578ce Merge: 1e859a0e2c de30f3b7ee Author: Rohit Yadav Date: Thu Apr 29 21:50:40 2021 +0530 Merge remote-tracking branch 'origin/4.15' commit de30f3b7ee21726e1e8aeaa3f87f00b700510fd9 Author: Pearl Dsilva Date: Thu Apr 29 20:41:38 2021 +0530 vmware cks: Guard k8s cluster root disk resize if no root disk size passed (#4957) * Guard k8s cluster resize if no root disk size passed * test regression Co-authored-by: Pearl Dsilva commit be255e4203b573a0967768be5b19e03c0100b649 Author: dahn Date: Thu Apr 29 17:10:29 2021 +0200 server: protect against stray snapshot-details without snapshot (#4924) This PR makes sure no orphaned snapshot details are considered in the cleanup at startup job. a real solution would be to implement some kind of cascading delete, but as the parent record is "only" marked as removed this would be a bit com Co-authored-by: Daan Hoogland commit 39cb2bf0af0b77755d28ac914caa32d5843081c9 Author: Pearl Dsilva Date: Thu Apr 29 15:52:12 2021 +0530 ui: Display 'Add LDAP Account' button when LDAP configuration is added (#4971) Co-authored-by: Pearl Dsilva commit 98e2ed3c4fbfb6ec731fb91b6e00a98c5ecf7253 Author: Pearl Dsilva Date: Wed Apr 28 13:46:03 2021 +0530 vmware: Add force parameter to iso attach/detach operations (#4907) Fixes: #4808, #4941 This PR adds a force flag to the attachIso / detachIso commands, especially for VMware where it is noticed that when trying to either detach an iso or attach an iso when there already exists another present it fails to do the necessary operation as from ACS end we either answer the question returned by Esxi for CDRom disconnect operation as No (for detach operation) or do not answer the question at all (for Attach operation). Co-authored-by: Pearl Dsilva commit 73f82ae9dd1803df4500db78ccf5d658b53bfe62 Author: Hoang Nguyen Date: Wed Apr 28 13:45:42 2021 +0700 ui: Save the tab and re-activate it after submitting the form. (#4962) * save the tab and reactivate it after submitting the form. * fix for quota resource Fixes #4961

UI: swift sec store marked as readonly, while not really #5169

Description

Metadata

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

Issue actions