(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-05-01 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit aad410ae6c0593fb810e59c37c18d25f1bcb633d
Merge: d1ca79b65b3 5c9d79e3fb4
Author: Rohit Yadav 
AuthorDate: Wed May 1 12:05:52 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-04-29 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 3de1f8b4baf2af1b1cd5387aff4024a1fdd5a8ec
Merge: b23ceefc7ea 9d5d4e55648
Author: Rohit Yadav 
AuthorDate: Mon Apr 29 13:44:34 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

Signed-off-by: Rohit Yadav 

 .../upgrade/SystemVmTemplateRegistration.java  |  11 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java  |   4 +
 .../hypervisor/kvm/resource/MigrateKVMAsync.java   |  45 +++-
 .../wrapper/LibvirtMigrateCommandWrapper.java  |  29 +-
 .../kvm/resource/MigrateKVMAsyncTest.java  |  83 +++
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  |  78 --
 .../kvm/storage/LinstorStorageAdaptor.java | 114 +
 .../configuration/ConfigurationManagerImpl.java|   2 +-
 8 files changed, 311 insertions(+), 55 deletions(-)

diff --cc 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
index 67e00aa7063,7071758fcbe..29a5e1f934b
--- 
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
+++ 
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
@@@ -29,6 -30,8 +30,7 @@@ import java.util.Arrays
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
 -import java.util.Scanner;
+ import java.util.Set;
  
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
@@@ -750,13 -771,11 +760,11 @@@ public class LibvirtMigrateCommandWrapp
  
  @Test
  public void testReplaceStorage() throws Exception {
- Map mapMigrateStorage = new HashMap();
+ Map mapMigrateStorage = 
createMapMigrateStorage("sourceTest", 
"/mnt/812ea6a3-7ad0-30f4-9cab-01e3f2985b98/4650a2f7-fce5-48e2-beaa-bcdf063194e6");
  
- MigrateDiskInfo diskInfo = new MigrateDiskInfo("123456", 
DiskType.BLOCK, DriverType.RAW, Source.FILE, "sourctest");
- 
mapMigrateStorage.put("/mnt/812ea6a3-7ad0-30f4-9cab-01e3f2985b98/4650a2f7-fce5-48e2-beaa-bcdf063194e6",
 diskInfo);
  final String result = 
libvirtMigrateCmdWrapper.replaceStorage(fullfile, mapMigrateStorage, true);
  
 -InputStream in = IOUtils.toInputStream(result);
 +InputStream in = IOUtils.toInputStream(result, "UTF-8");
  DocumentBuilderFactory docFactory = 
DocumentBuilderFactory.newInstance();
  DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
  Document doc = docBuilder.parse(in);
diff --cc 
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index d560c4ee806,b38ab382a42..3a327b158d2
--- 
a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++ 
b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@@ -33,7 -35,10 +33,8 @@@ import org.apache.cloudstack.utils.qemu
  import org.apache.log4j.Logger;
  import org.libvirt.LibvirtException;
  
 -import com.cloud.storage.Storage;
 -import com.cloud.utils.exception.CloudRuntimeException;
  import com.linbit.linstor.api.ApiClient;
+ import com.linbit.linstor.api.ApiConsts;
  import com.linbit.linstor.api.ApiException;
  import com.linbit.linstor.api.Configuration;
  import com.linbit.linstor.api.DevelopersApi;

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-04-23 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 0fa71f56966c834e10060cdbba1c124fd3b075f0
Merge: 582249c1f72 0577b0ac8ef
Author: Rohit Yadav 
AuthorDate: Tue Apr 23 15:21:44 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

 .../hypervisor/kvm/resource/LibvirtVMDef.java  |  4 +--
 .../kvm/storage/LinstorStorageAdaptor.java | 33 +--
 .../storage/datastore/util/LinstorUtil.java| 19 +++
 .../com/cloud/network/IpAddressManagerImpl.java| 38 +-
 4 files changed, 72 insertions(+), 22 deletions(-)

diff --cc 
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
index 33cbea0996d,c8544fd3e3e..8c42bdc2a96
--- 
a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
+++ 
b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
@@@ -22,14 -22,10 +22,15 @@@ import com.linbit.linstor.api.Configura
  import com.linbit.linstor.api.DevelopersApi;
  import com.linbit.linstor.api.model.ApiCallRc;
  import com.linbit.linstor.api.model.ApiCallRcList;
 +import com.linbit.linstor.api.model.Node;
  import com.linbit.linstor.api.model.ProviderKind;
+ import com.linbit.linstor.api.model.Resource;
  import com.linbit.linstor.api.model.ResourceGroup;
 +import com.linbit.linstor.api.model.ResourceWithVolumes;
  import com.linbit.linstor.api.model.StoragePool;
 +import com.linbit.linstor.api.model.Volume;
 +
 +import javax.annotation.Nonnull;
  
  import java.util.Collections;
  import java.util.List;

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-04-17 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit cadbb563afaa907a45e8931cb8a95e8ca5b8f034
Merge: 85110147071 8a101fbbc11
Author: Rohit Yadav 
AuthorDate: Thu Apr 18 10:21:54 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-04-16 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit a55ba96a08e3904641582eb1d03514098c8b8a90
Merge: 0a26f3315a1 6cd5c6a1d01
Author: Rohit Yadav 
AuthorDate: Tue Apr 16 16:10:33 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

 .../kvm/storage/LinstorStorageAdaptor.java | 53 --
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --cc 
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index 101e8d3597e,9ad8332d0e1..dd50c8d2214
--- 
a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++ 
b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@@ -41,8 -45,10 +41,9 @@@ import com.linbit.linstor.api.model.Api
  import com.linbit.linstor.api.model.ApiCallRcList;
  import com.linbit.linstor.api.model.Properties;
  import com.linbit.linstor.api.model.ProviderKind;
+ import com.linbit.linstor.api.model.Resource;
  import com.linbit.linstor.api.model.ResourceDefinition;
  import com.linbit.linstor.api.model.ResourceDefinitionModify;
 -import com.linbit.linstor.api.model.ResourceGroup;
  import com.linbit.linstor.api.model.ResourceGroupSpawn;
  import com.linbit.linstor.api.model.ResourceMakeAvailable;
  import com.linbit.linstor.api.model.ResourceWithVolumes;

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-04-04 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit f2da882d68fc6ff403883311d96b4ab70fbb0a36
Merge: 16aba6b5881 7a9985b42bf
Author: Rohit Yadav 
AuthorDate: Thu Apr 4 14:58:50 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  | 83 ++
 1 file changed, 83 insertions(+)

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-04-04 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 16aba6b5881d57115b5b75d3c64b4c653ce64ed0
Merge: b642500f153 ff3e9bd821f
Author: Rohit Yadav 
AuthorDate: Thu Apr 4 14:17:24 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-03-20 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 308ed1399eed89d068dce2fee7ae833326007ed9
Merge: fe5d7412364 8c62365dbb1
Author: Rohit Yadav 
AuthorDate: Wed Mar 20 15:49:21 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

 .../storage/snapshot/SnapshotSchedulerImpl.java|  7 ++
 systemvm/debian/opt/cloud/bin/setup/postinit.sh| 26 +++---
 2 files changed, 20 insertions(+), 13 deletions(-)

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-02-08 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit a1f547a011038296a2125586cbb8c8d18d249455
Merge: 1d1b3321416 56f0448f0d4
Author: Rohit Yadav 
AuthorDate: Fri Feb 9 00:10:34 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

Signed-off-by: Rohit Yadav 

Conflicts:

plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java

 .../kvm/storage/LinstorStorageAdaptor.java | 28 +++---
 1 file changed, 19 insertions(+), 9 deletions(-)

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-02-08 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 7394af3071825537f3d43f4ec0df41dcc4f410c9
Merge: e53d3274fa3 3fa052c1f57
Author: Rohit Yadav 
AuthorDate: Thu Feb 8 23:53:32 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

2024-02-07 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 0d36098c76833ad3f7510f72e54ece3f3d7f3ba2
Merge: 376243975ba 69e8ebc03fc
Author: Rohit Yadav 
AuthorDate: Wed Feb 7 14:20:39 2024 +0530

Merge remote-tracking branch 'origin/4.18' into 4.19

 .../cluster/KubernetesClusterManagerImpl.java  |  1 +
 .../cluster/KubernetesClusterService.java  |  6 +++
 .../KubernetesClusterUpgradeWorker.java| 61 +++---
 test/integration/smoke/test_kubernetes_clusters.py | 48 -
 4 files changed, 59 insertions(+), 57 deletions(-)

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18'

2023-12-20 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 6d916cad348f5833a567c17f5c9dbccaf2135448
Merge: 1411da1a22b 969e094419d
Author: Rohit Yadav 
AuthorDate: Thu Dec 21 13:18:51 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 server/src/main/java/com/cloud/server/StatsCollector.java | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-10-11 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 8a34afa8ab8c310f24038c0069fd1ce53b4b81d5
Merge: d2ad9363a26 8350ce5aa40
Author: Rohit Yadav 
AuthorDate: Wed Oct 11 21:00:06 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../storage/vmsnapshot/StorageVMSnapshotStrategy.java  | 18 --
 ui/public/locales/en.json  |  1 +
 ui/src/views/compute/wizard/TemplateIsoSelection.vue   |  6 +-
 ui/src/views/dashboard/UsageDashboard.vue  |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-09-26 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 30e34ef310f29a201e634d2e2b0743c8e17c652a
Merge: b614a74027d ef742210b5d
Author: Rohit Yadav 
AuthorDate: Tue Sep 26 14:43:23 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../cloudstack/engine/orchestration/NetworkOrchestrator.java  | 8 +++-
 server/src/main/java/com/cloud/user/AccountManagerImpl.java   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-08-28 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 7362e5338c95cfa2dad0e3e566acd0cf47dad53d
Merge: f563c165cb3 26581b77411
Author: Rohit Yadav 
AuthorDate: Mon Aug 28 12:54:36 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../api/command/user/vm/DeployVMCmd.java   |  4 ++--
 .../upgrade/SystemVmTemplateRegistration.java  | 28 --
 .../java/com/cloud/storage/StorageManagerImpl.java |  2 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 17 +++--
 4 files changed, 28 insertions(+), 23 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-08-11 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 62feb24de657772a01ed145e0a6476306a1d7374
Merge: 540dcc1040a feb9509547a
Author: Rohit Yadav 
AuthorDate: Fri Aug 11 15:15:27 2023 +0530

Merge remote-tracking branch 'origin/4.18'

Signed-off-by: Rohit Yadav 

 ui/public/locales/en.json  |  7 ++-
 ui/src/components/header/UserMenu.vue  |  9 ++-
 ui/src/components/menu/SideMenu.vue|  2 -
 ui/src/components/view/DetailsTab.vue  | 15 +
 ui/src/components/view/InfoCard.vue| 72 +++---
 ui/src/components/view/ListView.vue| 39 ++--
 ui/src/components/widgets/CopyLabel.vue| 51 +++
 ui/src/config/section/account.js   |  4 +-
 ui/src/config/section/compute.js   | 22 ---
 ui/src/config/section/domain.js|  4 +-
 ui/src/config/section/image.js | 26 ++--
 ui/src/config/section/network.js   | 16 ++---
 ui/src/config/section/project.js   |  4 +-
 ui/src/config/section/storage.js   | 13 ++--
 ui/src/views/compute/CreateAutoScaleVmGroup.vue| 38 
 ui/src/views/compute/DeployVM.vue  | 40 +++-
 ui/src/views/compute/InstanceTab.vue   | 43 +++--
 .../views/compute/wizard/TemplateIsoRadioGroup.vue | 14 ++---
 ui/src/views/dashboard/CapacityDashboard.vue   |  2 +-
 ui/src/views/image/TemplateZones.vue   |  4 +-
 ui/src/views/storage/CreateVolume.vue  | 39 +++-
 21 files changed, 354 insertions(+), 110 deletions(-)

diff --cc ui/src/components/header/UserMenu.vue
index 42df0446463,0c7434594be..dfa84c77b65
--- a/ui/src/components/header/UserMenu.vue
+++ b/ui/src/components/header/UserMenu.vue
@@@ -27,36 -27,50 +27,40 @@@
  

  
-   
+   
  
 -
 +
{{ userInitials }}
  
 -
 +

  
  {{ nickname() }}


 -
 -  
 -
 -
 -{{ $t('label.profilename') 
}}
 -
 -  
 -  
 -
 -
 -{{ $t('label.limits') 
}}
 -
 -  
 -  
 -
 -
 -{{ $t('label.use.local.timezone') }}
 -
 -
 -  
 -  
 -
 -  
 -  {{ $t('label.help') }}
 -
 -  
 +
 +  
 +
 +{{ $t('label.profilename') 
}}
 +  
++  
++
++{{ $t('label.limits') }}
++  
 +  
 +
 +{{ 
$t('label.use.local.timezone') }}
 +
 +  
 +  
 +
 +{{ $t('label.help') }}
 +  

 -  
 -
 -  
 -  {{ $t('label.logout') 
}}
 -
 -  
 +  
 +
 +{{ $t('label.logout') }}
 +  
  

  
@@@ -137,22 -151,6 +141,25 @@@ export default 
  })
})
  },
 +handleClickMenu (item) {
 +  switch (item.key) {
 +case 'profile':
 +  this.$router.push(`/accountuser/${this.$store.getters.userInfo.id}`)
 +  break
++case 'limits':
++  
this.$router.push(`/account/${this.$store.getters.userInfo.accountid}?tab=limits`)
++  break
 +case 'timezone':
 +  this.toggleUseBrowserTimezone()
 +  break
 +case 'document':
 +  window.open(this.$config.docBase, '_blank')
 +  break
 +case 'logout':
 +  this.handleLogout()
 +  break
 +  }
 +},
  handleLogout () {
return this.Logout({}).then(() => {
  this.$router.push('/user/login')
diff --cc ui/src/components/view/DetailsTab.vue
index e276e05bcb0,e359f14d86b..301686c3433
--- a/ui/src/components/view/DetailsTab.vue
+++ b/ui/src/components/view/DetailsTab.vue
@@@ -51,6 -51,21 +51,21 @@@
{{ dataResource.rootdisksize }} GB
  

+   
+ 
 -  {{ parseFloat(dataResource.size / (1024.0 * 1024.0 * 
1024.0)).toFixed(2) }} GB
++  {{ parseFloat(dataResource.size / (1024.0 * 1024.0 * 
1024.0)).toFixed(2) }} GiB
+ 
+   
+   
+ 
 -  {{ parseFloat(dataResource.physicalsize / (1024.0 * 1024.0 * 
1024.0)).toFixed(2) }} GB
++  {{ parseFloat(dataResource.physicalsize / (1024.0 * 1024.0 * 
1024.0)).toFixed(2) }} GiB
+ 
+   
+   
+ 
 -

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-08-08 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit ac882f3d07cb67baf7f86c939c5263cd69ad7a96
Merge: 32448e1ac7b 9df23f951b7
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 15:56:19 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../cloudstack/metrics/PrometheusExporterImpl.java   | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-07-24 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 62a8f4ef72a49e6c8180db4d6f997e0ccc0c8463
Merge: afec876951f 63216425d5b
Author: Rohit Yadav 
AuthorDate: Mon Jul 24 15:57:37 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../org/apache/cloudstack/context/CallContext.java |  5 +++
 .../kvm/storage/KVMStorageProcessor.java   |  3 ++
 .../driver/ScaleIOPrimaryDataStoreDriver.java  |  8 +---
 .../cloud/resourcelimit/CheckedReservation.java| 20 ++---
 .../resourcelimit/ResourceLimitManagerImpl.java| 31 +
 .../com/cloud/storage/VolumeApiServiceImpl.java| 11 ++---
 .../cloud/storage/VolumeApiServiceImplTest.java| 52 ++
 ui/src/utils/plugins.js|  8 
 ui/src/views/compute/AutoScaleVmProfile.vue| 10 +
 ui/src/views/compute/CreateAutoScaleVmGroup.vue| 10 +
 ui/src/views/compute/DeployVM.vue  |  3 +-
 ui/src/views/compute/EditVM.vue|  3 +-
 ui/src/views/compute/RegisterUserData.vue  | 10 +
 ui/src/views/compute/ResetUserData.vue | 10 +
 ui/src/views/infra/AddPrimaryStorage.vue   |  5 ---
 utils/src/main/java/com/cloud/utils/UriUtils.java  | 31 -
 .../test/java/com/cloud/utils/UriUtilsTest.java| 14 +-
 17 files changed, 151 insertions(+), 83 deletions(-)

diff --cc ui/src/views/compute/DeployVM.vue
index d635d3f8e8c,de74ab8f268..0f63f4e30f0
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@@ -1994,10 -1969,8 +1993,10 @@@ export default 
  deployVmData.dynamicscalingenabled = values.dynamicscalingenabled
  deployVmData.iothreadsenabled = values.iothreadsenabled
  deployVmData.iodriverpolicy = values.iodriverpolicy
 +deployVmData.nicmultiqueuenumber = values.nicmultiqueuenumber
 +deployVmData.nicpackedvirtqueuesenabled = 
values.nicpackedvirtqueuesenabled
  if (values.userdata && values.userdata.length > 0) {
-   deployVmData.userdata = 
encodeURIComponent(btoa(sanitizeReverse(values.userdata)))
+   deployVmData.userdata = this.$toBase64AndURIEncoded(values.userdata)
  }
  // step 2: select template/iso
  if (this.tabKey === 'templateid') {

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-07-07 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 5383bf64f43b19ef3b234853f42bad03130ea647
Merge: c956d329f5d f0cc76a3a82
Author: Rohit Yadav 
AuthorDate: Fri Jul 7 23:04:44 2023 +0530

Merge remote-tracking branch 'origin/4.18'

Signed-off-by: Rohit Yadav 

 .../cloud/agent/properties/AgentProperties.java|  7 ++
 .../agent/api/GetUnmanagedInstancesCommand.java|  4 +++-
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |  5 +---
 .../hypervisor/kvm/resource/IvsVifDriver.java  |  6 +
 .../hypervisor/kvm/resource/OvsVifDriver.java  |  5 +---
 .../hypervisor/kvm/resource/VifDriverBase.java |  7 ++
 .../hypervisor/vmware/resource/VmwareResource.java | 28 --
 7 files changed, 36 insertions(+), 26 deletions(-)

diff --cc 
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 222d3ffb2ee,8b833b8221a..90bfdd6793c
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@@ -82,6 -73,6 +73,8 @@@ import com.cloud.agent.api.AttachIsoAns
  import com.cloud.agent.api.AttachIsoCommand;
  import com.cloud.agent.api.BackupSnapshotAnswer;
  import com.cloud.agent.api.BackupSnapshotCommand;
++import com.cloud.agent.api.CheckGuestOsMappingAnswer;
++import com.cloud.agent.api.CheckGuestOsMappingCommand;
  import com.cloud.agent.api.CheckHealthAnswer;
  import com.cloud.agent.api.CheckHealthCommand;
  import com.cloud.agent.api.CheckNetworkAnswer;
@@@ -103,6 -94,6 +96,8 @@@ import com.cloud.agent.api.DeleteVMSnap
  import com.cloud.agent.api.DeleteVMSnapshotCommand;
  import com.cloud.agent.api.GetHostStatsAnswer;
  import com.cloud.agent.api.GetHostStatsCommand;
++import com.cloud.agent.api.GetHypervisorGuestOsNamesAnswer;
++import com.cloud.agent.api.GetHypervisorGuestOsNamesCommand;
  import com.cloud.agent.api.GetStoragePoolCapabilitiesAnswer;
  import com.cloud.agent.api.GetStoragePoolCapabilitiesCommand;
  import com.cloud.agent.api.GetStorageStatsAnswer;

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-07-03 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 3b054b266535323306e93126b1383a1993fee2d3
Merge: 2fcbe6241f2 31dbdd0f5c0
Author: Rohit Yadav 
AuthorDate: Mon Jul 3 13:17:25 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../api/command/user/volume/ResizeVolumeCmd.java   |   5 +-
 .../engine/orchestration/VolumeOrchestrator.java   |  23 -
 .../orchestration/VolumeOrchestratorTest.java  | 103 +
 .../datastore/provider/ScaleIOHostListener.java|   6 +-
 .../java/com/cloud/api/ApiAsyncJobDispatcher.java  |   4 +-
 5 files changed, 130 insertions(+), 11 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-06-27 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 5975ea80c9755ebeb6f49a2874e6619f3a7d601a
Merge: 41403c9cf9f f3ad9e6743a
Author: Rohit Yadav 
AuthorDate: Tue Jun 27 15:51:40 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 tools/marvin/marvin/lib/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-06-21 Thread weizhou 
This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit b635ecbd8a3c17ce10718b713315b395f9a5247c
Merge: 5347d067b44 9e1609dd5ae
Author: Wei Zhou 
AuthorDate: Thu Jun 22 07:12:29 2023 +0200

Merge remote-tracking branch 'origin/4.18'

 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-25 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit ce44ff4148676138a103c6a2e6a68845e5046ee0
Merge: 47af4327455 4138ca7c5d0
Author: Rohit Yadav 
AuthorDate: Thu May 25 22:16:16 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../com/cloud/storage/VolumeApiServiceImpl.java| 68 +-
 .../cloud/storage/VolumeApiServiceImplTest.java| 54 ++---
 tools/appliance/systemvmtemplate/template.json |  4 +-
 3 files changed, 74 insertions(+), 52 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-25 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 47af43274559474cf83cba5f01291033b6e4bc05
Merge: 48af4625a22 2b3e2e48a07
Author: Rohit Yadav 
AuthorDate: Thu May 25 17:51:01 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 ui/.env.primate-qa  |  2 +-
 ui/src/components/view/InfoCard.vue |  2 +-
 ui/src/config/router.js |  4 +++-
 ui/src/config/section/offering.js   | 37 +-
 ui/src/config/section/zone.js   | 45 +
 ui/src/utils/plugins.js |  2 +-
 6 files changed, 77 insertions(+), 15 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-12 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 2f309b573bc70abea91af463a277dd91cc774f79
Merge: 62fa45aa819 44024a8a8b4
Author: Rohit Yadav 
AuthorDate: Fri May 12 12:58:49 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .github/workflows/ui.yml   |  1 -
 .../reservation/dao/ReservationDaoImpl.java|  2 +-
 .../resourcelimit/ResourceLimitManagerImpl.java| 32 ++
 3 files changed, 28 insertions(+), 7 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-11 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 62fa45aa819464422f010e58dd3d979db48eb509
Merge: 9ddfeac57e8 a0eb0aa5f7a
Author: Rohit Yadav 
AuthorDate: Thu May 11 23:40:53 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../api/command/user/vm/DeployVMCmd.java   | 49 ++
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  5 ++-
 2 files changed, 26 insertions(+), 28 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-11 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 232c86a715a8951085d9b36c1164779e2708074f
Merge: 0af56179a59 8c546bd5a68
Author: Rohit Yadav 
AuthorDate: Thu May 11 23:19:43 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../storage/secondary/SecondaryStorageVmManager.java  |  8 
 .../secondarystorage/SecondaryStorageManagerImpl.java | 19 ++-
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py  |  2 +-
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py   | 16 +---
 systemvm/debian/opt/cloud/bin/setup/common.sh |  6 +++---
 ui/src/views/image/AddKubernetesSupportedVersion.vue  |  5 -
 ui/src/views/network/VpcTiersTab.vue  |  1 +
 7 files changed, 32 insertions(+), 25 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-10 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 0af56179a59765d45f62340f41fd612449269362
Merge: 2dc8b742c96 0e4a5a1fa41
Author: Rohit Yadav 
AuthorDate: Wed May 10 14:08:14 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .github/workflows/ci.yml  | 1 +
 .github/workflows/main-sonar-check.yml| 1 +
 ui/public/locales/en.json | 1 +
 ui/src/views/compute/AutoScaleUpPolicyTab.vue | 4 +++-
 ui/src/views/compute/ScaleVM.vue  | 2 ++
 ui/src/views/storage/MigrateVolume.vue| 2 ++
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --cc .github/workflows/main-sonar-check.yml
index 527701debc1,635526a1826..38d16b65fb3
--- a/.github/workflows/main-sonar-check.yml
+++ b/.github/workflows/main-sonar-check.yml
@@@ -22,12 -22,9 +22,13 @@@ on
  branches:
- main
  
 +permissions:
 +  contents: read # to fetch code (actions/checkout)
 +  pull-requests: write # for sonar to comment on pull-request
 +
  jobs:
build:
+ if: github.repository == 'apache/cloudstack'
  name: Main Sonar JaCoCo Build
  runs-on: ubuntu-22.04
  steps:

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-05-08 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit a2561df25b5ef0ae5eaf66be65574996995276e9
Merge: e234c3ccdc7 897dad619b8
Author: Rohit Yadav 
AuthorDate: Mon May 8 12:57:38 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 agent/bindir/libvirtqemuhook.in| 30 +-
 .../command/admin/annotation/AddAnnotationCmd.java |  2 +-
 .../java/com/cloud/agent/api/MigrateCommand.java   | 13 +
 .../cloudstack/storage/to/TemplateObjectTO.java|  1 +
 engine/schema/pom.xml  |  6 --
 .../upgrade/DatabaseVersionHierarchyTest.java  | 22 
 .../KvmNonManagedStorageDataMotionStrategy.java| 21 ++-
 .../motion/StorageSystemDataMotionStrategy.java| 13 +++--
 .../KvmNonManagedStorageSystemDataMotionTest.java  | 15 -
 .../StorageSystemDataMotionStrategyTest.java   | 15 -
 .../wrapper/LibvirtMigrateCommandWrapper.java  | 10 
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  | 45 +++
 .../configuration/ConfigurationManagerImpl.java| 28 ++
 .../com/cloud/storage/VolumeApiServiceImpl.java|  2 +-
 .../direct/download/DirectDownloadManagerImpl.java |  2 +-
 .../ConfigurationManagerImplTest.java  | 65 +-
 systemvm/agent/noVNC/core/rfb.js   | 35 +++-
 test/integration/component/test_configdrive.py |  2 +-
 .../component/test_deploy_vm_userdata_multi_nic.py |  2 +-
 .../component/test_deploy_vm_userdata_reg.py   |  2 +-
 tools/marvin/marvin/cloudstackConnection.py|  2 +-
 tools/ngui/requester.py|  2 +-
 ui/src/views/tools/ImportUnmanagedInstance.vue | 10 
 23 files changed, 282 insertions(+), 63 deletions(-)

diff --cc 
engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
index 4825f15a933,e6692bdbde1..2b0dda5fa57
--- 
a/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
+++ 
b/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
@@@ -111,7 -111,7 +111,7 @@@ public class DatabaseVersionHierarchyTe
  assertEquals("0.0.5", 
hierarchy.getRecentVersion(CloudStackVersion.parse("0.0.9")).toString());
  }
  @Test
- void getRecentVersionExact() {
+ public void getRecentVersionExact() {
  assertEquals("0.0.5", 
hierarchy.getRecentVersion(CloudStackVersion.parse("1.0.0.0")).toString());
  }
 -}
 +}

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-04-14 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 8a42ab9ce41a1f10c8bfdd4b2b7f2ead70f99b35
Merge: 941cc83372f 2dc016adde7
Author: Rohit Yadav 
AuthorDate: Fri Apr 14 21:49:12 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../org/apache/cloudstack/acl/RoleService.java |  2 +-
 .../api/command/admin/acl/ListRolesCmd.java|  4 +-
 .../java/com/cloud/storage/StorageManager.java |  2 +
 .../org/apache/cloudstack/acl/dao/RoleDao.java |  2 +-
 .../org/apache/cloudstack/acl/dao/RoleDaoImpl.java | 13 +++-
 .../storage/image/db/TemplateDataStoreDaoImpl.java | 23 +--
 .../image/db/TemplateDataStoreDaoImplTest.java | 77 ++
 .../datastore/provider/DefaultHostListener.java|  1 +
 .../cloudstack/metrics/MetricsServiceImpl.java |  4 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  2 +-
 .../com/cloud/server/ManagementServerImpl.java |  2 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |  6 +-
 .../org/apache/cloudstack/acl/RoleManagerImpl.java |  8 +--
 .../cloudstack/backup/BackupManagerImpl.java   |  2 +-
 .../apache/cloudstack/acl/RoleManagerImplTest.java |  2 +-
 ui/src/views/AutogenView.vue   |  8 +--
 ui/tests/unit/views/AutogenView.spec.js|  2 +-
 17 files changed, 130 insertions(+), 30 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-04-05 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 52fa31b446d70eccdc60df51eea3abf09c0d2485
Merge: 0d6674e3b3 9e13042120
Author: Rohit Yadav 
AuthorDate: Wed Apr 5 14:01:20 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 systemvm/agent/noVNC/app/error-handler.js  | 107 +--
 systemvm/agent/noVNC/app/images/icons/Makefile |  68 +-
 .../agent/noVNC/app/images/icons/novnc-ios-120.png |   0
 .../agent/noVNC/app/images/icons/novnc-ios-152.png |   0
 .../agent/noVNC/app/images/icons/novnc-ios-167.png |   0
 .../agent/noVNC/app/images/icons/novnc-ios-180.png |   0
 .../agent/noVNC/app/images/icons/novnc-ios-40.png  |   0
 .../agent/noVNC/app/images/icons/novnc-ios-58.png  |   0
 .../agent/noVNC/app/images/icons/novnc-ios-60.png  |   0
 .../agent/noVNC/app/images/icons/novnc-ios-80.png  |   0
 .../agent/noVNC/app/images/icons/novnc-ios-87.png  |   0
 .../noVNC/app/images/icons/novnc-ios-icon.svg  | 183 ++
 systemvm/agent/noVNC/app/images/icons/novnc.ico|   0
 systemvm/agent/noVNC/app/locale/es.json|  22 +-
 systemvm/agent/noVNC/app/locale/fr.json|  78 +++
 systemvm/agent/noVNC/app/locale/it.json|  72 ++
 systemvm/agent/noVNC/app/locale/ja.json|  17 +-
 systemvm/agent/noVNC/app/locale/pt_BR.json |  72 ++
 systemvm/agent/noVNC/app/locale/ru.json|  31 +-
 systemvm/agent/noVNC/app/locale/sv.json|  12 +-
 systemvm/agent/noVNC/app/localization.js   |  11 +-
 systemvm/agent/noVNC/app/styles/base.css   | 394 +--
 systemvm/agent/noVNC/app/styles/input.css  | 281 
 systemvm/agent/noVNC/app/ui.js | 113 +++-
 systemvm/agent/noVNC/app/webutil.js|  75 +--
 systemvm/agent/noVNC/core/decoders/jpeg.js | 141 
 systemvm/agent/noVNC/core/decoders/raw.js  |   2 +-
 systemvm/agent/noVNC/core/decoders/zrle.js | 185 ++
 systemvm/agent/noVNC/core/des.js   |   2 +-
 systemvm/agent/noVNC/core/display.js   |  29 +-
 systemvm/agent/noVNC/core/encodings.js |   4 +
 systemvm/agent/noVNC/core/input/domkeytable.js |  46 +-
 systemvm/agent/noVNC/core/input/keyboard.js| 149 +
 systemvm/agent/noVNC/core/input/util.js|  53 +-
 systemvm/agent/noVNC/core/input/vkeys.js   |   1 -
 systemvm/agent/noVNC/core/input/xtscancodes.js |   8 +-
 systemvm/agent/noVNC/core/ra2.js   | 567 
 systemvm/agent/noVNC/core/rfb.js   | 730 -
 systemvm/agent/noVNC/core/util/browser.js  |  72 +-
 systemvm/agent/noVNC/core/util/cursor.js   |  16 +-
 systemvm/agent/noVNC/core/util/events.js   |   4 -
 systemvm/agent/noVNC/core/util/md5.js  |  79 +++
 systemvm/agent/noVNC/core/util/polyfill.js |  61 --
 systemvm/agent/noVNC/core/websock.js   |  93 ++-
 systemvm/agent/noVNC/docs/novnc_proxy.1|  37 ++
 systemvm/agent/noVNC/package.json  |  72 +-
 systemvm/agent/noVNC/po/fr.po  | 300 +
 systemvm/agent/noVNC/po/it.po  | 300 +
 systemvm/agent/noVNC/po/pt_BR.po   | 299 +
 systemvm/agent/noVNC/utils/convert.js  | 140 
 .../vendor/browser-es-module-loader/README.md  |  15 -
 .../vendor/browser-es-module-loader/genworker.js   |  13 -
 .../browser-es-module-loader/rollup.config.js  |  15 -
 .../browser-es-module-loader/src/babel-worker.js   |  23 -
 .../src/browser-es-module-loader.js| 279 
 systemvm/agent/noVNC/vendor/promise.js | 255 ---
 systemvm/agent/noVNC/vnc.html  | 142 ++--
 systemvm/agent/noVNC/vnc_lite.html |  24 +-
 58 files changed, 4066 insertions(+), 1626 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.18'

2023-04-05 Thread rohit 
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 0d6674e3b3d6b3b27a158748b6c2ac072732c925
Merge: be66eb2a35b 30998d0ab7e
Author: Rohit Yadav 
AuthorDate: Wed Apr 5 12:04:48 2023 +0530

Merge remote-tracking branch 'origin/4.18'

 .../main/java/com/cloud/network/NetworkModelImpl.java| 10 --
 .../cloud/network/element/ConfigDriveNetworkElement.java |  8 +---
 .../com/cloud/network/router/CommandSetupHelper.java | 16 +++-
 utils/src/main/java/com/cloud/utils/StringUtils.java |  7 +++
 utils/src/test/java/com/cloud/utils/StringUtilsTest.java | 10 ++
 5 files changed, 33 insertions(+), 18 deletions(-)