from:"sureshanaparti"

(cloudstack) branch 4.19 updated: protect against missing service offering (#9235)

2024-06-14 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.19 by this push:
 new ed86dc973b1 protect against missing service offering (#9235)
ed86dc973b1 is described below

commit ed86dc973b15fde5687502ffc29b1ddaa8536e0e
Author: dahn 
AuthorDate: Fri Jun 14 11:55:46 2024 +0200

protect against missing service offering (#9235)

* protect agains missing service offering

* search removed before assuming none

* import

* javadoc
---
 .../com/cloud/service/dao/ServiceOfferingDao.java  |  2 +-
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |  4 ++--
 server/src/main/java/com/cloud/api/ApiDBUtils.java |  4 ++--
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 24 --
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git 
a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java 
b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
index e2fc5b49ae8..3b6fa8fa103 100644
--- a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
+++ b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
@@ -54,5 +54,5 @@ public interface ServiceOfferingDao extends 
GenericDao
 
 List listPublicByCpuAndMemory(Integer cpus, Integer 
memory);
 
-ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(long 
diskOfferingId);
+ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(long 
diskOfferingId, boolean includingRemoved);
 }
diff --git 
a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 5c8e4993829..ef6d4e71989 100644
--- 
a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ 
b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -284,10 +284,10 @@ public class ServiceOfferingDaoImpl extends 
GenericDaoBase sc = 
SearchComputeOfferingByComputeOnlyDiskOffering.create();
 sc.setParameters("disk_offering_id", diskOfferingId);
-List vos = listBy(sc);
+List vos = includingRemoved ? 
listIncludingRemovedBy(sc) : listBy(sc);
 if (vos.size() == 0) {
 return null;
 }
diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java 
b/server/src/main/java/com/cloud/api/ApiDBUtils.java
index 97ecd982f53..c45e60f8dd5 100644
--- a/server/src/main/java/com/cloud/api/ApiDBUtils.java
+++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java
@@ -1109,8 +1109,8 @@ public class ApiDBUtils {
 return null;
 }
 
-public static ServiceOfferingVO 
findServiceOfferingByComputeOnlyDiskOffering(Long diskOfferingId) {
-ServiceOfferingVO off = 
s_serviceOfferingDao.findServiceOfferingByComputeOnlyDiskOffering(diskOfferingId);
+public static ServiceOfferingVO 
findServiceOfferingByComputeOnlyDiskOffering(Long diskOfferingId, boolean 
includingRemoved) {
+ServiceOfferingVO off = 
s_serviceOfferingDao.findServiceOfferingByComputeOnlyDiskOffering(diskOfferingId,
 includingRemoved);
 return off;
 }
 public static DomainVO findDomainById(Long domainId) {
diff --git 
a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java 
b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index e309a7534a3..1060fd840b5 100644
--- a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -188,8 +188,8 @@ public class VolumeJoinDaoImpl extends 
GenericDaoBaseWithTagInformation 0) {
 DiskOffering computeOnlyDiskOffering  = 
ApiDBUtils.findComputeOnlyDiskOfferingById(volume.getDiskOfferingId());
-if (computeOnlyDiskOffering != null) {
-ServiceOffering serviceOffering = 
ApiDBUtils.findServiceOfferingByComputeOnlyDiskOffering(volume.getDiskOfferingId());
+ServiceOffering serviceOffering = 
getServiceOfferingForDiskOffering(volume, computeOnlyDiskOffering);
+if (serviceOffering != null) {
 
volResponse.setServiceOfferingId(String.valueOf(serviceOffering.getId()));
 volResponse.setServiceOfferingName(serviceOffering.getName());
 
volResponse.setServiceOfferingDisplayText(serviceOffering.getDisplayText());
@@ -283,6 +283,26 @@ public class VolumeJoinDaoImpl extends 
GenericDaoBaseWithTagInformation

(cloudstack) branch 4.19 updated (19e9020c9bb -> 034a5c84662)

2024-06-13 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 19e9020c9bb ui: fix dashboard retrievals based on permissions (#9237)
 add 034a5c84662 linstor: ui show Server and resource-group fields with 
custom protocol (#9138)

No new revisions were added by this update.

Summary of changes:
 ui/src/views/infra/AddPrimaryStorage.vue | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

(cloudstack) branch 4.19 updated (034a5c84662 -> 37f4398c80e)

2024-06-13 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 034a5c84662 linstor: ui show Server and resource-group fields with 
custom protocol (#9138)
 add 37f4398c80e linstor: Support VM-Instance Disk snapshots (#8796)

No new revisions were added by this update.

Summary of changes:
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |  58 +++-
 .../storage/datastore/util/LinstorUtil.java|   6 +-
 .../snapshot/LinstorVMSnapshotStrategy.java| 371 +
 .../spring-storage-volume-linstor-context.xml  |   2 +
 pom.xml|   2 +-
 5 files changed, 422 insertions(+), 17 deletions(-)
 create mode 100644 
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/snapshot/LinstorVMSnapshotStrategy.java

(cloudstack) branch dummy updated (8ab259bee22 -> f854aea8225)

2024-06-12 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 8ab259bee22 donot merge
 add 371ce12abef Normalize dates in Usage and Quota APIs (#8243)
 add c563fda0819 Add two more `pre-commit` hooks (#9077)
 add e159a593f12 Add `markdownlint` with `pre-commit` (#9078)
 add 40c5d353773 Fix spelling in docs, logs, exception messages etc (#9076)
 add 28e8e2d0096 pre-commit: add hook to trim trailing whitespace (#8205)
 add ad66edf6e65 UI: Add search filters (#9068)
 add 283a4853aad ui: fix create network access in deploy vm wizard (#9117)
 add c07953cc93e ui: fix columns for exportacls csv (#9118)
 add 8bb7bbea888 ui: add move to top/bottom for acl rules list (#9119)
 add 261530c92a9 server: honor listall param for listiso api (#9064)
 add c36a3b8cc33 ui: fix create menu item access (#9104)
 add c970141e250 engine-schema: add removed columne for cloud.user_data, 
fix delete op (#9120)
 add f1c3d2c4bee Merge release branch 4.19 to main
 add 5433e775e53 New feature: Implicit host tags (#8929)
 add 9b3c318db6a upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (#8893)
 add 19f96355ac0 Update .asf.yaml
 add 0c615312f95 log messages (#9093)
 add 87b55af1979 Fixup response code on incorrect credentials (#8671)
 add d77998c2d44 utils,ui: obfuscate sensitive log info, use POST for 
configureOutOfBandManagement (#9126)
 add 875cd149195 server: fix fail to list public ips of shared networks 
sometimes (#8624)
 add 68a231aaee0 Show site to site VPN connections in UI (#9066)
 add 631d6ad09bc Do not retrieve VM's stats on normal VM listing (#8782)
 add 91c7bc722f2 server,cks: check if vm is cks node during vm destroy 
(#9057)
 add 7a341942373 cleanup: remove test/src-not-used/ (#9007)
 add c791c138e75 ui: change reporting link to Github Discussions (#9023)
 add 2339412f734 linstor: make getDevicePath more robust (#9143)
 add c779b1c6164 Merge branch '4.18' into 4.19
 add b29391c3291 Merge LTS branch '4.19' into main
 add 81cdf3cfbfe Fix instance & backup resource table columns (#9147)
 add 2542582c1e0 logging migration in merge missing
 add be552fdce9c feature: webhooks (#8674)
 add cc8dc84f647 server: fix resource reservation leakage (#9169)
 add 10f4de03181 kvm: consider provisioning type for local data volumes 
(#9141)
 add 0b54fbb5399 ui: Updated units names (#8543)
 add 3f2761ec7c6 Merge remote-tracking branch 'origin/4.18' into 4.19
 add 8d211e75c01 Merge remote-tracking branch 'origin/4.19'
 add 21d07132add engine-schema: make adding/dropping indexes idempotent 
(#9171)
 add ee39104ec04 fix  null host tags while creating zone (#8976)
 add 1383625c93e Fix `*.smtp.useAuth`, `quota.usage.smtp.useStartTLS` and 
`*.smtp.enabledSecurityProtocols` settings definitions (#9031)
 add 3fe2b46dd0b [UI] Add option to specify account/project while deploying 
VMs and creating networks (#8919)
 add 3b8d2202dcd fix unwanted kvm root volume migration (#8908)
 add faf94387a63 Disable logs to stdout and capture remaining stdout logs 
to a file (#8880)
 add c9a95bc22c5 Add unit tests for null cpu for null parameters for set 
allocated cpu (#9137)
 add 66f7f762636 fix createVMSchedule action name (#9226)
 add 64593574d88 test update and get connected hosts (#9136)
 add 6fda757936b While starting VM with 'considerlasthost' enabled, don't 
load host tags/details for the last host when it doesn't exist [main] (#9063)
 add f854aea8225 donot merge

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   (8ab259bee22)
\
 N -- N -- N   refs/heads/dummy (f854aea8225)

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:
 .asf.yaml  |1 +
 .github/linters/.markdown-lint.yml |  100 +
 .github/workflows/ci.yml   |3 +-
 .pre-commit-config.yaml|   16 +-
 CHANGES.md |   16 +-
 CONTRIBUTING.md|   18 +-
 README.md  |2 +-
 agent/bindir/cloud-setup-agent.in  |4

(cloudstack) branch 4.19-dummy updated (c32f8ef7daf -> 0f8799a45fe)

2024-06-12 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard c32f8ef7daf do not merge
 add 4bd0b1c24f1 ui: refactor global createmenu (#9139)
 add 43ab8a93674 cks,ui: fix npe and check for disable zone (#9105)
 add acae5c5b9eb kvm: Update the java doc for the method 
disconnectPhysicalDiskByPath (#9210)
 add 6edcf32c5ee Fix vsphere storage policy when compute offering uses the 
disk offering attached to it (#9203)
 add 2e3f76ec031 Improve error messaging / logs when listing VMs on the 
remote KVM host (for import) (#9204)
 add edf7394919f server: search template name and display text if keyword 
is passed (#9215)
 add ca597200156 vpc,event: fix events for createVpc (#9055)
 add 15772189990 server,event: fix events for storage maintenance (#9056)
 add 4ec0f823cf3 ScaleIO volume live migration - use usable bytes from 
source disk to format the destination disk (#9174)
 add 0f770194df7 Configure config drive ISO with password file on 
reinstallation of VM  with password-enabled template (#9113)
 add 503ae64a3db Upload volume format check with the supported hypervisor, 
fail if supported hypervisor not found on zone (#9224)
 add 4de975ff252 list by isEncrypted (#8643)
 add c756e4370ad List volumes by service offering id (#9211)
 add 10dc5ad7744 ui; fix admin dashboard vue warnings (#9140)
 add e2e46e31087 ui: fix dashboard on saml user login (#9097)
 add 5c749eced26 logging: httpupload do not warn with exception trace 
(#9220)
 add b2ef53b8a2d kvm: replace ISO path in vm XML configuration during vm 
migration (#9212)
 add 0f8799a45fe do not merge

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   (c32f8ef7daf)
\
 N -- N -- N   refs/heads/4.19-dummy (0f8799a45fe)

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:
 .../java/com/cloud/network/vpc/VpcService.java |   2 +
 .../org/apache/cloudstack/api/ApiConstants.java|   1 +
 .../api/command/user/volume/ListVolumesCmd.java|  18 ++
 .../api/command/user/vpc/CreateVPCCmd.java |   6 +-
 .../cloudstack/api/response/VolumeResponse.java|   8 +-
 .../api/command/user/vpc/CreateVPCCmdTest.java |   5 +-
 ...meStatsAnswer.java => GetVolumeStatAnswer.java} |  42 +++--
 ...StatsCommand.java => GetVolumeStatCommand.java} |  25 ++-
 .../cloudstack/storage/to/VolumeObjectTO.java  |   9 +
 .../main/java/com/cloud/storage/dao/VolumeDao.java |   3 +-
 .../java/com/cloud/storage/dao/VolumeDaoImpl.java  |   1 -
 .../storage/datastore/db/ImageStoreDaoImpl.java|   2 +-
 .../wrapper/LibvirtGetRemoteVmsCommandWrapper.java |  27 ++-
 .../LibvirtGetVolumeStatCommandWrapper.java|  66 
 .../wrapper/LibvirtMigrateCommandWrapper.java  |  86 ++
 .../LibvirtMigrateVolumeCommandWrapper.java|  23 ++-
 .../hypervisor/kvm/storage/KVMStoragePool.java |   3 +
 .../kvm/storage/KVMStorageProcessor.java   |   2 +-
 .../kvm/storage/ScaleIOStorageAdaptor.java |  15 +-
 .../hypervisor/kvm/storage/ScaleIOStoragePool.java |   5 +
 .../hypervisor/kvm/storage/StorageAdaptor.java |  18 +-
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  |  12 ++
 .../version/KubernetesVersionManagerImpl.java  |  22 ++-
 .../version/KubernetesVersionManagerImplTest.java  |  73 +
 .../driver/ScaleIOPrimaryDataStoreDriver.java  |  23 ++-
 .../driver/ScaleIOPrimaryDataStoreDriverTest.java  |  31 +++-
 .../java/com/cloud/api/query/QueryManagerImpl.java |  33 +++-
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |   3 +-
 .../java/com/cloud/api/query/vo/VolumeJoinVO.java  |   7 +-
 .../configuration/ConfigurationManagerImpl.java|  26 +--
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  11 ++
 .../java/com/cloud/storage/StorageManagerImpl.java |  15 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java|  14 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |   2 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java |  14 +-
 .../storage/resource/HttpUploadServerHandler.java  |   3 +-
 ui/src/components/header/CreateMenu.vue| 181 +++--
 ui/src/components/view/SearchView.vue  |  62 ++-
 ui/src/config/section/storage.js

(cloudstack) branch 4.19 updated: List volumes by service offering id (#9211)

2024-06-12 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.19 by this push:
 new c756e4370ad List volumes by service offering id (#9211)
c756e4370ad is described below

commit c756e4370adb3d7a3d1ba85fd516691f29562e87
Author: Vishesh 
AuthorDate: Wed Jun 12 16:13:56 2024 +0530

List volumes by service offering id (#9211)

* Allow listing of volumes by service offering id

* Address comments
---
 .../api/command/user/volume/ListVolumesCmd.java| 11 
 .../java/com/cloud/api/query/QueryManagerImpl.java | 14 +++--
 ui/src/components/view/SearchView.vue  | 62 +-
 ui/src/config/section/storage.js   |  2 +-
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
index 18a32e324f7..6510106557b 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
@@ -31,6 +31,7 @@ import 
org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VolumeResponse;
@@ -82,6 +83,12 @@ public class ListVolumesCmd extends 
BaseListRetrieveOnlyResourceCountCmd impleme
 RoleType.Admin})
 private String storageId;
 
+@Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = 
CommandType.UUID,
+   entityType = ServiceOfferingResponse.class,
+   description = "list volumes by disk offering of a service 
offering. If both service offering and " +
+   "disk offering are passed, service offering is 
ignored", since = "4.19.1")
+private Long serviceOfferingId;
+
 @Parameter(name = ApiConstants.DISK_OFFERING_ID, type = CommandType.UUID, 
entityType = DiskOfferingResponse.class, description = "list volumes by disk 
offering", since = "4.4")
 private Long diskOfferingId;
 
@@ -123,6 +130,10 @@ public class ListVolumesCmd extends 
BaseListRetrieveOnlyResourceCountCmd impleme
 return podId;
 }
 
+public Long getServiceOfferingId() {
+return serviceOfferingId;
+}
+
 public Long getDiskOfferingId() {
 return diskOfferingId;
 }
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index f83192350db..320432c5f9f 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -2406,7 +2406,8 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
 Map tags = cmd.getTags();
 String storageId = cmd.getStorageId();
 Long clusterId = cmd.getClusterId();
-Long diskOffId = cmd.getDiskOfferingId();
+Long serviceOfferingId = cmd.getServiceOfferingId();
+Long diskOfferingId = cmd.getDiskOfferingId();
 Boolean display = cmd.getDisplay();
 String state = cmd.getState();
 boolean shouldListSystemVms = shouldListSystemVms(cmd, caller.getId());
@@ -2416,6 +2417,13 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
 
 List ids = getIdsListFromCmd(cmd.getId(), cmd.getIds());
 
+if (diskOfferingId == null && serviceOfferingId != null) {
+ServiceOfferingVO serviceOffering = 
_srvOfferingDao.findById(serviceOfferingId);
+if (serviceOffering != null) {
+diskOfferingId = serviceOffering.getDiskOfferingId();
+}
+}
+
 Ternary 
domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), 
cmd.isRecursive(), null);
 accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), 
cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, 
cmd.listAll(), false);
 Long domainId = domainIdRecursiveListProject.first();
@@ -2546,8 +2554,8 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
 }
 }
 
-if (diskOffId != null) {
-sc.setParameters("diskOfferingId", diskOffId);
+if (diskOfferingId != null) {
+sc.setParameters("diskO

(cloudstack) branch 4.19 updated (503ae64a3db -> 4de975ff252)

2024-06-12 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 503ae64a3db Upload volume format check with the supported hypervisor, 
fail if supported hypervisor not found on zone (#9224)
 add 4de975ff252 list by isEncrypted (#8643)

No new revisions were added by this update.

Summary of changes:
 api/src/main/java/org/apache/cloudstack/api/ApiConstants.java |  1 +
 .../cloudstack/api/command/user/volume/ListVolumesCmd.java|  7 +++
 .../org/apache/cloudstack/api/response/VolumeResponse.java|  8 
 .../schema/src/main/java/com/cloud/storage/dao/VolumeDao.java |  3 ++-
 .../src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java|  1 -
 .../src/main/java/com/cloud/api/query/QueryManagerImpl.java   | 11 +--
 .../main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java  |  3 ++-
 server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java |  7 +++
 8 files changed, 28 insertions(+), 13 deletions(-)

(cloudstack) branch main updated: log messages (#9093)

2024-06-06 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 0c615312f95 log messages (#9093)
0c615312f95 is described below

commit 0c615312f95aa3c0a23ad5baa7e3ad2b308133d7
Author: dahn 
AuthorDate: Thu Jun 6 09:11:11 2024 +0200

log messages (#9093)

* log messages

* Apply suggestions from code review

Co-authored-by: João Jandre <48719461+joaojan...@users.noreply.github.com>

* Update 
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java

Co-authored-by: Fabricio Duarte 

-

Co-authored-by: João Jandre <48719461+joaojan...@users.noreply.github.com>
Co-authored-by: Fabricio Duarte 
---
 .../java/com/cloud/storage/resource/VmwareStorageProcessor.java | 2 +-
 .../com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java  | 4 +---
 .../KubernetesClusterResourceModifierActionWorker.java  | 4 +---
 .../cluster/actionworkers/KubernetesClusterStartWorker.java | 2 +-
 .../com/cloud/kubernetes/cluster/utils/KubernetesClusterUtil.java   | 6 ++
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
index d81fd028b10..7be0dd5862f 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -948,7 +948,7 @@ public class VmwareStorageProcessor implements 
StorageProcessor {
 dsMo.moveDatastoreFile(vmwareLayoutFilePair[i], dcMo.getMor(), 
dsMo.getMor(), legacyCloudStackLayoutFilePair[i], dcMo.getMor(), true);
 }
 
-logger.info("detach disks from volume-wrapper VM and destroy" + 
vmdkName);
+logger.info("detach disks from volume-wrapper VM and destroy {}", 
vmdkName);
 vmMo.detachAllDisksAndDestroy();
 
 String srcFile = dsMo.getDatastorePath(vmdkName, true);
diff --git 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
index 834d6d0..d9350a6b1be 100644
--- 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
+++ 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
@@ -515,9 +515,7 @@ public class KubernetesClusterManagerImpl extends 
ManagerBase implements Kuberne
 logger.debug(String.format("Checking host ID: %s for 
capacity already reserved %d", hostVO.getUuid(), reserved));
 }
 if (capacityManager.checkIfHostHasCapacity(hostVO.getId(), 
cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, 
memoryOvercommitRatio, true)) {
-if (logger.isDebugEnabled()) {
-logger.debug(String.format("Found host ID: %s for with 
enough capacity, CPU=%d RAM=%s", hostVO.getUuid(), cpu_requested * reserved, 
toHumanReadableSize(ram_requested * reserved)));
-}
+logger.debug("Found host ID == '{}' to have enough 
capacity, CPU={} RAM={}", hostVO.getUuid(), cpu_requested * reserved, 
toHumanReadableSize(ram_requested * reserved));
 hostEntry.setValue(new Pair(hostVO, 
reserved));
 suitable_host_found = true;
 planCluster = cluster;
diff --git 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
index e8bc8e2851e..6604cda0adf 100644
--- 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
+++ 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
@@ -263,9 +263,7 @@ public class KubernetesClusterResourceModifierActionWorker 
extends KubernetesClu
 logger.debug(String.format("Checking

(cloudstack) branch 4.19-dummy updated (c071e15a05b -> f49b1f8c05d)

2024-04-30 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


from c071e15a05b do not merge
 add 981310c2fe7 UI: Fix the Add / Remove Vmware DC button on Zone detail 
view (#8781)
 add d1ca79b65b3 ui: show systemvm agent version in the list and resource 
view (#9011)
 add f49b1f8c05d Merge branch '4.19' into 4.19-dummy

No new revisions were added by this update.

Summary of changes:
 ui/src/config/section/infra/systemVms.js | 4 ++--
 ui/src/views/AutogenView.vue | 6 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

(cloudstack) branch 4.19 updated: field enlarged and db upgrade (#8675)

2024-04-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.19 by this push:
 new 6502dde8c33 field enlarged and db upgrade (#8675)
6502dde8c33 is described below

commit 6502dde8c33feb43aad989c97960ba8efa3bfd34
Author: dahn 
AuthorDate: Tue Apr 23 09:31:08 2024 +0200

field enlarged and db upgrade (#8675)

* 4.19 -> 4.19.1 and enlarge url field
---
 .../main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java  | 11 ++-
 .../src/main/resources/META-INF/db/schema-41900to41910.sql|  4 
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java 
b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
index 5c57fb31fcf..4cdd1c3364d 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
@@ -16,9 +16,10 @@
 // under the License.
 package com.cloud.upgrade.dao;
 
+import org.apache.log4j.Logger;
+
 import com.cloud.upgrade.SystemVmTemplateRegistration;
 import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.log4j.Logger;
 
 import java.io.InputStream;
 import java.sql.Connection;
@@ -73,6 +74,10 @@ public class Upgrade41900to41910 implements DbUpgrade, 
DbUpgradeSystemVmTemplate
 DbUpgradeUtils.addIndexIfNeeded(conn, "vm_stats", "vm_id");
 }
 
+private void initSystemVmTemplateRegistration() {
+systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
+}
+
 @Override
 public void updateSystemVmTemplates(Connection conn) {
 LOG.debug("Updating System Vm template IDs");
@@ -83,8 +88,4 @@ public class Upgrade41900to41910 implements DbUpgrade, 
DbUpgradeSystemVmTemplate
 throw new CloudRuntimeException("Failed to find / register 
SystemVM template(s)");
 }
 }
-
-private void initSystemVmTemplateRegistration() {
-systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
-}
 }
diff --git 
a/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql 
b/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql
index 358cc9d2979..de9c62258c8 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql
@@ -31,6 +31,10 @@ SET usage_unit = 'IOPS', updated_on = NOW()
 WHERE effective_on = '2010-05-04 00:00:00'
 AND name IN ('VM_DISK_IO_READ', 'VM_DISK_IO_WRITE');
 
+-- allow for bigger urls
+
+ALTER TABLE `cloud`.`vm_template` MODIFY COLUMN `url` VARCHAR(1024) DEFAULT 
NULL COMMENT 'the url where the template exists externally';
+
 -- PR #7235 - [Usage] Create VPC billing
 CREATE TABLE IF NOT EXISTS `cloud_usage`.`usage_vpc` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,

(cloudstack) branch 4.19-dummy updated (1770204568b -> dfebc09f947)

2024-04-17 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


from 1770204568b do not merge
 add f25d35c5d6b VM Import: Use datastore name when datastore path is not 
set to search for pools on DB (#8759)
 add d487a1c3417 Fix disk offering override in VM deployment wizard (#8070)
 add f8fd22c2d62 Usage: Fixup entity exists exception (#8726)
 add 0780f0e5c61 Merge remote-tracking branch 'apache/4.18' into 4.19
 add e0731c50985 Fix the removal of network offering tags (#8758)
 add 9acba904237 Fix 404 when moving a VM to out of a project (#8650)
 add ffd59720dd8 storage,plugins: delegate allow zone-wide volume migration 
check and access grant check to storage drivers (#8762)
 add 0043540fa30 Use join instead of views (#8321)
 add 9d748f0837f server: update default value of setting 
'expose.dns.externally' to 'false' (#8776)
 add fe5d7412364 Merge branch '4.18' into '4.19'
 add 720407ba737 snapshot: don't schedule next snapshot job for a removed 
volume (#8735)
 add 8c62365dbb1 VPC VR: fix empty iptables if there is no vpc tier (#8787)
 add 308ed1399ee Merge remote-tracking branch 'origin/4.18' into 4.19
 add 24d5c45f7f4 Add indexes for vm_stats (#8737)
 add 2e88eb45a3b Update mysql-connector version (#8753)
 add 88017ad45e3 Fix Virtual router count in Capacity dashboard (#8807)
 add f4058705d7b UI: add dialog to select a VPC tier when create LB for 
autoscaling in VPC (#8793)
 add 08d9d06d453 api,server,ui: add project ID and name to UserDataResponse 
(#8656)
 add 31301f56f64 Fix missing actions on Guest IP ranges for networks (#8777)
 add 6c6023b790c UI: Fix irrelevant conversion options in import instance 
modal (#8838)
 add f7603dcbcc8 AllLinesParser: Enable draining of stdout (#8670)
 add 38f028613fc Fix getRepair method in checkVolume command (#8840)
 add fc3c625beba server: fix security issues caused by extraconfig on KVM
 add 67e2061f4b8 api: client verification in servlet
 add 939d0b9011a engine-storage: control download redirection
 add 72b2eb0087f server: fix security issues caused by extraconfig on KVM
 add 00f687db1be api: client verification in servlet
 add b642500f153 Merge remote-tracking branch 'origin/4.18' into 4.19
 add ff3e9bd821f engine-storage: control download redirection
 add 16aba6b5881 Merge remote-tracking branch 'origin/4.18' into 4.19
 add 7a9985b42bf upgrade: add unit tests from/to a security release (#8870)
 add f2da882d68f Merge remote-tracking branch 'origin/4.18' into 4.19
 add b8f8321f0f9 Allow listing of inactive offerings (#8821)
 add c25264bada3 UI Fixes: allow filtering on alertype in UI & add events 
tab (#8630)
 add a5508acc54d server: fix haproxy misconfiguration after VPC VR start 
(#8881)
 add c7626ebfd63 Merge remote-tracking branch 'apache/4.18' into 4.19
 add c24c1a5c000 Fix VM import & VM delete with custom offering (#8813)
 add 730cc5d5b8f Change iops on offering change (#8872)
 add d3e020a5452 Mark libvirt events experimental, add properties flag 
(#8825)
 add b998e7dbb63 Allow overriding root disk offering & size, and expunge 
old root disk while restoring a VM (#8800)
 add 44aa08c02a3 Fixup 4.19 build issue (#8905)
 add 0a26f3315a1 Fix listStoragePoolsMetricsCmd (#8885)
 add 6cd5c6a1d01 linstor: Do not pretend handling disconnect paths that are 
non Linstor (#8897)
 add a55ba96a08e Merge remote-tracking branch 'origin/4.18' into 4.19
 add 075b4130412 Fix VR inheriting boot settings from user's VM (#8894)
 add 7721133ea9a Fix display of properties related to backup size (#8845)
 add 44b8d3af0ca ui: bump UI dependencies versions (#8923)
 add 85110147071 Fix error message for checkVolume command (#8842)
 add dfebc09f947 Merge branch '4.19' into 4.19-dummy

No new revisions were added by this update.

Summary of changes:
 agent/conf/agent.properties|4 +
 .../cloud/agent/properties/AgentProperties.java|7 +
 .../java/com/cloud/offering/ServiceOffering.java   |2 +-
 .../java/com/cloud/storage/VolumeApiService.java   |2 +
 api/src/main/java/com/cloud/vm/UserVmService.java  |2 +-
 .../java/com/cloud/vm/VirtualMachineProfile.java   |2 +
 .../org/apache/cloudstack/acl/RoleService.java |4 +-
 .../org/apache/cloudstack/alert/AlertService.java  |4 +
 .../apache/cloudstack/api/InternalIdentity.java|   14 +
 .../admin/acl/project/CreateProjectRoleCmd.java|   10 +
 .../project/CreateProjectRolePermissionCmd.java|   11 +
 .../admin/acl/project/DeleteProjectRoleCmd.java|   11 +
 .../project/DeleteProjectRolePermissionCmd.java|   11 +
 .../admin/acl/project/UpdateProjectRoleCmd.java|   11 +
 .../project/UpdateProjectRolePermissionCmd.java|   11 +
 .../ad

(cloudstack) branch 4.19 updated: UI: Fix irrelevant conversion options in import instance modal (#8838)

2024-03-27 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.19 by this push:
 new 6c6023b790c UI: Fix irrelevant conversion options in import instance 
modal (#8838)
6c6023b790c is described below

commit 6c6023b790c87f1b37f78bfacaababe202ef93bf
Author: Vishesh 
AuthorDate: Wed Mar 27 18:37:00 2024 +0530

UI: Fix irrelevant conversion options in import instance modal (#8838)
---
 ui/src/views/tools/ImportUnmanagedInstance.vue | 2 +-
 ui/src/views/tools/ManageInstances.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/src/views/tools/ImportUnmanagedInstance.vue 
b/ui/src/views/tools/ImportUnmanagedInstance.vue
index a03ef3866ec..9eb74877365 100644
--- a/ui/src/views/tools/ImportUnmanagedInstance.vue
+++ b/ui/src/views/tools/ImportUnmanagedInstance.vue
@@ -713,7 +713,7 @@ export default {
 page: 1
   })
   this.fetchKvmHostsForConversion()
-  if (this.resource.disk.length > 1) {
+  if (this.resource?.disk?.length > 1) {
 this.updateSelectedRootDisk()
   }
 },
diff --git a/ui/src/views/tools/ManageInstances.vue 
b/ui/src/views/tools/ManageInstances.vue
index a869768bf39..b61c8a9efa5 100644
--- a/ui/src/views/tools/ManageInstances.vue
+++ b/ui/src/views/tools/ManageInstances.vue
@@ -1074,6 +1074,7 @@ export default {
   this.sourceHypervisor = value
   this.sourceActions = this.AllSourceActions.filter(x => 
x.sourceDestHypervisors[value])
   this.form.sourceAction = this.sourceActions[0].name || ''
+  this.selectedVmwareVcenter = undefined
   this.onSelectSourceAction(this.form.sourceAction)
 },
 onSelectSourceAction (value) {

(cloudstack) branch 4.19 updated: Fix missing actions on Guest IP ranges for networks (#8777)

2024-03-27 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.19 by this push:
 new 31301f56f64 Fix missing actions on Guest IP ranges for networks (#8777)
31301f56f64 is described below

commit 31301f56f649e92c39108b0100200f201f3b348a
Author: Vishesh 
AuthorDate: Wed Mar 27 11:52:44 2024 +0530

Fix missing actions on Guest IP ranges for networks (#8777)

* Fix missing actions on Guest IP ranges for networks

* Show success and error pop on deleting guest ip ranges
---
 ui/src/views/network/GuestIpRanges.vue | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/src/views/network/GuestIpRanges.vue 
b/ui/src/views/network/GuestIpRanges.vue
index 0ecc033119f..815b3d9132f 100644
--- a/ui/src/views/network/GuestIpRanges.vue
+++ b/ui/src/views/network/GuestIpRanges.vue
@@ -36,14 +36,16 @@
 :rowKey="item => item.id"
 :pagination="false" >
 
-
+
   
{
+const message = `${this.$t('message.success.delete')} 
${this.$t('label.ip.range')}`
+this.$message.success(message)
+  }).catch((error) => {
+this.$notifyError(error)
   }).finally(() => {
 this.fetchData()
   })

(cloudstack) branch 4.19 updated: api,server,ui: add project ID and name to UserDataResponse (#8656)

2024-03-25 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.19 by this push:
 new 08d9d06d453 api,server,ui: add project ID and name to UserDataResponse 
(#8656)
08d9d06d453 is described below

commit 08d9d06d45316edb99ce3aba481de188b2baa7e0
Author: Wei Zhou 
AuthorDate: Mon Mar 25 14:45:34 2024 +0100

api,server,ui: add project ID and name to UserDataResponse (#8656)

* api,server,ui: add project ID and name to UserDataResponse

* Update: add since
---
 .../cloudstack/api/response/UserDataResponse.java| 20 +++-
 .../main/java/com/cloud/api/ApiResponseHelper.java   |  7 +--
 ui/src/config/section/compute.js |  5 +
 ui/src/views/AutogenView.vue |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java 
b/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
index bbe27f84520..e69094c8f80 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.BaseResponseWithAnnotations;
 import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value = UserData.class)
-public class UserDataResponse extends BaseResponseWithAnnotations {
+public class UserDataResponse extends BaseResponseWithAnnotations implements 
ControlledEntityResponse {
 
 @SerializedName(ApiConstants.ID)
 @Param(description = "ID of the ssh keypair")
@@ -40,6 +40,14 @@ public class UserDataResponse extends 
BaseResponseWithAnnotations {
 @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the 
userdata")
 private String accountName;
 
+@SerializedName(ApiConstants.PROJECT_ID)
+@Param(description = "the project id of the userdata", since = "4.19.1")
+private String projectId;
+
+@SerializedName(ApiConstants.PROJECT)
+@Param(description = "the project name of the userdata", since = "4.19.1")
+private String projectName;
+
 @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id 
of the userdata owner")
 private String domainId;
 
@@ -118,6 +126,16 @@ public class UserDataResponse extends 
BaseResponseWithAnnotations {
 this.accountName = accountName;
 }
 
+@Override
+public void setProjectId(String projectId) {
+this.projectId = projectId;
+}
+
+@Override
+public void setProjectName(String projectName) {
+this.projectName = projectName;
+}
+
 public String getDomainName() {
 return domain;
 }
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java 
b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index e2b72f6175c..6d66da43c37 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -4818,12 +4818,7 @@ public class ApiResponseHelper implements 
ResponseGenerator {
 @Override
 public UserDataResponse createUserDataResponse(UserData userData) {
 UserDataResponse response = new UserDataResponse(userData.getUuid(), 
userData.getName(), userData.getUserData(), userData.getParams());
-Account account = ApiDBUtils.findAccountById(userData.getAccountId());
-response.setAccountId(account.getUuid());
-response.setAccountName(account.getAccountName());
-Domain domain = ApiDBUtils.findDomainById(userData.getDomainId());
-response.setDomainId(domain.getUuid());
-response.setDomainName(domain.getName());
+populateOwner(response, userData);
 
response.setHasAnnotation(annotationDao.hasAnnotations(userData.getUuid(), 
AnnotationService.EntityType.USER_DATA.name(),
 
_accountMgr.isRootAdmin(CallContext.current().getCallingAccount().getId(;
 return response;
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index f1b3e1b2c99..bd18535f380 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -898,7 +898,12 @@ export default {
 var fields = ['name', 'id']
 if (['Admin', 
'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
   fields.push('account')
+  if (store.getters.listAllProjects) {
+fields.push('project')
+  }
   fields.push('domain')
+} else if (store.getters.listAllProjects) {
+  fields.push('project')
 }
 return fields
   },
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index bf1c42d4c05..77

[cloudstack] branch 4.17 updated: Fix can't select schedule interval type in configure backup schedule (#6547)

2022-07-15 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.17 by this push:
 new c09ee40984 Fix can't select schedule interval type in configure backup 
schedule (#6547)
c09ee40984 is described below

commit c09ee40984b1ea64591bf06a07f972000db16a8a
Author: Hoang Nguyen 
AuthorDate: Fri Jul 15 18:31:58 2022 +0700

Fix can't select schedule interval type in configure backup schedule (#6547)
---
 ui/src/views/compute/backup/FormSchedule.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui/src/views/compute/backup/FormSchedule.vue 
b/ui/src/views/compute/backup/FormSchedule.vue
index eb059efa77..d151262309 100644
--- a/ui/src/views/compute/backup/FormSchedule.vue
+++ b/ui/src/views/compute/backup/FormSchedule.vue
@@ -226,9 +226,6 @@ export default {
   }
 },
 handleChangeIntervalType (e) {
-  this.form.intervaltype = e.target.value
-  this.resetForm()
-
   switch (this.form.intervaltype) {
 case 'weekly':
   this.fetchDayOfWeek()

[cloudstack] branch 4.17 updated: UI: Add authmethod field allowing to choose password or ssh key when adding host (#6525)

2022-07-06 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.17 by this push:
 new 9e5cda59ce UI: Add authmethod field allowing to choose password or ssh 
key when adding host (#6525)
9e5cda59ce is described below

commit 9e5cda59ceb53f4f1f1eab034c5d6f9a0d82223c
Author: Hoang Nguyen 
AuthorDate: Wed Jul 6 13:46:09 2022 +0700

UI: Add authmethod field allowing to choose password or ssh key when adding 
host (#6525)

* add authmethod to addhost in zone wizard

* add a condition for hiding password field

* set default value when switch hypervisor

* add more value for authmethod
---
 ui/src/views/infra/zone/StaticInputsForm.vue   | 57 --
 ui/src/views/infra/zone/ZoneWizardAddResources.vue | 30 +++-
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue   |  3 +-
 3 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/ui/src/views/infra/zone/StaticInputsForm.vue 
b/ui/src/views/infra/zone/StaticInputsForm.vue
index 0c23a3ad08..6604ba32c8 100644
--- a/ui/src/views/infra/zone/StaticInputsForm.vue
+++ b/ui/src/views/infra/zone/StaticInputsForm.vue
@@ -67,6 +67,26 @@
 v-model:value="form[field.key]"
 v-focus="index === 0"
   />
+  
+
+  
+{{ $t(radioItem.label) }}
+  
+
+
+  
+
+  
+
+  
{
@@ -236,6 +264,27 @@ export default {
 return false
   }
   return true
+},
+isDisplayItem (conditions) {
+  if (!conditions || Object.keys(conditions).length === 0) {
+return true
+  }
+  let isShow = true
+  Object.keys(conditions).forEach(key => {
+if (!isShow) return false
+
+const condition = conditions[key]
+const fieldVal = this.form[key]
+  ? this.form[key]
+  : (this.prefillContent?.[key] || null)
+if (Array.isArray(condition) && !condition.includes(fieldVal)) {
+  isShow = false
+} else if (!Array.isArray(condition) && fieldVal !== condition) {
+  isShow = false
+}
+  })
+
+  return isShow
 }
   }
 }
diff --git a/ui/src/views/infra/zone/ZoneWizardAddResources.vue 
b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
index 8a52ec9100..ad16ef30aa 100644
--- a/ui/src/views/infra/zone/ZoneWizardAddResources.vue
+++ b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
@@ -284,6 +284,33 @@ export default {
 hypervisor: ['VMware', 'BareMetal', 'Ovm', 'Hyperv', 'KVM', 
'XenServer', 'LXC', 'Simulator']
   }
 },
+{
+  title: 'label.authentication.method',
+  key: 'authmethod',
+  placeHolder: 'message.error.authmethod',
+  required: false,
+  radioGroup: true,
+  defaultValue: 'password',
+  radioOption: [{
+label: 'label.password',
+value: 'password'
+  }, {
+label: 'label.authentication.sshkey',
+value: 'sshkey',
+condition: {
+  hypervisor: ['KVM']
+}
+  }],
+  display: {
+hypervisor: ['BareMetal', 'Ovm', 'Hyperv', 'KVM', 'XenServer', 
'LXC', 'Simulator']
+  },
+  alert: {
+message: 'message.add.host.sshkey',
+display: {
+  authmethod: 'sshkey'
+}
+  }
+},
 {
   title: 'label.password',
   key: 'hostPassword',
@@ -291,7 +318,8 @@ export default {
   required: true,
   password: true,
   display: {
-hypervisor: ['VMware', 'BareMetal', 'Ovm', 'Hyperv', 'KVM', 
'XenServer', 'LXC', 'Simulator']
+hypervisor: ['VMware', 'BareMetal', 'Ovm', 'Hyperv', 'KVM', 
'XenServer', 'LXC', 'Simulator'],
+authmethod: 'password'
   }
 },
 {
diff --git a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue 
b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
index 432523c901..7f23c3b643 100644
--- a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
+++ b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@ -1211,6 +1211,7 @@ export default {
   this.addStep('message.adding.host', 'hostResource')
 
   const hostData = {}
+  const hostPassword = this.prefillContent?.authmethod !== 'password' ? '' 
: (this.prefillContent?.hostPassword || null)
   hostData.zoneid = this.stepData.zoneReturned.id
   hostData.podid = this.stepData.podReturned.id
   hostData.clusterid = this.stepData.clusterReturned.id
@@ -1218,7 +1219,7 @@ export default {
   hostData.clustertype = this.stepData.clusterReturned.clustertype
   hostData.hostta

[cloudstack] branch 4.17 updated: Fix for VMware VM migration with volume in local storage (#6483)

2022-06-30 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.17 by this push:
 new 637a102922 Fix for VMware VM migration with volume in local storage 
(#6483)
637a102922 is described below

commit 637a1029228dcdf7c1f262bf8dbf9afe44fa3a36
Author: Harikrishna 
AuthorDate: Fri Jul 1 10:39:02 2022 +0530

Fix for VMware VM migration with volume in local storage (#6483)

* Fix VMware VM migration with volume in case of local storage

* Break the loop once target host is found

* Code optimisations in getting the target host guid for local storage

* Fixed code smells and added unit test
---
 .../java/com/cloud/hypervisor/guru/VMwareGuru.java |  29 -
 .../com/cloud/hypervisor/guru/VMwareGuruTest.java  | 119 +
 2 files changed, 147 insertions(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
index a5e4140357..5d29be9ebc 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -27,6 +27,8 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.StoragePoolHostVO;
+import com.cloud.storage.dao.StoragePoolHostDao;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.backup.Backup;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
@@ -184,6 +186,7 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 @Inject UserVmDao userVmDao;
 @Inject DiskOfferingDao diskOfferingDao;
 @Inject PhysicalNetworkDao physicalNetworkDao;
+@Inject StoragePoolHostDao storagePoolHostDao;
 
 protected VMwareGuru() {
 super();
@@ -1070,6 +1073,13 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 return srcClusterId != null && destClusterId != null && ! 
srcClusterId.equals(destClusterId);
 }
 
+private String getHostGuidForLocalStorage(StoragePool pool) {
+List storagePoolHostVOs = 
storagePoolHostDao.listByPoolId(pool.getId());
+StoragePoolHostVO storagePoolHostVO = storagePoolHostVOs.get(0);
+HostVO hostVO = _hostDao.findById(storagePoolHostVO.getHostId());
+return hostVO.getGuid();
+}
+
 private String getHostGuidInTargetCluster(boolean isInterClusterMigration, 
Long destClusterId) {
 String hostGuidInTargetCluster = null;
 if (isInterClusterMigration) {
@@ -1096,6 +1106,7 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 // OfflineVmwareMigration: specialised migration command
 List> volumeToFilerTo = new 
ArrayList>();
 Long poolClusterId = null;
+StoragePool targetLocalPoolForVM = null;
 for (Map.Entry entry : volumeToPool.entrySet()) {
 Volume volume = entry.getKey();
 StoragePool pool = entry.getValue();
@@ -1104,13 +1115,18 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 if (pool.getClusterId() != null) {
 poolClusterId = pool.getClusterId();
 }
+if (volume.getVolumeType().equals(Volume.Type.ROOT) && 
pool.isLocal()) {
+targetLocalPoolForVM = pool;
+}
 volumeToFilerTo.add(new Pair(volumeTo, 
filerTo));
 }
 final Long destClusterId = poolClusterId;
 final Long srcClusterId = 
vmManager.findClusterAndHostIdForVm(vm.getId()).first();
 final boolean isInterClusterMigration = 
isInterClusterMigration(destClusterId, srcClusterId);
+String targetHostGuid = getTargetHostGuid(targetLocalPoolForVM, 
destClusterId, isInterClusterMigration);
+
 MigrateVmToPoolCommand migrateVmToPoolCommand = new 
MigrateVmToPoolCommand(vm.getInstanceName(),
-volumeToFilerTo, 
getHostGuidInTargetCluster(isInterClusterMigration, destClusterId), true);
+volumeToFilerTo, targetHostGuid, true);
 commands.add(migrateVmToPoolCommand);
 
 // OfflineVmwareMigration: cleanup if needed
@@ -1127,6 +1143,17 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 return commands;
 }
 
+private String getTargetHostGuid(StoragePool targetLocalPoolForVM, Long 
destClusterId, boolean isInterClusterMigration) {
+String targetHostGuid = null;
+if (targetLocalPoolForVM != null) {
+// Get the target host for local storage migration
+targetHostGuid = getHostGuidForLoc

[cloudstack-www] branch asf-site updated (62cb2d8 -> 9549a26)

2022-03-07 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git.


from 62cb2d8  Merge remote-tracking branch 'apache-github/main' into 
asf-site
 add a0c404b  Update site for 4.16.1.0 release
 add d047c27  Reverted changes in source/downloads.html.markdown.erb
 add 38eedf6  Updated content files
 add f389eb6  Merge pull request #90 from shapeblue/4.16.1.0-release
 new 9549a26  Merge branch 'main' into asf-site

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/archives.html  |  1 +
 content/downloads.html | 14 +++---
 content/index.html |  4 ++--
 data/cloudstack.yml|  7 ---
 4 files changed, 14 insertions(+), 12 deletions(-)

[cloudstack-www] 01/01: Merge branch 'main' into asf-site

2022-03-07 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git

commit 9549a26f4c4ddd89ce5d88245b89663674641ba6
Merge: 62cb2d8 f389eb6
Author: Suresh Kumar Anaparti 
AuthorDate: Mon Mar 7 19:36:32 2022 +0530

Merge branch 'main' into asf-site

 content/archives.html  |  1 +
 content/downloads.html | 14 +++---
 content/index.html |  4 ++--
 data/cloudstack.yml|  7 ---
 4 files changed, 14 insertions(+), 12 deletions(-)

[cloudstack-www] branch main updated (3f54d85 -> f389eb6)

2022-03-07 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git.


from 3f54d85  updated PR #89 to include compiled content
 new a0c404b  Update site for 4.16.1.0 release
 new d047c27  Reverted changes in source/downloads.html.markdown.erb
 new 38eedf6  Updated content files
 new f389eb6  Merge pull request #90 from shapeblue/4.16.1.0-release

The 286 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/archives.html  |  1 +
 content/downloads.html | 14 +++---
 content/index.html |  4 ++--
 data/cloudstack.yml|  7 ---
 4 files changed, 14 insertions(+), 12 deletions(-)

[cloudstack-documentation] annotated tag 4.16.1.0 updated (844f992 -> e7eadd3)

2022-03-04 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to annotated tag 4.16.1.0
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git.


*** WARNING: tag 4.16.1.0 was modified! ***

from 844f992  (commit)
  to e7eadd3  (tag)
 tagging 844f992db15dc1053f3f2828ae6f5f7512457303 (commit)
 replaces 4.15.1.0
  by Suresh Kumar Anaparti
  on Fri Mar 4 20:05:57 2022 +0530

- Log -
Tagging release 4.16.1.0 on branch 4.16.
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEE1uBYHs+KL74/9rPJ186uOp5x0KoFAmIiI80ACgkQ186uOp5x
0KqLZQ//e4coc+Va6AbwTl7VjDxMKkTYL56ctWst/gmrEWQk70nRgN/sGkxaOf6p
JLMWayN7veMDmsBVdQyEVvNyNVBeJnfUiE4r1tK+itFZJxAEZRsD255e3DQJUFYk
MSnZ6HJ1iFlKH/ylkiW/6BHdH3csQqv3J8lO9qIlz32dBXA2ivUATPNwDwz5maVN
Uiw5ePp9NXdCLtK41nTkMTuUZPJAwqmfu8HeQ8sPyM7dU4nr5NAcFsaPrqIySPht
bG2AUiql0CyasjwYqTHl3R8yBwJ5VXwofXqIQHKR1QA2EhO2+5oEPHjvIAqqV7yz
XOWnneNtlQjrMD5t4rlBt+Kw8fyQLLQ2OE2Cv7p2cCfskxjf+kTgFJq9SlvycSnA
0V/Y/lNgLO7Lk8O7/ZVm20SB8EP85dEzKnGxOzqoRazZqpTVF4tOLNUegJR4TZNa
0V5NCfEYa6uokNqDefEBy7exT1EBe2YLTZi68hSA0rTFFO+SkPcxJ5FFiDKViS7G
IjdIiynyojvza4GKPPldvqyeFB8gLYP4BbfpSmAZHPGQy3sYLm/K7YqX9WXWQZpH
wzkAbYjp9wzjtMn75OTVGcpLfQcY7TPuY9k3pQzQvRdFWCXPfFv9+6w+qpiqn74y
iSUsS/PhvoxD5O5L5kn0H99pNzqxPWpiyZBh3trzoDTJk3SgprA=
=i7YC
-END PGP SIGNATURE-
---


No new revisions were added by this update.

Summary of changes:

[cloudstack-documentation] branch 4.16 updated: 4.16.1.0 release notes/docs updates (#264)

2022-03-04 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new 844f992  4.16.1.0 release notes/docs updates (#264)
844f992 is described below

commit 844f992db15dc1053f3f2828ae6f5f7512457303
Author: Suresh Kumar Anaparti 
AuthorDate: Fri Mar 4 20:00:20 2022 +0530

4.16.1.0 release notes/docs updates (#264)

* 4.16.1.0 release notes/docs updates
---
 source/_global.rst|  22 +-
 source/conf.py|   2 +-
 source/releasenotes/about.rst |  18 +
 source/releasenotes/changes.rst   | 534 +-
 source/upgrading/index.rst|   1 +
 source/upgrading/upgrade/upgrade-4.16.rst | 304 +
 6 files changed, 868 insertions(+), 13 deletions(-)

diff --git a/source/_global.rst b/source/_global.rst
index 82397e9..3a8ad3d 100644
--- a/source/_global.rst
+++ b/source/_global.rst
@@ -25,19 +25,19 @@
 
 .. Latest version systemvm template name
 
-.. |sysvm64-version| replace:: 4.16.0
-.. |sysvm64-name-xen|replace:: systemvm-xenserver-4.16.0
-.. |sysvm64-name-kvm|replace:: systemvm-kvm-4.16.0
-.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.16.0
-.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.16.0
-.. |sysvm64-name-ovm|replace:: systemvm-ovm-4.16.0
+.. |sysvm64-version| replace:: 4.16.1
+.. |sysvm64-name-xen|replace:: systemvm-xenserver-4.16.1
+.. |sysvm64-name-kvm|replace:: systemvm-kvm-4.16.1
+.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.16.1
+.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.16.1
+.. |sysvm64-name-ovm|replace:: systemvm-ovm-4.16.1
 
 .. Latest version systemvm template URL
-.. |sysvm64-url-xen|replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2
-.. |sysvm64-url-kvm|replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-vmware.ova
-.. |sysvm64-url-hyperv| replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-hyperv.vhd.zip
-.. |sysvm64-url-ovm|replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-ovm.raw.bz2
+.. |sysvm64-url-xen|replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.1-xen.vhd.bz2
+.. |sysvm64-url-kvm|replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.1-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.1-vmware.ova
+.. |sysvm64-url-hyperv| replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.1-hyperv.vhd.zip
+.. |sysvm64-url-ovm|replace:: 
http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.1-ovm.raw.bz2
 
 .. Version specific: 4.5 systemvm template URL
 .. |acs45-sysvm64-url-xen|replace:: 
https://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
diff --git a/source/conf.py b/source/conf.py
index 55fb01d..726911a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -26,7 +26,7 @@ author = 'Apache CloudStack Project'
 # The short X.Y version
 version = '4.16'
 # The full version, including alpha/beta/rc tags
-release = '4.16.0.0'
+release = '4.16.1.0'
 
 rst_epilog = """
 .. include:: /_global.rst 
diff --git a/source/releasenotes/about.rst b/source/releasenotes/about.rst
index 1889d6f..824ba5c 100644
--- a/source/releasenotes/about.rst
+++ b/source/releasenotes/about.rst
@@ -17,6 +17,24 @@
 What's New in |release|
 ===
 
+Apache CloudStack |release| is a 4.16 LTS minor release with over 150 fixes and
+improvements since the 4.16.0.0 release. Highlights include:
+
+• System VM Template improvements
+• CKS enhancements
+• Support for VMware 7.0u2, 7.0u3
+• Several Hypervisor (VMware, KVM, XenServer) fixes and improvements 
+• Several UI fixes and improvements
+• First Install and Onboarding Message improvements
+• Log4j v1.x migration to reload4j v1.2.18.0
+• Several security fixes addressing multiple CVEs and improvements
+
+The full list of fixes and improvements can be found in the project release 
notes at
+https://docs.cloudstack.apache.org/en/4.16.1.0/releasenotes/changes.html
+
+What's New in 4.16.0.0
+===
+
 Apache CloudStack 4.16.0.0 is a 4.16 LTS release with over 22 major new
 features, and over 244 enhancements and fixes since 4.15. Highlights include:
 
diff --git a/source/releasenotes/changes.rst b/source/releasenotes/changes.rst
index f2ada48..730b240 100644
--- a/source/releasenotes/changes.rst
+++ b/source/releasenotes/changes.rst
@@ -13,8 +13,540 @@
specific language governing permissions

[cloudstack] 01/01: Updating pom.xml version numbers for release 4.16.2.0-SNAPSHOT

2022-03-03 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit bc70535ee597fe773f9870f525300be6ab2fdc3f
Author: Suresh Kumar Anaparti 
AuthorDate: Thu Mar 3 17:50:03 2022 +0530

Updating pom.xml version numbers for release 4.16.2.0-SNAPSHOT

Signed-off-by: Suresh Kumar Anaparti 
---
 agent/pom.xml | 2 +-
 api/pom.xml   | 2 +-
 client/pom.xml| 2 +-
 core/pom.xml  | 2 +-
 debian/changelog  | 6 ++
 developer/pom.xml | 2 +-
 engine/api/pom.xml| 2 +-
 engine/components-api/pom.xml | 2 +-
 engine/network/pom.xml| 2 +-
 engine/orchestration/pom.xml  | 2 +-
 engine/pom.xml| 2 +-
 engine/schema/pom.xml | 2 +-
 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 +-
 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 | 2 +-
 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 +-
 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 +-
 plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +-
 plugins/affinity-group-processors/host-affinity/pom.xml   | 2 +-
 plugins/affinity-group-processors/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 +-
 plugins/deployment-planners/implicit-dedication/pom.xml   | 2 +-
 plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +-
 plugins/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

[cloudstack] branch 4.16 updated (a8cc261 -> bc70535)

2022-03-03 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from a8cc261  [vmware, ssvm] Scale down of ssvm (#6042)
 add cad9332  Updating pom.xml version numbers for release 4.16.1.0
 new bc70535  Updating pom.xml version numbers for release 4.16.2.0-SNAPSHOT

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 agent/pom.xml|  2 +-
 api/pom.xml  |  2 +-
 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 +-
 engine/network/pom.xml   |  2 +-
 engine/orchestration/pom.xml |  2 +-
 engine/pom.xml   |  2 +-
 engine/schema/pom.xml|  2 +-
 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 +-
 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|  2 +-
 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 +-
 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 +-
 .../affinity-group-processors/explicit-dedication/pom.xml|  2 +-
 plugins/affinity-group-processors/host-affinity/pom.xml  |  2 +-
 plugins/affinity-group-processors/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 +-
 plugins/deployment-planners/implicit-dedication/pom.xml  |  2 +-
 plugins/deployment-planners/user-concentrated-pod/pom.xml|  2 +-
 plugins/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

[cloudstack] annotated tag 4.16.1.0 updated (cad9332 -> 368a46b)

2022-03-01 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to annotated tag 4.16.1.0
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


*** WARNING: tag 4.16.1.0 was modified! ***

from cad9332  (commit)
  to 368a46b  (tag)
 tagging cad9332082a1f85eedc30cf547ae28224be170c2 (commit)
 replaces 4.15.2.0
  by Suresh Kumar Anaparti
  on Tue Mar 1 18:01:22 2022 +0530

- Log -
Tagging release 4.16.1.0 on branch 4.16.
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEE1uBYHs+KL74/9rPJ186uOp5x0KoFAmIeEhoACgkQ186uOp5x
0KrAIg/+M3D09bq89POWohjg7Up3rvNyLcjVNAyefmkWxD7o1cYuag0w39cLl1hA
kC79xAB0bYCOXm2RMwxQYi4B+bfYKgF0RWJeGU5KX4De+l6ixO4+yoxVXW2afmXJ
uFw9nrARlaBdTS3oehNFPuz/tLoEWX6vh+n2FlSHslPKxL454RZGbbr1haa/MGND
xVNmwE5l0O375A/YHfiHAZ9a4warrGy9w7uNnSYuR8m8qbSKwWkDiaD7DNVa6FUM
1Yd4R8dSB1OCZC9k3ZIPR+f6u66V+AttIlhOT5XxO4rTqeofaftBWvGrpGB9Hg5B
0Ss5JbdJzdchVHEhaiuA68yj+iimM8OjauGyJ8zV37MuGhrA48Ftqo3UPMWnQlBW
0nnEID4+yqVr79LCQD81nvQ0AzTyvmm7Vj7OiOHtjRzoMVshTSmHkXcD8FEl6aYa
xGNyp4y+IuktYmIYNKq0sdwPZKP+L2ZzYARcpLNaq/ZPJFBEhu1Blgf4oFUsvrBP
vYUpGJaqsfCXUhu/iEfqLdCKFp7j8UKyCE7sBoTy+OMChjie3bUjQszLFc26Bfp9
C8zLP9MviJez9M4lddEQgMD0rllJSuDDvve9ppXzSEGtlZwelEmKmVPADNoqIC4p
/9vZH3IORLz903oB5H5/Gqt0rhsaygqujYxSjt++DUodfSEksWM=
=TQ9Q
-END PGP SIGNATURE-
---


No new revisions were added by this update.

Summary of changes:

[cloudstack] 01/01: Updating pom.xml version numbers for release 4.16.1.0

2022-02-25 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16.1.0-RC20220225T1901
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit cad9332082a1f85eedc30cf547ae28224be170c2
Author: Suresh Kumar Anaparti 
AuthorDate: Fri Feb 25 19:01:16 2022 +0530

Updating pom.xml version numbers for release 4.16.1.0

Signed-off-by: Suresh Kumar Anaparti 
---
 agent/pom.xml | 2 +-
 api/pom.xml   | 2 +-
 client/pom.xml| 2 +-
 core/pom.xml  | 2 +-
 debian/changelog  | 6 ++
 developer/pom.xml | 2 +-
 engine/api/pom.xml| 2 +-
 engine/components-api/pom.xml | 2 +-
 engine/network/pom.xml| 2 +-
 engine/orchestration/pom.xml  | 2 +-
 engine/pom.xml| 2 +-
 engine/schema/pom.xml | 2 +-
 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 +-
 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 | 2 +-
 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 +-
 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 +-
 plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +-
 plugins/affinity-group-processors/host-affinity/pom.xml   | 2 +-
 plugins/affinity-group-processors/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 +-
 plugins/deployment-planners/implicit-dedication/pom.xml   | 2 +-
 plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +-
 plugins/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

[cloudstack] branch 4.16.1.0-RC20220225T1901 created (now cad9332)

2022-02-25 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16.1.0-RC20220225T1901
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


  at cad9332  Updating pom.xml version numbers for release 4.16.1.0

This branch includes the following new commits:

 new cad9332  Updating pom.xml version numbers for release 4.16.1.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

svn commit: r52747 - in /dev/cloudstack/4.16.1.0: apache-cloudstack-4.16.1.0-src.tar.bz2 apache-cloudstack-4.16.1.0-src.tar.bz2.asc apache-cloudstack-4.16.1.0-src.tar.bz2.sha512

2022-02-25 Thread sureshanaparti

Author: sureshanaparti
Date: Fri Feb 25 13:32:01 2022
New Revision: 52747

Log:
Committing release candidate artifacts for 4.16.1.0 to dist/dev/cloudstack in 
preparation for release vote

Added:
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2   (with 
props)
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2
==
Binary file - no diff available.

Propchange: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2
--
svn:mime-type = application/octet-stream

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc
==
--- dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc (added)
+++ dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc Fri Feb 
25 13:32:01 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEE1uBYHs+KL74/9rPJ186uOp5x0KoFAmIY2jUACgkQ186uOp5x
+0KoPeBAAimZsh1PJr5ruKsFmSD/V0hNN7HbnXQUSTbF4wW8uM62bhQg6HvBf459H
+aT8Ns0OepmRb8t9CqFPnfV4fjJJw1DCiMa/5abG73itQ77+QRUYZL5DqgWUt6PM7
+1l/Upu8E285s47CgYwfGQchEGGW4furE+zy0BMfdXYcRDg9B6yOAvyp40Ulhb4IL
+2AT6wNsim1VgQOJrjgFoiXQeIIpszpNM9+wi8rlxt+vHHBzql1zzaHGO4xa1upoU
+BNK4AbnYcxS+lhdPFMr+lWOND0XemrXGAYZHzWZvW03nzoOgDl3TM701DeDTL3ck
+jaMSGQYI+thP3rcEeen+iTzjCjnQux3JczWox5gpNwFHj1NbWspMzDtYX0fqmoA7
+P68FmoC656auW6/2eUdiZhgBldxITNu856J3JNOhXy54JUFwWPlxa0D+fFuPlsQr
+LHmilEl6tqcOW1M5qg+qeMXLkPHAtGPDUQFGMp75ysBPSCP1/xCVcwPdAcEwbPyv
+kq7VWQarBXdl1CFHrzWheL/KxKjcH5LXe8Z62A+iFMsbt5FzOybwnOJtt5M/z+A+
+xnPOKaantsmeiibD6KgDJDIMFmMXqHEBZdli8jHDjQMn+tSXzx5NsXupbV33JKo8
+Gi3LkHybTHlourIHD6NjSRQRnaTekbs+/FnNVmPRjCuM0UE78y4=
+=Y+3c
+-END PGP SIGNATURE-

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512
==
--- dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512 
(added)
+++ dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512 Fri 
Feb 25 13:32:01 2022
@@ -0,0 +1 @@
+956138e05bc874b6b2ee9554b5ce86c84c233a859e068559de7134c96386e9d6679cf57741eb1a95c47f58ebcaaa92f39ef62ef1eb35c214c118278a83a1087f
  apache-cloudstack-4.16.1.0-src.tar.bz2

[cloudstack] branch main updated (1484f5a -> cb2ddc4)

2022-02-25 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 1484f5a  Merge branch '4.16' into main
 add a8cc261  [vmware, ssvm] Scale down of ssvm (#6042)
 add cb2ddc4  Merge branch '4.16' into main

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/com/cloud/storage/StorageManager.java   | 3 +++
 server/src/main/java/com/cloud/storage/StorageManagerImpl.java| 3 ++-
 .../secondarystorage/PremiumSecondaryStorageManagerImpl.java  | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

[cloudstack] branch 4.16 updated: [vmware, ssvm] Scale down of ssvm (#6042)

2022-02-25 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new a8cc261  [vmware, ssvm] Scale down of ssvm (#6042)
a8cc261 is described below

commit a8cc2611434b17803bd9b50cc3f986f22d0552c7
Author: Pearl Dsilva 
AuthorDate: Fri Feb 25 15:45:10 2022 +0530

[vmware, ssvm] Scale down of ssvm (#6042)

* [vmware, ssvm] Scale down of ssvm

* address comments - change variable name
---
 .../src/main/java/com/cloud/storage/StorageManager.java   | 3 +++
 server/src/main/java/com/cloud/storage/StorageManagerImpl.java| 3 ++-
 .../secondarystorage/PremiumSecondaryStorageManagerImpl.java  | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java 
b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java
index a62876a..c00273e 100644
--- a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java
+++ b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java
@@ -143,6 +143,9 @@ public interface StorageManager extends StorageService {
 ConfigKey  SecStorageMaxMigrateSessions = new 
ConfigKey("Advanced", Integer.class, 
"secstorage.max.migrate.sessions", "2",
 "The max number of concurrent copy command execution sessions that 
an SSVM can handle", false, ConfigKey.Scope.Global);
 
+ConfigKey  SecStorageVMAutoScaleDown = new 
ConfigKey("Advanced", Boolean.class, "secstorage.vm.auto.scale.down", 
"false",
+"Setting this to 'true' will auto scale down SSVMs", true, 
ConfigKey.Scope.Global);
+
 ConfigKey MaxDataMigrationWaitTime = new 
ConfigKey("Advanced", Integer.class, "max.data.migration.wait.time", 
"15",
 "Maximum wait time for a data migration task before spawning a new 
SSVM", false, ConfigKey.Scope.Global);
 ConfigKey DiskProvisioningStrictness = new 
ConfigKey("Storage", Boolean.class, 
"disk.provisioning.type.strictness", "false",
diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java 
b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index a0b5406..400f953 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -3331,7 +3331,8 @@ public class StorageManagerImpl extends ManagerBase 
implements StorageManager, C
 SecStorageMaxMigrateSessions,
 MaxDataMigrationWaitTime,
 DiskProvisioningStrictness,
-PreferredStoragePool
+PreferredStoragePool,
+SecStorageVMAutoScaleDown
 };
 }
 
diff --git 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
index 74d1b50..23b4e30 100644
--- 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
@@ -184,7 +184,9 @@ public class PremiumSecondaryStorageManagerImpl extends 
SecondaryStorageManagerI
 return new Pair(AfterScanAction.expand, 
SecondaryStorageVm.Role.commandExecutor);
 
 }
-scaleDownSSVMOnLoad(alreadyRunning, activeCmds, copyCmdsInPipeline);
+if (StorageManager.SecStorageVMAutoScaleDown.value()) {
+scaleDownSSVMOnLoad(alreadyRunning, activeCmds, 
copyCmdsInPipeline);
+}
 return new Pair(AfterScanAction.nop, null);
 }

svn commit: r52721 - in /dev/cloudstack/4.16.1.0: apache-cloudstack-4.16.1.0-src.tar.bz2 apache-cloudstack-4.16.1.0-src.tar.bz2.asc apache-cloudstack-4.16.1.0-src.tar.bz2.sha512

2022-02-24 Thread sureshanaparti

Author: sureshanaparti
Date: Thu Feb 24 09:10:20 2022
New Revision: 52721

Log:
Committing release candidate artifacts for 4.16.1.0 to dist/dev/cloudstack in 
preparation for release vote

Added:
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2   (with 
props)
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2
==
Binary file - no diff available.

Propchange: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2
--
svn:mime-type = application/octet-stream

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc
==
--- dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc (added)
+++ dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc Thu Feb 
24 09:10:20 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEE1uBYHs+KL74/9rPJ186uOp5x0KoFAmIXS2IACgkQ186uOp5x
+0KqYEA//aUJQ3IzkfE0+uqhLoLY1HH9SQL/jExQDcRAwFkDVZbl1DLvnuo04kJzG
+zmzn9S4wNtgpOB8rR2+9G7g0AqPSg3+/bEgLhNY0+ARPhJnjMqS2R3j1EaY+DXFj
+P5HtsfbeCEGPYWps/XQ5QffOodlcO3a8NE9gTA13Dkzr6GeEu4KoQ6sFEGErE1Cb
+WimhqMMuuuggx8B9H6RHNZAmftYfN/0tsaRhgFGhxepzMzjwgzx5kYty0fTSp6yh
+7/0PLolQcnRn1JTv75b7OzXn9rRB5Wf9dJV5I6GLipUV2XiZTg/ZC8cJBPvQqPnh
+lpO/5RN8uk9OdcdvQ7zKFiPU7b1W0wq/W+vG0wA5SaljWLPQ8y428bs07qiSYoWt
+ec8LWBCeFMQEyLAzjvm2sz4DYyae35Rwkno8M4se63//PfP583s/Xr91FVvYNk9c
+l3JWgcvbI8PfAtJsHpKO1PnA3eGY+UEdSpzmQDByYv/zHRYsrcVqJiJYfTmTi+o/
+bNB1n9S4y9oliTeDrIK8hCg7s0ARcFRxV5ODO2QJg36nt3i/Ci25p2xIziEqU5Eu
+SM/0A1KBdCcHXoa3yO4ytyl7bzj6v5ui727uKrXNmiJLef6MXdJxo5obVUWQWUYe
+NQylooJYsOjc2U5GeLOPe4WYsc9dXG/k94BZ+GstRoXKKwCl20g=
+=tp/n
+-END PGP SIGNATURE-

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512
==
--- dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512 
(added)
+++ dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512 Thu 
Feb 24 09:10:20 2022
@@ -0,0 +1 @@
+9cc8a2fb9fe33df64f1215b8c846496745bd56cc7f2ea83640e4bfa344e73c5a26caa7ff24ca027c0d4708bff92e9530974723996e9f7cfb643548feb7cbc421
  apache-cloudstack-4.16.1.0-src.tar.bz2

[cloudstack] branch main updated (909c437 -> 1484f5a)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 909c437  Merge branch '4.16'
 add 027e603  [KVM] Disconnect the volumes with the proper storage adaptor. 
(#6029)
 add 1484f5a  Merge branch '4.16' into main

No new revisions were added by this update.

Summary of changes:
 .../java/com/cloud/vm/VirtualMachineManagerImpl.java |  2 +-
 .../kvm/resource/LibvirtComputingResource.java   |  2 +-
 .../kvm/storage/IscsiAdmStorageAdaptor.java  |  6 --
 .../kvm/storage/KVMStoragePoolManager.java   | 20 
 .../kvm/storage/LinstorStorageAdaptor.java   |  5 ++---
 .../kvm/storage/ScaleIOStorageAdaptor.java   |  4 ++--
 6 files changed, 26 insertions(+), 13 deletions(-)

[cloudstack] branch 4.16 updated: [KVM] Disconnect the volumes with the proper storage adaptor. (#6029)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 027e603  [KVM] Disconnect the volumes with the proper storage adaptor. 
(#6029)
027e603 is described below

commit 027e6030aff74fd4fdf7d031251d2289c7541e8b
Author: Suresh Kumar Anaparti 
AuthorDate: Wed Feb 23 22:40:14 2022 +0530

[KVM] Disconnect the volumes with the proper storage adaptor. (#6029)

* [KVM] Disconnect the volumes with the proper storage adaptor.

* Improved / Added logs
---
 .../java/com/cloud/vm/VirtualMachineManagerImpl.java |  2 +-
 .../kvm/resource/LibvirtComputingResource.java   |  2 +-
 .../kvm/storage/IscsiAdmStorageAdaptor.java  |  6 --
 .../kvm/storage/KVMStoragePoolManager.java   | 20 
 .../kvm/storage/LinstorStorageAdaptor.java   |  5 ++---
 .../kvm/storage/ScaleIOStorageAdaptor.java   |  4 ++--
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 2fa44b1..e090955 100755
--- 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1681,7 +1681,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 StoragePoolVO storagePool = 
_storagePoolDao.findById(volume.getPoolId());
 
 if (storagePool != null && storagePool.isManaged()) {
-Map info = new HashMap<>(3);
+Map info = new HashMap<>();
 
 info.put(DiskTO.STORAGE_HOST, storagePool.getHostAddress());
 info.put(DiskTO.STORAGE_PORT, 
String.valueOf(storagePool.getPort()));
diff --git 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 60d8e08..cdcbf24 100644
--- 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3024,7 +3024,7 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 public boolean cleanupDisk(final DiskDef disk) {
 final String path = disk.getDiskPath();
 
-if (path == null) {
+if (org.apache.commons.lang.StringUtils.isBlank(path)) {
 s_logger.debug("Unable to clean up disk with null path (perhaps 
empty cdrom drive):" + disk);
 return false;
 }
diff --git 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
index fb89683..389a2c7 100644
--- 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
+++ 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
@@ -331,12 +331,6 @@ public class IscsiAdmStorageAdaptor implements 
StorageAdaptor {
 
 @Override
 public boolean disconnectPhysicalDisk(Map 
volumeToDisconnect) {
-String poolType = volumeToDisconnect.get(DiskTO.PROTOCOL_TYPE);
-// Unsupported pool types
-if (poolType != null && 
poolType.equalsIgnoreCase(StoragePoolType.PowerFlex.toString())) {
-return false;
-}
-
 String host = volumeToDisconnect.get(DiskTO.STORAGE_HOST);
 String port = volumeToDisconnect.get(DiskTO.STORAGE_PORT);
 String path = volumeToDisconnect.get(DiskTO.IQN);
diff --git 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index 77579c4..d6c49d2 100644
--- 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++ 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
+import org.apache.commons.collections.MapUtils;
 import org.apache.log4j.Logger;
 import org.reflections.Reflections;
 
@@ -165,10 +166,27 @@ public class KVMStoragePoolManager {
 }
 
 public boolean disconne

[cloudstack] branch 4.16 updated (ca12ef3 -> 19b8da2)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from ca12ef3  ui: add VXLAN network identifiers (VNIs) in 
message.guest.traffic.in.advanced.zone (#6034)
 add 19b8da2  prevent - handler from  from toggling 
checkboxes (#6027)

No new revisions were added by this update.

Summary of changes:
 ui/src/views/image/RegisterOrUploadIso.vue  |   4 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue |   5 +-
 ui/src/views/network/LoadBalancing.vue  | 180 
 ui/src/views/offering/AddNetworkOffering.vue|   2 +-
 ui/src/views/offering/AddVpcOffering.vue|   2 +-
 5 files changed, 99 insertions(+), 94 deletions(-)

[cloudstack] branch main updated (86f6675 -> 3a1f692)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 86f6675  Merge branch '4.16'
 add 5de1995  api: update description of internal LB APIs (#6035)
 add ca12ef3  ui: add VXLAN network identifiers (VNIs) in 
message.guest.traffic.in.advanced.zone (#6034)
 add 3a1f692  Merge branch '4.16' into main

No new revisions were added by this update.

Summary of changes:
 .../api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java | 2 +-
 .../api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java | 2 +-
 .../api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java  | 2 +-
 .../api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java | 2 +-
 ui/public/locales/ar.json   | 2 +-
 ui/public/locales/ca.json   | 2 +-
 ui/public/locales/en.json   | 2 +-
 ui/public/locales/it_IT.json| 2 +-
 ui/public/locales/pl.json   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

[cloudstack] branch 4.16 updated: ui: add VXLAN network identifiers (VNIs) in message.guest.traffic.in.advanced.zone (#6034)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new ca12ef3  ui: add VXLAN network identifiers (VNIs) in 
message.guest.traffic.in.advanced.zone (#6034)
ca12ef3 is described below

commit ca12ef31acff8d27438f279889b04bd38091fb5a
Author: Wei Zhou 
AuthorDate: Wed Feb 23 14:02:52 2022 +0100

ui: add VXLAN network identifiers (VNIs) in 
message.guest.traffic.in.advanced.zone (#6034)
---
 ui/public/locales/ar.json| 2 +-
 ui/public/locales/ca.json| 2 +-
 ui/public/locales/en.json| 2 +-
 ui/public/locales/it_IT.json | 2 +-
 ui/public/locales/pl.json| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/public/locales/ar.json b/ui/public/locales/ar.json
index a0086c0..ad38a15 100644
--- a/ui/public/locales/ar.json
+++ b/ui/public/locales/ar.json
@@ -2148,7 +2148,7 @@
 "message.generate.keys": "\u0627\u0644\u0631\u062c\u0627\u0621 
\u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 
\u062a\u0631\u063a\u0628 \u0628\u0625\u0646\u0634\u0627\u0621 
\u0645\u0641\u0627\u062a\u064a\u062d \u062c\u062f\u064a\u062f\u0629 
\u0644\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645",
 "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB",
 "message.gslb.lb.remove.confirm": "Please confirm you want to remove load 
balancing from GSLB",
-"message.guest.traffic.in.advanced.zone": "Guest network traffic is 
communication between end-user virtual machines. Specify a range of VLAN IDs to 
carry guest traffic for each physical network.",
+"message.guest.traffic.in.advanced.zone": "Guest network traffic is 
communication between end-user virtual machines. Specify a range of VLAN IDs or 
VXLAN network identifiers (VNIs) to carry guest traffic for each physical 
network.",
 "message.guest.traffic.in.basic.zone": "Guest network traffic is communication 
between end-user virtual machines. Specify a range of IP addresses that 
CloudStack can assign to guest VMs. Make sure this range does not overlap the 
reserved system IP range.",
 "message.host.dedicated": "Host Dedicated",
 "message.host.dedication.released": "Host dedication released",
diff --git a/ui/public/locales/ca.json b/ui/public/locales/ca.json
index 13f1ce6..a82dea2 100644
--- a/ui/public/locales/ca.json
+++ b/ui/public/locales/ca.json
@@ -2150,7 +2150,7 @@
 "message.generate.keys": "Si us plau confirmeu que voleu generar noves claus 
per aquest usuari.",
 "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB",
 "message.gslb.lb.remove.confirm": "Please confirm you want to remove load 
balancing from GSLB",
-"message.guest.traffic.in.advanced.zone": "Guest network traffic is 
communication between end-user virtual machines. Specify a range of VLAN IDs to 
carry guest traffic for each physical network.",
+"message.guest.traffic.in.advanced.zone": "Guest network traffic is 
communication between end-user virtual machines. Specify a range of VLAN IDs or 
VXLAN network identifiers (VNIs) to carry guest traffic for each physical 
network.",
 "message.guest.traffic.in.basic.zone": "Guest network traffic is communication 
between end-user virtual machines. Specify a range of IP addresses that 
CloudStack can assign to guest VMs. Make sure this range does not overlap the 
reserved system IP range.",
 "message.host.dedicated": "Host Dedicated",
 "message.host.dedication.released": "Host dedication released",
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index e171e21..6be9e8e 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -3007,7 +3007,7 @@
 "message.generate.keys": "Please confirm that you would like to generate new 
keys for this user.",
 "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB",
 "message.gslb.lb.remove.confirm": "Please confirm you want to remove load 
balancing from GSLB",
-"message.guest.traffic.in.advanced.zone": "Guest network traffic is 
communication between end-user virtual machines. Specify a range of VLAN IDs to 
carry guest traffic for each physical network.",
+"message.guest.traffic.in.advanced.zone": "Guest network traffic is 
communication between end-user virtual machines. Specify a range of VLAN IDs or 
VXLAN network identifiers (VNIs) to carry guest traffic for each physical 
network.",
 "message.guest.traffic.in.basic.zone": "Guest net

[cloudstack] branch 4.16 updated: api: update description of internal LB APIs (#6035)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 5de1995  api: update description of internal LB APIs (#6035)
5de1995 is described below

commit 5de19953766f5c3ccc6f1122770cc5e7052d539d
Author: Wei Zhou 
AuthorDate: Wed Feb 23 14:00:16 2022 +0100

api: update description of internal LB APIs (#6035)
---
 .../api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java | 2 +-
 .../api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java | 2 +-
 .../api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java  | 2 +-
 .../api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
index 4e31c6a..592f49f 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
@@ -41,7 +41,7 @@ import com.cloud.network.Network;
 import com.cloud.network.rules.LoadBalancerContainer.Scheme;
 import com.cloud.utils.net.NetUtils;
 
-@APICommand(name = "createLoadBalancer", description = "Creates a load 
balancer", responseObject = ApplicationLoadBalancerResponse.class, since = 
"4.2.0",
+@APICommand(name = "createLoadBalancer", description = "Creates an internal 
load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = 
"4.2.0",
 requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
 public static final Logger s_logger = 
Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName());
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
index a723279..f63b001 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
@@ -33,7 +33,7 @@ import 
org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 
-@APICommand(name = "deleteLoadBalancer", description = "Deletes a load 
balancer", responseObject = SuccessResponse.class, since = "4.2.0",
+@APICommand(name = "deleteLoadBalancer", description = "Deletes an internal 
load balancer", responseObject = SuccessResponse.class, since = "4.2.0",
 requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
 public static final Logger s_logger = 
Logger.getLogger(DeleteApplicationLoadBalancerCmd.class.getName());
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
index 79322c2..a925b88 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
@@ -35,7 +35,7 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.rules.LoadBalancerContainer.Scheme;
 import com.cloud.utils.Pair;
 
-@APICommand(name = "listLoadBalancers", description = "Lists load balancers", 
responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
+@APICommand(name = "listLoadBalancers", description = "Lists internal load 
balancers", responseObject = ApplicationLoadBalancerResponse.class, since = 
"4.2.0",
 requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListApplicationLoadBalancersCmd extends 
BaseListTaggedResourcesCmd {
 public static final Logger s_logger = 
Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName());
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplication

[cloudstack] branch 4.16 updated: UI: Reword the setting panel warning (#6020)

2022-02-23 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 36d3f43  UI: Reword the setting panel warning (#6020)
36d3f43 is described below

commit 36d3f434d16be36b61d6570293db7e6db3748687
Author: Nicolas Vazquez 
AuthorDate: Wed Feb 23 05:45:48 2022 -0300

UI: Reword the setting panel warning (#6020)
---
 ui/public/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 4b5de34..e171e21 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2193,7 +2193,7 @@
 "label.templatetype": "Template Type",
 "label.tftp.dir": "TFTP Directory",
 "label.tftpdir": "Tftp root directory",
-"label.theme.alert": "The settings panel is only visible in the development 
environment, please save for the changes to take effect.",
+"label.theme.alert": "Please save for the changes to take effect.",
 "label.theme.color": "Theme Color",
 "label.theme.cyan": "Cyan",
 "label.theme.dark": "Dark Style",

[cloudstack] branch 4.16.1.0-RC20220218T1649 created (now 711f041)

2022-02-18 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16.1.0-RC20220218T1649
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


  at 711f041  Updating pom.xml version numbers for release 4.16.1.0

This branch includes the following new commits:

 new 711f041  Updating pom.xml version numbers for release 4.16.1.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[cloudstack] 01/01: Updating pom.xml version numbers for release 4.16.1.0

2022-02-18 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16.1.0-RC20220218T1649
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 711f0412967b34ea5284b403e4fcba759b1288b7
Author: Suresh Kumar Anaparti 
AuthorDate: Fri Feb 18 16:49:35 2022 +0530

Updating pom.xml version numbers for release 4.16.1.0

Signed-off-by: Suresh Kumar Anaparti 
---
 agent/pom.xml | 2 +-
 api/pom.xml   | 2 +-
 client/pom.xml| 2 +-
 core/pom.xml  | 2 +-
 debian/changelog  | 6 ++
 developer/pom.xml | 2 +-
 engine/api/pom.xml| 2 +-
 engine/components-api/pom.xml | 2 +-
 engine/network/pom.xml| 2 +-
 engine/orchestration/pom.xml  | 2 +-
 engine/pom.xml| 2 +-
 engine/schema/pom.xml | 2 +-
 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 +-
 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 | 2 +-
 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 +-
 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 +-
 plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +-
 plugins/affinity-group-processors/host-affinity/pom.xml   | 2 +-
 plugins/affinity-group-processors/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 +-
 plugins/deployment-planners/implicit-dedication/pom.xml   | 2 +-
 plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +-
 plugins/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

svn commit: r52620 - in /dev/cloudstack/4.16.1.0: ./ apache-cloudstack-4.16.1.0-src.tar.bz2 apache-cloudstack-4.16.1.0-src.tar.bz2.asc apache-cloudstack-4.16.1.0-src.tar.bz2.sha512

2022-02-18 Thread sureshanaparti

Author: sureshanaparti
Date: Fri Feb 18 11:32:09 2022
New Revision: 52620

Log:
Committing release candidate artifacts for 4.16.1.0 to dist/dev/cloudstack in 
preparation for release vote

Added:
dev/cloudstack/4.16.1.0/
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2   (with 
props)
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc
dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2
==
Binary file - no diff available.

Propchange: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2
--
svn:mime-type = application/octet-stream

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc
==
--- dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc (added)
+++ dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.asc Fri Feb 
18 11:32:09 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEE1uBYHs+KL74/9rPJ186uOp5x0KoFAmIPgNcACgkQ186uOp5x
+0KrYjQ/7BFr7U/0odj4DqlSuPpYcMnrAUEimZUDOLUQPrNeYm/JmJ9XsAp1r3gGg
+5Ap674yjamxg9MLAn57HVlclGyVx82CSFimetuCgBWhv2a/fQ8f4AsLgBFONmTnG
+frFHhIz1jHaixzpV32CGDad97b5dtJsK9ugAF1IURp7YqyMLA+seddF6lPWPyRo5
+GAJfwslZZnl7gICtSP5Rk7G5hhBJV4dgNkqbwRTKyNfEsoG055RG1NTB1id9jjBA
+xAQvipVQM/2GuR53D8Jr1wtDZ0kg1VRdzdiGIeKjCAOxR92eV/04+uXvHEjRCrNT
+/MjHxuzy3zWiJ352HiEKKocVrOJihM1I2RIKk987EJBzhRROb5WcNyPcPDhNp7Ps
+DWBOztHe6bGzYhQ38rnv5EEky7tOalgSCO4XUCxiA9RQPYfgJPMRBt5VHBZM9n8d
+NeMQr2vGSkXb/wBofCusgecOjbfvI2JX3FxOoevs/ZG6Mt+1bq47vEDa+KUXS6+i
+XKO14gEoouTgx9S/IBhZb9URY647LEP3FIjCtZ3XtnoGERPbcZ479m0b2dKPI4nx
+8D+6xNQD699zQzV+UhKSZ236mmgrHgWOc/7uMK86vznBDlm5zCNR9ZzU4L7be1qB
+gDYjDrIogT5SEeaeWHQ77UUEK5WB0urR3HKLGJKy+HcN9QSa3Q0=
+=q7cV
+-END PGP SIGNATURE-

Added: dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512
==
--- dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512 
(added)
+++ dev/cloudstack/4.16.1.0/apache-cloudstack-4.16.1.0-src.tar.bz2.sha512 Fri 
Feb 18 11:32:09 2022
@@ -0,0 +1 @@
+0f2d7058a2c79079403a532733f64f62d339ca281af818ddab745eb4229ce1996530d868e14c9e3a639b5d421e27017dd443f5f98d48bd43d5a4705eebd745ea
  apache-cloudstack-4.16.1.0-src.tar.bz2

[cloudstack] 01/01: Merge branch '4.16' into main

2022-02-17 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit 545f85936a08b3bf3f41cc0bc8a96b97b585e39c
Merge: 478e244 c543f5f
Author: Suresh Kumar Anaparti 
AuthorDate: Thu Feb 17 14:28:26 2022 +0530

Merge branch '4.16' into main

 .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

[cloudstack] branch main updated (478e244 -> 545f859)

2022-02-17 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 478e244  Block remove of VM which has backup offering (#5457)
 add c543f5f  server: reapply checkVmProfileAndHost to check guest os 
preference (#6000)
 new 545f859  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

[cloudstack] branch 4.16 updated: server: reapply checkVmProfileAndHost to check guest os preference (#6000)

2022-02-17 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new c543f5f  server: reapply checkVmProfileAndHost to check guest os 
preference (#6000)
c543f5f is described below

commit c543f5f54645c12f7e79bd35d887888e6a41ff42
Author: Wei Zhou 
AuthorDate: Thu Feb 17 09:55:13 2022 +0100

server: reapply checkVmProfileAndHost to check guest os preference (#6000)
---
 .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java 
b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index fd33bed..3dc45b6 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -424,14 +424,7 @@ StateListener, Configurable {
 }
 } else {
 if (host.getStatus() == Status.Up) {
-boolean hostTagsMatch = true;
-if(offering.getHostTag() != null){
-_hostDao.loadHostTags(host);
-if (!(host.getHostTags() != null && 
host.getHostTags().contains(offering.getHostTag( {
-hostTagsMatch = false;
-}
-}
-if (hostTagsMatch) {
+if (checkVmProfileAndHost(vmProfile, host)) {
 long cluster_id = host.getClusterId();
 ClusterDetailsVO cluster_detail_cpu = 
_clusterDetailsDao.findDetail(cluster_id,
 "cpuOvercommitRatio");

[cloudstack] branch main updated (b1bb22d -> b50542a)

2022-02-15 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from b1bb22d  ui: Pass rootdisksize only if template is not deployasis 
(#5995)
 add e0a5df5  CKS Enhancements and SystemVM template upgrade improvements 
(#5863)
 add b50542a  Merge branch '4.16' into main

No new revisions were added by this update.

Summary of changes:
 .gitignore |   1 +
 .../src/main/java/com/cloud/agent/AgentShell.java  |  50 -
 .../main/java/com/cloud/vm/VmDetailConstants.java  |   1 +
 engine/schema/pom.xml  |   8 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   9 +-
 .../upgrade/SystemVmTemplateRegistration.java  |  81 ++
 .../resources/META-INF/db/schema-41600to41610.sql  |  23 
 engine/schema/templateConfig.sh|  20 ++--
 .../cluster/KubernetesClusterManagerImpl.java  | 120 +---
 .../KubernetesClusterActionWorker.java | 101 -
 ...ernetesClusterResourceModifierActionWorker.java | 123 +++--
 .../KubernetesClusterScaleWorker.java  |   8 +-
 .../KubernetesClusterStartWorker.java  |  57 ++
 .../KubernetesClusterUpgradeWorker.java|  10 +-
 .../cluster/CreateKubernetesClusterCmd.java|  22 +---
 .../main/resources/conf/k8s-control-node-add.yml   |  43 +--
 .../src/main/resources/conf/k8s-control-node.yml   |  46 ++--
 .../src/main/resources/conf/k8s-node.yml   |  43 +--
 .../main/resources/script/upgrade-kubernetes.sh|   2 +-
 pom.xml|   1 +
 scripts/util/create-kubernetes-binaries-iso.sh |  22 ++--
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh |   4 +-
 test/integration/smoke/test_kubernetes_clusters.py |  20 ++--
 .../scripts/configure_systemvm_services.sh |  15 ++-
 .../scripts/install_systemvm_packages.sh   |   2 +-
 tools/appliance/systemvmtemplate/template.json |   4 +-
 ui/public/locales/en.json  |   2 +
 ui/src/config/section/image.js |   1 -
 ui/src/views/compute/CreateKubernetesCluster.vue   |   8 --
 ui/src/views/compute/KubernetesServiceTab.vue  |   3 +
 .../main/java/com/cloud/utils/EncryptionUtil.java  |  14 +--
 .../main/java/com/cloud/utils/script/Script.java   |  19 ++--
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java |  13 +--
 .../cloudstack/utils/security/DigestHelper.java|  17 ++-
 34 files changed, 521 insertions(+), 392 deletions(-)

[cloudstack] branch 4.16 updated: CKS Enhancements and SystemVM template upgrade improvements (#5863)

2022-02-15 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new e0a5df5  CKS Enhancements and SystemVM template upgrade improvements 
(#5863)
e0a5df5 is described below

commit e0a5df50ceb3293c0875b7c2e8961d4e666a0e92
Author: Pearl Dsilva 
AuthorDate: Tue Feb 15 18:27:14 2022 +0530

CKS Enhancements and SystemVM template upgrade improvements (#5863)

* This PR/commit comprises of the following:
- Support to fallback on the older systemVM template in case of no change 
in template across ACS versions
- Update core user to cloud in CKS
- Display details of accessing CKS nodes in the UI - K8s Access tab
- Update systemvm template from debian 11 to debian 11.2
- Update letsencrypt cert
- Remove docker dependency as from ACS 4.16 onward k8s has deprecated 
support for docker - use containerd as container runtime

* support for private registry - containerd

* Enable updating template type (only) for system owned templates via UI

* edit indents

* Address comments and move cmd from patch file to cloud-init runcmd

* temporary change

* update k8s test to use k8s version 1.21.5 (instead of 1.21.3 - due to 
https://github.com/kubernetes/kubernetes/pull/104530)

* support for private registry - containerd

* Enable updating template type (only) for system owned templates via UI

* smooth upgrade of cks clusters

* update pom file with temp download.cloudstack.org testing links

* fix pom

* add cgroup config for containerd

* add systemd config for kubelet

* add additional info during image registry config

* update to official links
---
 .gitignore |   1 +
 .../src/main/java/com/cloud/agent/AgentShell.java  |  50 -
 .../main/java/com/cloud/vm/VmDetailConstants.java  |   1 +
 engine/schema/pom.xml  |   8 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   9 +-
 .../upgrade/SystemVmTemplateRegistration.java  |  81 ++
 .../resources/META-INF/db/schema-41600to41610.sql  |  23 
 engine/schema/templateConfig.sh|  20 ++--
 .../cluster/KubernetesClusterManagerImpl.java  | 123 +
 .../KubernetesClusterActionWorker.java |  99 -
 ...ernetesClusterResourceModifierActionWorker.java | 122 ++--
 .../KubernetesClusterScaleWorker.java  |   8 +-
 .../KubernetesClusterStartWorker.java  |  57 ++
 .../KubernetesClusterUpgradeWorker.java|  10 +-
 .../cluster/CreateKubernetesClusterCmd.java|  22 +---
 .../main/resources/conf/k8s-control-node-add.yml   |  43 +--
 .../src/main/resources/conf/k8s-control-node.yml   |  46 ++--
 .../src/main/resources/conf/k8s-node.yml   |  43 +--
 .../main/resources/script/upgrade-kubernetes.sh|   2 +-
 pom.xml|   1 +
 scripts/util/create-kubernetes-binaries-iso.sh |  22 ++--
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh |   4 +-
 test/integration/smoke/test_kubernetes_clusters.py |  20 ++--
 .../scripts/configure_systemvm_services.sh |  15 ++-
 .../scripts/install_systemvm_packages.sh   |   2 +-
 tools/appliance/systemvmtemplate/template.json |   4 +-
 ui/public/locales/en.json  |   2 +
 ui/src/config/section/image.js |   1 -
 ui/src/views/compute/CreateKubernetesCluster.vue   |   8 --
 ui/src/views/compute/KubernetesServiceTab.vue  |   3 +
 .../main/java/com/cloud/utils/EncryptionUtil.java  |  14 +--
 .../main/java/com/cloud/utils/script/Script.java   |  19 ++--
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java |  15 ++-
 .../cloudstack/utils/security/DigestHelper.java|  17 ++-
 34 files changed, 521 insertions(+), 394 deletions(-)

diff --git a/.gitignore b/.gitignore
index b67dc8e..011a4b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ tools/cli/cloudmonkey/precache.py
 tools/marvin/marvin/cloudstackAPI/
 tools/marvin/build/
 tools/cli/build/
+tools/appliance/systemvmtemplate/packer_cache/
 *.jar
 *.war
 *.mar
diff --git a/agent/src/main/java/com/cloud/agent/AgentShell.java 
b/agent/src/main/java/com/cloud/agent/AgentShell.java
index 01654ac..0ab5b78 100644
--- a/agent/src/main/java/com/cloud/agent/AgentShell.java
+++ b/agent/src/main/java/com/cloud/agent/AgentShell.java
@@ -16,6 +16,26 @@
 // under the License.
 package com.cloud.agent;
 
+import com.cloud.agent.Agent.ExitStatus;
+import com.cloud.agent.dao.StorageComponent;
+import com.cloud.agent.dao.impl.PropertiesStorage;
+import com.cloud.resource.ServerResource;
+import com.cloud.utils.LogUtils

[cloudstack-documentation] 01/01: Merge branch '4.16' into main

2022-02-15 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit c33d8676292a4fbd7d9903802178ba269f667480
Merge: 1c1cad6 ba58176
Author: Suresh Kumar Anaparti 
AuthorDate: Tue Feb 15 13:37:21 2022 +0530

Merge branch '4.16' into main

 .../networking/manage_guest_networks.rst   | 44 +++
 source/adminguide/networking_and_traffic.rst   |  2 +
 source/adminguide/service_offerings.rst| 50 ++
 source/installguide/configuration.rst  |  1 +
 4 files changed, 97 insertions(+)

[cloudstack-documentation] branch main updated (1c1cad6 -> c33d867)

2022-02-15 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git.


from 1c1cad6  Merge branch '4.16' into main
 add ba58176  Virtual Router Service Offering (#157)
 new c33d867  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../networking/manage_guest_networks.rst   | 44 +++
 source/adminguide/networking_and_traffic.rst   |  2 +
 source/adminguide/service_offerings.rst| 50 ++
 source/installguide/configuration.rst  |  1 +
 4 files changed, 97 insertions(+)
 create mode 100644 source/adminguide/networking/manage_guest_networks.rst

[cloudstack-documentation] branch 4.16 updated: Virtual Router Service Offering (#157)

2022-02-14 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new ba58176  Virtual Router Service Offering (#157)
ba58176 is described below

commit ba58176f1f1698cacbf12219a28d1308741b703c
Author: Wei Zhou 
AuthorDate: Mon Feb 14 11:25:33 2022 +0100

Virtual Router Service Offering (#157)

* Add header for router service offering

* Add content

* update

Co-authored-by: Wei Zhou 
Co-authored-by: dahn 
Co-authored-by: sureshanaparti 
<12028987+sureshanapa...@users.noreply.github.com>
---
 .../networking/manage_guest_networks.rst   | 44 +++
 source/adminguide/networking_and_traffic.rst   |  2 +
 source/adminguide/service_offerings.rst| 50 ++
 source/installguide/configuration.rst  |  1 +
 4 files changed, 97 insertions(+)

diff --git a/source/adminguide/networking/manage_guest_networks.rst 
b/source/adminguide/networking/manage_guest_networks.rst
new file mode 100644
index 000..b754622
--- /dev/null
+++ b/source/adminguide/networking/manage_guest_networks.rst
@@ -0,0 +1,44 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Editing, Restarting, and Removing a Guest Network
+--
+
+.. note:: Ensure that all the VMs are removed before you remove a guest 
network.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select Guest networks.
+
+   All the guest networks that you have created for the account are listed in 
the
+   page.
+
+#. Select the guest network you want to work with.
+
+#. In the Details tab, click the "Delete Network" button
+
+   You can also remove the guest network by using the remove button in the 
Quick
+   View.
+
+   You can edit the name, description, network offering, CIDR, network domain 
of a 
+   guest network. To do that, click the "Edit" button.
+
+   To restart a guest network, click the "Restart network" button. Please note 
+   all services provided by this network will be interrupted. When you enable 
"Clean up",
+   the virtual routers of guest network will be destroyed and new virtual 
routers will
+   be provisioned.
diff --git a/source/adminguide/networking_and_traffic.rst 
b/source/adminguide/networking_and_traffic.rst
index c0fbe69..d6aa253 100644
--- a/source/adminguide/networking_and_traffic.rst
+++ b/source/adminguide/networking_and_traffic.rst
@@ -29,6 +29,8 @@ providing networking features for guest traffic.
 
 .. include:: networking/advanced_zone_config.rst
 
+.. include:: networking/manage_guest_networks.rst
+
 .. include:: networking/multiple_guest_networks.rst
 
 .. include:: networking/ip_reservation_in_guest_networks.rst
diff --git a/source/adminguide/service_offerings.rst 
b/source/adminguide/service_offerings.rst
index 444200c..1a85afe 100644
--- a/source/adminguide/service_offerings.rst
+++ b/source/adminguide/service_offerings.rst
@@ -721,3 +721,53 @@ default system offering used for System VMs.
 
 #. Destroy the existing CPVM or SSVM offerings and wait for them to be
recreated. The new CPVM or SSVM are configured with the new offering.
+
+
+Changing the Default System Offering for Virtual Routers
+---
+
+As a CloudStack administrator, you can change the default system
+offering used for Virtual Routers.
+
+#. Create a new system service offering
+
+   For more information, see `“Creating a New System Offering”
+   `_.
+
+#. (Optional) Create a new network offering with SystemOffering
+
+   For more information, see `“Creating a New Network Offering”
+   `_.
+
+#. (Optional) Change account setting
+
+   You can change the default system offering for Virtual Routers of a 
particular
+   account by changing the account's setting "router.service.offering" to the 
uuid
+   of the system offering.
+
+   For more info

[cloudstack] branch main updated (7f0a322 -> 48b1e73)

2022-02-11 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 7f0a322  [Vmware] Prevent NPE on template registration if guest OS is 
removed (#5980)
 add 8db598b  set pod after migration (#5972)
 add 48b1e73  Merge branch '4.16' into main

No new revisions were added by this update.

Summary of changes:
 .../main/java/com/cloud/vm/VirtualMachineManagerImpl.java| 12 
 1 file changed, 12 insertions(+)

[cloudstack] branch 4.16 updated: set pod after migration (#5972)

2022-02-11 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 8db598b  set pod after migration (#5972)
8db598b is described below

commit 8db598bc0fa8d33e11afcae2b89d1cab89eb2f94
Author: dahn 
AuthorDate: Fri Feb 11 14:17:45 2022 +0100

set pod after migration (#5972)

Co-authored-by: Daan Hoogland 
---
 .../main/java/com/cloud/vm/VirtualMachineManagerImpl.java| 12 
 1 file changed, 12 insertions(+)

diff --git 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 340a3e2..2fa44b1 100755
--- 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2849,6 +2849,8 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 _networkMgr.commitNicForMigration(vmSrc, profile);
 volumeMgr.release(vm.getId(), srcHostId);
 _networkMgr.setHypervisorHostname(profile, dest, true);
+
+updateVmPod(vm, dstHostId);
 }
 
 work.setStep(Step.Done);
@@ -2856,6 +2858,14 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 }
 
+private void updateVmPod(VMInstanceVO vm, long dstHostId) {
+// update the VMs pod
+HostVO host = _hostDao.findById(dstHostId);
+VMInstanceVO newVm = _vmDao.findById(vm.getId());
+newVm.setPodIdToDeployIn(host.getPodId());
+_vmDao.persist(newVm);
+}
+
 /**
  * We create the mapping of volumes and storage pool to migrate the VMs 
according to the information sent by the user.
  * If the user did not enter a complete mapping, the volumes that were 
left behind will be auto mapped using {@link 
#createStoragePoolMappingsForVolumes(VirtualMachineProfile, 
DataCenterDeployment, Map, List)}
@@ -4583,6 +4593,8 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 } else {
 _networkMgr.setHypervisorHostname(profile, dest, true);
+
+updateVmPod(vm, dstHostId);
 }
 
 work.setStep(Step.Done);

[cloudstack] 01/01: Merge branch '4.16' into main

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit 212a4dedfcf0fd53d6a16ef44ef06502a3481d0c
Merge: e9d8d79 5297b52
Author: Suresh Kumar Anaparti 
AuthorDate: Thu Feb 10 20:56:52 2022 +0530

Merge branch '4.16' into main

 api/src/main/java/com/cloud/storage/GuestOS.java   |   2 +-
 .../cloud/storage/GuestOSHypervisorMapping.java|  57 +
 .../src/main/java/com/cloud/storage/GuestOSVO.java |   2 +-
 .../java/com/cloud/storage/dao/GuestOSDao.java |   1 +
 .../java/com/cloud/storage/dao/GuestOSDaoImpl.java |  22 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java|   2 +
 .../storage/dao/GuestOSHypervisorDaoImpl.java  |  19 +-
 .../main/java/com/cloud/upgrade/GuestOsMapper.java | 191 
 .../com/cloud/upgrade/dao/Upgrade41400to41500.java | 238 
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java | 139 
 .../com/cloud/upgrade/dao/Upgrade41510to41520.java |  13 ++
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |   9 +
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java |   9 +
 .../resources/META-INF/db/schema-41400to41500.sql  | 243 -
 .../resources/META-INF/db/schema-41500to41510.sql  |  96 
 .../hypervisor/vmware/resource/VmwareResource.java |   8 +
 .../main/java/com/cloud/api/ApiResponseHelper.java |   2 +-
 .../com/cloud/server/ManagementServerImpl.java |   4 +-
 test/integration/plugins/test_quota.py |  25 +--
 .../hypervisor/vmware/mo/VirtualMachineMO.java |  35 +++
 20 files changed, 753 insertions(+), 364 deletions(-)

[cloudstack] branch main updated (e9d8d79 -> 212a4de)

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from e9d8d79  Merge branch '4.16'
 add 122b018  Quota test fixes (#5959)
 add a3bb84b  [VMware] Update SCSI controllers for VMs (#5910)
 add 5297b52  Improve the guest OS hypervisor mappings addition on upgrade. 
(#5911)
 new 212a4de  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 api/src/main/java/com/cloud/storage/GuestOS.java   |   2 +-
 .../cloud/storage/GuestOSHypervisorMapping.java}   |  48 ++--
 .../src/main/java/com/cloud/storage/GuestOSVO.java |   2 +-
 .../java/com/cloud/storage/dao/GuestOSDao.java |   1 +
 .../java/com/cloud/storage/dao/GuestOSDaoImpl.java |  22 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java|   2 +
 .../storage/dao/GuestOSHypervisorDaoImpl.java  |  19 +-
 .../main/java/com/cloud/upgrade/GuestOsMapper.java | 191 
 .../com/cloud/upgrade/dao/Upgrade41400to41500.java | 238 
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java | 139 
 .../com/cloud/upgrade/dao/Upgrade41510to41520.java |  13 ++
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |   9 +
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java |   9 +
 .../resources/META-INF/db/schema-41400to41500.sql  | 243 -
 .../resources/META-INF/db/schema-41500to41510.sql  |  96 
 .../hypervisor/vmware/resource/VmwareResource.java |   8 +
 .../main/java/com/cloud/api/ApiResponseHelper.java |   2 +-
 .../com/cloud/server/ManagementServerImpl.java |   4 +-
 test/integration/plugins/test_quota.py |  25 +--
 .../hypervisor/vmware/mo/VirtualMachineMO.java |  35 +++
 20 files changed, 721 insertions(+), 387 deletions(-)
 copy api/src/main/java/{org/apache/cloudstack/acl/Rule.java => 
com/cloud/storage/GuestOSHypervisorMapping.java} (50%)
 create mode 100644 
engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java

[cloudstack] branch 4.16 updated (bc93163 -> 122b018)

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from bc93163  ui: Allow domain admin to configure subdomain limits (#5978)
 add 122b018  Quota test fixes (#5959)

No new revisions were added by this update.

Summary of changes:
 test/integration/plugins/test_quota.py | 25 +++--
 1 file changed, 7 insertions(+), 18 deletions(-)

[cloudstack-documentation] 01/01: Merge branch '4.16' into main

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit 1c1cad630f9605b1ed930f614d22b8fa41449eac
Merge: 04a58e3 65ae184
Author: Suresh Kumar Anaparti 
AuthorDate: Thu Feb 10 18:36:39 2022 +0530

Merge branch '4.16' into main

 .../legacy/template-permissions-update-1.png   | Bin 20188 -> 20073 bytes
 .../vm-settings-values-dropdown-KVM-list.png   | Bin 18276 -> 7805 bytes
 source/adminguide/accounts.rst |  16 
 source/adminguide/ui.rst   |  28 +++--
 source/installguide/hypervisor/kvm.rst |   9 +++
 source/plugins/cloudstack-kubernetes-service.rst   |  16 
 source/releasenotes/compat.rst |   3 +++
 7 files changed, 59 insertions(+), 13 deletions(-)

[cloudstack-documentation] branch main updated (04a58e3 -> 1c1cad6)

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git.


from 04a58e3  Fix mysqldump missing 'Grave Accent' (#255)
 add 2dc92ba  Fixed the collided paths for some files
 add 352bcf8  Add CKS compatibility matrix details (#259)
 add da3c4ba  Updated doc for guest network bridge configuration, for live 
migration of guests on KVM hosts. (#263)
 add 4b0d6f6  note on dynamic roles caveat (#260)
 add bb073a2  Add a document to config footer text (#251)
 add 65ae184  vmware: Add supported minor versions (#261)
 new 1c1cad6  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../legacy/template-permissions-update-1.png   | Bin 20188 -> 20073 bytes
 .../vm-settings-values-dropdown-KVM-list.png   | Bin 18276 -> 7805 bytes
 source/adminguide/accounts.rst |  16 
 source/adminguide/ui.rst   |  28 +++--
 source/installguide/hypervisor/kvm.rst |   9 +++
 source/plugins/cloudstack-kubernetes-service.rst   |  16 
 source/releasenotes/compat.rst |   3 +++
 7 files changed, 59 insertions(+), 13 deletions(-)

[cloudstack-documentation] branch 4.16 updated: vmware: Add supported minor versions (#261)

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new 65ae184  vmware: Add supported minor versions (#261)
65ae184 is described below

commit 65ae184647d320db3ed85d93b280e6d26e4cde5b
Author: Wei Zhou 
AuthorDate: Thu Feb 10 10:19:56 2022 +0100

vmware: Add supported minor versions (#261)

* vmware: Add supported minor versions

* Update as per review comment
---
 source/releasenotes/compat.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/releasenotes/compat.rst b/source/releasenotes/compat.rst
index 7741da4..d39cbce 100644
--- a/source/releasenotes/compat.rst
+++ b/source/releasenotes/compat.rst
@@ -56,6 +56,9 @@ and VMware with vSphere.
 
 -  VMware versions 6.5, 6.7 and 7.0
 
+   .. note:: The following VMware minor versions are supported and tested: 
6.5, 6.7, 6.7.1, 6.7.2, 6.7.3, 7.0, 7.0.1.0, 7.0.2.0, 7.0.3.0.
+For any minor versions without hypervisor mappings, all virtual machines 
have guest OS identifier "otherGuest64" (x86-64 architecture) or "otherGuest" 
(other architectures).
+
.. note:: There is a known issue in 6.7 U1 
(https://kb.vmware.com/s/article/67315) which blocks some CloudStack cloning 
operations. The use of linked clones is known to be effected.
 
.. note:: There is a known issue in 6.7 U3 - 6.7 U3f where a mailformed OVA 
could crash vCenter services (for more information see `here 
<https://mail-archives.apache.org/mod_mbox/cloudstack-users/202005.mbox/%3CCAMvtBPNQqbe0XEsHyjFMror7HRvj-c%3DfEe7y12NfCDQSFTYgqQ%40mail.gmail.com%3E>`_).
 To avoid the issue, make sure to use 6.7 U3g or later.

[cloudstack] branch main updated: Removed duplicate import for StringUtils (#5975)

2022-02-10 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 5db62c1  Removed duplicate import for StringUtils (#5975)
5db62c1 is described below

commit 5db62c15a450cfb4ae64ce5156080a5a3d49d2db
Author: sureshanaparti <12028987+sureshanapa...@users.noreply.github.com>
AuthorDate: Thu Feb 10 13:44:15 2022 +0530

Removed duplicate import for StringUtils (#5975)
---
 framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java 
b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
index 85e1d03..208e846 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
@@ -71,7 +71,6 @@ import com.cloud.utils.db.SearchCriteria.SelectType;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.Ip;
 import com.cloud.utils.net.NetUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.CallbackFilter;

[cloudstack-documentation] branch 4.16 updated: Add a document to config footer text (#251)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new bb073a2  Add a document to config footer text (#251)
bb073a2 is described below

commit bb073a225641c391640232aa9bd1b7bf1d98a3da
Author: Hoang Nguyen 
AuthorDate: Thu Feb 10 14:21:28 2022 +0700

Add a document to config footer text (#251)

* add a document to config footer text

* add blank line

* rename the footer text property

* move to footer attribute edge

* change position

* fixes
---
 source/adminguide/ui.rst | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/adminguide/ui.rst b/source/adminguide/ui.rst
index b9fa334..a69f1db 100644
--- a/source/adminguide/ui.rst
+++ b/source/adminguide/ui.rst
@@ -185,19 +185,20 @@ Users can customize the CloudStack's user interface by 
means of a configuration
 
 To change the logo, login banner, error page icon, etc. the following details 
can be edited in config.json:
 
-== ==
-Property   Description
-== ==
-apiBaseChanges the suffix for the API endpoint
-docBaseChanges the base URL for the documentation
-appTitle   Changes the title of the portal
-footer Changes the footer text
-logo   Changes the logo top-left side image
-banner Changes the login banner image
-error.404  Changes the image of error Page not found
-error.403  Changes the image of error Forbidden
-error.500  Changes the image of error Internal Server Error.
-== ==
+= 

+Property  Description
+= 

+apiBase   Changes the suffix for the API endpoint
+docBase   Changes the base URL for the documentation
+appTitle  Changes the title of the portal
+footerChanges the footer text
+loginFooter   Configure to display text (HTML) in the footer 
at the login screen.
+logo  Changes the logo top-left side image
+bannerChanges the login banner image
+error.404 Changes the image of error Page not found
+error.403 Changes the image of error Forbidden
+error.500 Changes the image of error Internal Server Error.
+= 

 
 .. parsed-literal::
 
@@ -205,6 +206,7 @@ error.500  Changes the image of error Internal Server Error.
 "docBase": "http://docs.cloudstack.apache.org/en/latest;,
 "appTitle": "CloudStack",
 "footer": "Licensed under the Apache License, Version 2.0.",
+"loginFooter": "By logging, you are accepting the usage 
policy",
 "logo": "assets/logo.svg",
 "banner": "assets/banner.svg",
 "error": {

[cloudstack-documentation] branch 4.16 updated: note on dynamic roles caveat (#260)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new 4b0d6f6  note on dynamic roles caveat (#260)
4b0d6f6 is described below

commit 4b0d6f6f057b0bbcedd4861b429daeb383985177
Author: dahn 
AuthorDate: Thu Feb 10 07:26:00 2022 +0100

note on dynamic roles caveat (#260)

* note on dynamic roles caveat

* Apply suggestions from code review

* saveguard implementation note added

Co-authored-by: sureshanaparti 
<12028987+sureshanapa...@users.noreply.github.com>

Co-authored-by: Daan Hoogland 
---
 source/adminguide/accounts.rst | 16 
 1 file changed, 16 insertions(+)

diff --git a/source/adminguide/accounts.rst b/source/adminguide/accounts.rst
index a7e699a..093332d 100644
--- a/source/adminguide/accounts.rst
+++ b/source/adminguide/accounts.rst
@@ -135,6 +135,22 @@ allows CloudStack root admins to create new roles with 
customized permissions.
 The allow/deny rules can be configured dynamically during runtime without
 restarting the management server(s).
 
+.. Note:: in versions before 4.16.1, any user given the custom roles
+  that include permission to create and/or update accounts
+  will have the ability to assign new custom roles to
+  themsevles or other users, irrespective of the privileges
+  given in those roles. This could allow such a user to
+  escalate their own privileges to include any API they might
+  not have had before. Therefore, the dynamic roles should be
+  carefully designed and the `createAccount` and
+  `updateAccount` privileges should only be given to users who
+  you are content to have this level of privilege.
+
+  Since 4.16.1 a user will be prevented to create an account
+  with a role that has any permissions that they do not have
+  themselves. This check will also be performed, since that
+  version, on updating an account-role.
+
 For backward compatiblity, all roles resolve to one of the four role types:
 admin, resource admin, domain admin and user. A new role can be created using
 the roles tab in the UI and specifying a name, either a role type or ID of 
existing

[cloudstack] branch 4.16 updated: Role escalation prevention (#5879)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new a6d9fa6  Role escalation prevention (#5879)
a6d9fa6 is described below

commit a6d9fa61b9b3aa55a3974afcd76109b361c5547b
Author: dahn 
AuthorDate: Thu Feb 10 07:20:27 2022 +0100

Role escalation prevention (#5879)

* prevent role access escallation

* hierarchy issue fixed

* create api list in account manager for checking new account access

* full api list check

* strange role restriction removed for BareMetal

* add role check on upfdate account as well

* more selective use of api checkers

* error msg and var name

Co-authored-by: Daan Hoogland 
---
 .../main/java/com/cloud/user/AccountService.java   |   4 +-
 .../java/org/apache/cloudstack/acl/APIChecker.java |   3 +
 .../command/admin/account/CreateAccountCmd.java|   3 +-
 .../admin/account/CreateAccountCmdTest.java|   6 +-
 .../acl/DynamicRoleBasedAPIAccessChecker.java  |   9 ++
 .../acl/ProjectRoleBasedApiAccessChecker.java  |  11 +-
 .../acl/StaticRoleBasedAPIAccessChecker.java   |   8 ++
 .../cloudstack/discovery/ApiDiscoveryService.java  |   5 +
 .../discovery/ApiDiscoveryServiceImpl.java |  19 +++
 .../ratelimit/ApiRateLimitServiceImpl.java |  13 +-
 .../api/BaremetalProvisionDoneNotificationCmd.java |   3 +-
 .../contrail/management/MockAccountManager.java|  11 +-
 .../java/com/cloud/user/AccountManagerImpl.java| 154 -
 .../core/spring-server-core-managers-context.xml   |   4 +-
 .../com/cloud/user/MockAccountManagerImpl.java |  11 +-
 15 files changed, 237 insertions(+), 27 deletions(-)

diff --git a/api/src/main/java/com/cloud/user/AccountService.java 
b/api/src/main/java/com/cloud/user/AccountService.java
index 98b1618..338a8d3 100644
--- a/api/src/main/java/com/cloud/user/AccountService.java
+++ b/api/src/main/java/com/cloud/user/AccountService.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
 import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
@@ -39,8 +40,7 @@ public interface AccountService {
  * Creates a new user and account, stores the password as is so encrypted 
passwords are recommended.
  * @return the user if created successfully, null otherwise
  */
-UserAccount createUserAccount(String userName, String password, String 
firstName, String lastName, String email, String timezone, String accountName, 
short accountType, Long roleId, Long domainId,
-String networkDomain, Map details, String 
accountUUID, String userUUID);
+UserAccount createUserAccount(CreateAccountCmd accountCmd);
 
 UserAccount createUserAccount(String userName, String password, String 
firstName, String lastName, String email, String timezone, String accountName, 
short accountType, Long roleId, Long domainId,
 String networkDomain, Map details, String 
accountUUID, String userUUID, User.Source source);
diff --git a/api/src/main/java/org/apache/cloudstack/acl/APIChecker.java 
b/api/src/main/java/org/apache/cloudstack/acl/APIChecker.java
index 0d0dfd1..6cf4545 100644
--- a/api/src/main/java/org/apache/cloudstack/acl/APIChecker.java
+++ b/api/src/main/java/org/apache/cloudstack/acl/APIChecker.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.acl;
 
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.user.Account;
 import com.cloud.user.User;
 import com.cloud.utils.component.Adapter;
 
@@ -27,4 +28,6 @@ public interface APIChecker extends Adapter {
 // If false, apiChecker is unable to handle the operation or not 
implemented
 // On exception, checkAccess failed don't allow
 boolean checkAccess(User user, String apiCommandName) throws 
PermissionDeniedException;
+boolean checkAccess(Account account, String apiCommandName) throws 
PermissionDeniedException;
+boolean isEnabled();
 }
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
index 508750a..159f17f 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@ -186,8 +186,7 @@ public class CreateAccountCmd extends BaseCmd {
 validateParams

[cloudstack-documentation] branch 4.16 updated: Updated doc for guest network bridge configuration, for live migration of guests on KVM hosts. (#263)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new da3c4ba  Updated doc for guest network bridge configuration, for live 
migration of guests on KVM hosts. (#263)
da3c4ba is described below

commit da3c4baf74b67644e48127c085ed55152a76ce1a
Author: sureshanaparti <12028987+sureshanapa...@users.noreply.github.com>
AuthorDate: Thu Feb 10 11:14:00 2022 +0530

Updated doc for guest network bridge configuration, for live migration of 
guests on KVM hosts. (#263)
---
 source/installguide/hypervisor/kvm.rst | 9 +
 1 file changed, 9 insertions(+)

diff --git a/source/installguide/hypervisor/kvm.rst 
b/source/installguide/hypervisor/kvm.rst
index 2448d60..af6fc61 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -1418,6 +1418,15 @@ replace your version of qemu-img with one which has been 
patched to include the
 switch.
 
 
+Live Migration
+^^
+
+For Live Migration of the guests, it is better to configure the guest network 
bridge on
+the same interface in the KVM hosts. In case, the guest network bridge is 
configured on
+different interfaces in the KVM hosts, ensure the destination host doesn't 
have interface
+with the interface name of guest network bridge in the source host.
+
+
 UEFI legacy / secureboot

[cloudstack-documentation] branch 4.16 updated: Add CKS compatibility matrix details (#259)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git


The following commit(s) were added to refs/heads/4.16 by this push:
 new 352bcf8  Add CKS compatibility matrix details (#259)
352bcf8 is described below

commit 352bcf8de6f68ac19bbef880086f7efd60dafb47
Author: Pearl Dsilva 
AuthorDate: Thu Feb 10 11:12:20 2022 +0530

Add CKS compatibility matrix details (#259)

* Add CKS compatibility matrix

* added note for cks clusters on upgrade of ACS to version 4.16.1+

* remove note on CKS
---
 source/plugins/cloudstack-kubernetes-service.rst | 16 
 1 file changed, 16 insertions(+)

diff --git a/source/plugins/cloudstack-kubernetes-service.rst 
b/source/plugins/cloudstack-kubernetes-service.rst
index ad76c6d..0373879 100644
--- a/source/plugins/cloudstack-kubernetes-service.rst
+++ b/source/plugins/cloudstack-kubernetes-service.rst
@@ -329,6 +329,22 @@ Token for dashboard login can be retrieved using the 
following command:
# kubectl --kubeconfig /custom/path/kube.config describe secret $(kubectl 
--kubeconfig /custom/path/kube.config get secrets -n kubernetes-dashboard | 
grep kubernetes-dashboard-token | awk '{print $1}') -n kubernetes-dashboard
 
 
+Kubernetes compatibility Matrix
+#
+
++--+-+-+-+
+|ACS Version   |  Supported Kubernetes Versions  |  CKS Template   
|  SSH User   |
++==+=+=+=+
+| 4.14.x   | v1.11 onward (< 1.18)   | CoreOS  
| core|
++--+-+-+-+
+| 4.15.x   | v1.11 onward (< 1.18)   | CoreOS  
| core|
++--+-+-+-+
+| 4.16.0   | v1.20 onward| SystemVM Template (Debian)  
| core|
++--+-+-+-+
+| 4.16.1   | v1.20 onward| SystemVM Template (Debian)  
| cloud   |
++--+-+-+-+
+
+
 .. |cks-add-version-form.png| image:: /_static/images/cks-add-version-form.png
:alt: Add Kubernetes Supported Version form.
 .. |cks-cluster-access-tab.png| image:: 
/_static/images/cks-cluster-access-tab.png

[cloudstack] 01/01: Merge branch '4.16' into main

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit 850714c1fcce7ae68533eac522f7a1f9748641c0
Merge: 38181b2 4ffb949
Author: Suresh Kumar Anaparti 
AuthorDate: Thu Feb 10 10:57:29 2022 +0530

Merge branch '4.16' into main

 .../cloud/network/vpn/RemoteAccessVpnService.java  |  2 +
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |  5 ++
 .../api/command/user/vpn/RemoveVpnUserCmd.java |  3 +-
 .../api/response/SSHKeyPairResponse.java   |  4 ++
 client/pom.xml | 12 +
 .../java/com/cloud/utils/db/GenericDaoBase.java| 20 ++--
 .../hypervisor/kvm/resource/DirectVifDriver.java   |  9 ++--
 plugins/integrations/kubernetes-service/pom.xml|  5 ++
 pom.xml| 11 ++--
 scripts/storage/secondary/setup-sysvm-tmplt|  2 +
 .../network/vpn/RemoteAccessVpnManagerImpl.java| 58 ++
 .../com/cloud/projects/ProjectManagerImpl.java |  7 +--
 .../com/cloud/server/ManagementServerImpl.java |  5 ++
 .../java/com/cloud/storage/StorageManagerImpl.java |  3 ++
 .../storage/snapshot/SnapshotManagerImpl.java  | 23 -
 services/console-proxy/rdpconsole/pom.xml  |  4 ++
 .../java/streamer/bco/BcoSocketWrapperImpl.java| 21 
 .../smoke/test_kubernetes_supported_versions.py|  4 +-
 ui/src/components/view/InfoCard.vue|  2 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |  1 -
 ui/src/views/network/CreateNetwork.vue |  9 ++--
 utils/pom.xml  |  4 ++
 22 files changed, 158 insertions(+), 56 deletions(-)

[cloudstack] branch main updated (38181b2 -> 850714c)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 38181b2  Optional chaining used to enhance readability (#5961)
 add e609aa8  Skip systemVM template registration for Simulator (#5954)
 add c7885f5  maven: upgrade bouncycastle due to cve (#5949)
 add 453aeb0  Add ID search capability to sshkeypairs (#5963)
 add ce81a8e  test: sleep 30s after restarting mgt server in 
test_kubernetes_supported_versions.py to fix test failures with 
test_secondary_storage.py (#5962)
 add b275c29  UI - Add Network: shows "Offering for Isolated networks with 
no Source Nat service" on Network Offering for normal users (#5904)
 add 143b72d  cleanup: Network Throttling for Additional Networks code in 
DirectVifDriver.java  (#5875)
 add 85ced44  API: Fix listSSHKeyPairs API when listing all resources 
(listall=true & projectid=-1) (#5958)
 add 3fc4ef4  replace Random with SecureRandom (#5966)
 add b5655c3  [issue-5952] upgrade to jetty 9.4.44.v20210927 (#5953)
 add 791d063  [issue-5943] xerces 2.12.2 (#5968)
 add 640118c  Add disk space in systemVM template registration script 
(#5956)
 add f88f934  api, server: fix add-remove vpn user without vpn owner (#5850)
 add 4ffb949  Fix of revert RBD snapshots (#5544)
 new 850714c  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../cloud/network/vpn/RemoteAccessVpnService.java  |  2 +
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |  5 ++
 .../api/command/user/vpn/RemoveVpnUserCmd.java |  3 +-
 .../api/response/SSHKeyPairResponse.java   |  4 ++
 client/pom.xml | 12 +
 .../java/com/cloud/utils/db/GenericDaoBase.java| 20 ++--
 .../hypervisor/kvm/resource/DirectVifDriver.java   |  9 ++--
 plugins/integrations/kubernetes-service/pom.xml|  5 ++
 pom.xml| 11 ++--
 scripts/storage/secondary/setup-sysvm-tmplt|  2 +
 .../network/vpn/RemoteAccessVpnManagerImpl.java| 58 ++
 .../com/cloud/projects/ProjectManagerImpl.java |  7 +--
 .../com/cloud/server/ManagementServerImpl.java |  5 ++
 .../java/com/cloud/storage/StorageManagerImpl.java |  3 ++
 .../storage/snapshot/SnapshotManagerImpl.java  | 23 -
 services/console-proxy/rdpconsole/pom.xml  |  4 ++
 .../java/streamer/bco/BcoSocketWrapperImpl.java| 21 
 .../smoke/test_kubernetes_supported_versions.py|  4 +-
 ui/src/components/view/InfoCard.vue|  2 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |  1 -
 ui/src/views/network/CreateNetwork.vue |  9 ++--
 utils/pom.xml  |  4 ++
 22 files changed, 158 insertions(+), 56 deletions(-)

[cloudstack] branch 4.16 updated: Fix of revert RBD snapshots (#5544)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 4ffb949  Fix of revert RBD snapshots (#5544)
4ffb949 is described below

commit 4ffb949a584934cefe69b75905eec5961096f85a
Author: slavkap <51903378+slav...@users.noreply.github.com>
AuthorDate: Thu Feb 10 06:52:21 2022 +0200

Fix of revert RBD snapshots (#5544)

* Fix of revert RBD snapshots

If snapshot is taken only on Primary storage with the option 
"snapshot.backup.to.secondary" set to true, when you set this option to false 
the revert will fail. Added check if the snapshot is not on Secondary to check 
for it on Primary

* Check if snapshot is on primary storage

Will check first if the snapshot is on Primary storage, if not will
return Image as data store

* Fix unit tests

* removed unused method's params

* Formatted error message and added the snapshot ID to it

* Return to the old logic, the fix will only apply to RBD

* Formatted Exception's messages
---
 .../storage/snapshot/SnapshotManagerImpl.java  | 23 ++
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index d94811a..ffa393b 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -308,11 +308,12 @@ public class SnapshotManagerImpl extends 
MutualExclusiveIdsManagerBase implement
 }
 }
 
-DataStoreRole dataStoreRole = getDataStoreRole(snapshot, 
_snapshotStoreDao, dataStoreMgr);
+DataStoreRole dataStoreRole = getDataStoreRole(snapshot);
 
 SnapshotInfo snapshotInfo = snapshotFactory.getSnapshot(snapshotId, 
dataStoreRole);
+
 if (snapshotInfo == null) {
-throw new CloudRuntimeException("snapshot:" + snapshotId + " not 
exist in data store");
+throw new CloudRuntimeException(String.format("snapshot %s [%s] 
does not exists in data store", snapshot.getName(), snapshot.getUuid()));
 }
 
 SnapshotStrategy snapshotStrategy = 
_storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.REVERT);
@@ -587,7 +588,7 @@ public class SnapshotManagerImpl extends 
MutualExclusiveIdsManagerBase implement
 return false;
 }
 
-DataStoreRole dataStoreRole = getDataStoreRole(snapshotCheck, 
_snapshotStoreDao, dataStoreMgr);
+DataStoreRole dataStoreRole = getDataStoreRole(snapshotCheck);
 
 SnapshotDataStoreVO snapshotStoreRef = 
_snapshotStoreDao.findBySnapshot(snapshotId, dataStoreRole);
 
@@ -1238,15 +1239,11 @@ public class SnapshotManagerImpl extends 
MutualExclusiveIdsManagerBase implement
 try {
 postCreateSnapshot(volume.getId(), snapshotId, 
payload.getSnapshotPolicyId());
 
-DataStoreRole dataStoreRole = getDataStoreRole(snapshot, 
_snapshotStoreDao, dataStoreMgr);
+DataStoreRole dataStoreRole = getDataStoreRole(snapshot);
 
 SnapshotDataStoreVO snapshotStoreRef = 
_snapshotStoreDao.findBySnapshot(snapshotId, dataStoreRole);
 if (snapshotStoreRef == null) {
-// The snapshot was not backed up to secondary.  Find the 
snap on primary
-snapshotStoreRef = 
_snapshotStoreDao.findBySnapshot(snapshotId, DataStoreRole.Primary);
-if (snapshotStoreRef == null) {
-throw new CloudRuntimeException("Could not find 
snapshot");
-}
+throw new CloudRuntimeException(String.format("Could not 
find snapshot %s [%s] on [%s]", snapshot.getName(), snapshot.getUuid(), 
snapshot.getLocationType()));
 }
 
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, 
snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, 
snapshot.getName(), null, null,
 snapshotStoreRef.getPhysicalSize(), volume.getSize(), 
snapshot.getClass().getName(), snapshot.getUuid());
@@ -1332,8 +1329,8 @@ public class SnapshotManagerImpl extends 
MutualExclusiveIdsManagerBase implement
 }
 }
 
-private DataStoreRole getDataStoreRole(Snapshot snapshot, 
SnapshotDataStoreDao snapshotStoreDao, DataStoreManager dataStoreMgr) {
-SnapshotDataStoreVO snapshotStore = 
snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Primary);
+private DataStoreRole getDataStoreRole(Snapshot snapshot) {
+SnapshotDataStoreVO snapshotStore = 
_snaps

[cloudstack] branch 4.16 updated (640118c -> f88f934)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 640118c  Add disk space in systemVM template registration script 
(#5956)
 add f88f934  api, server: fix add-remove vpn user without vpn owner (#5850)

No new revisions were added by this update.

Summary of changes:
 .../cloud/network/vpn/RemoteAccessVpnService.java  |  2 +
 .../api/command/user/vpn/RemoveVpnUserCmd.java |  3 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java| 58 ++
 3 files changed, 52 insertions(+), 11 deletions(-)

[cloudstack] branch 4.16 updated: Add disk space in systemVM template registration script (#5956)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 640118c  Add disk space in systemVM template registration script 
(#5956)
640118c is described below

commit 640118ce2b631e155c0477c46f37bea562ecb714
Author: Pearl Dsilva 
AuthorDate: Thu Feb 10 09:50:12 2022 +0530

Add disk space in systemVM template registration script (#5956)
---
 scripts/storage/secondary/setup-sysvm-tmplt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/storage/secondary/setup-sysvm-tmplt 
b/scripts/storage/secondary/setup-sysvm-tmplt
index fa33f33..89195e4 100755
--- a/scripts/storage/secondary/setup-sysvm-tmplt
+++ b/scripts/storage/secondary/setup-sysvm-tmplt
@@ -45,6 +45,8 @@ if [[ ! $@ =~ ^\-.+ ]]; then
 fi
 
 OPTERR=0
+DISKSPACE=212  #free disk space required in kilobytes
+
 while getopts 'h:f:d:u::'# OPTION
 do
   case $OPTION in

[cloudstack] branch 4.16 updated (b5655c3 -> 791d063)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from b5655c3  [issue-5952] upgrade to jetty 9.4.44.v20210927 (#5953)
 add 791d063  [issue-5943] xerces 2.12.2 (#5968)

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[cloudstack] branch 4.16 updated (3fc4ef4 -> b5655c3)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 3fc4ef4  replace Random with SecureRandom (#5966)
 add b5655c3  [issue-5952] upgrade to jetty 9.4.44.v20210927 (#5953)

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[cloudstack] branch 4.16 updated (85ced44 -> 3fc4ef4)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 85ced44  API: Fix listSSHKeyPairs API when listing all resources 
(listall=true & projectid=-1) (#5958)
 add 3fc4ef4  replace Random with SecureRandom (#5966)

No new revisions were added by this update.

Summary of changes:
 server/src/main/java/com/cloud/projects/ProjectManagerImpl.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

[cloudstack-documentation] branch 4.16 created (now 2dc92ba)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git.


  at 2dc92ba  Fixed the collided paths for some files

This branch includes the following new commits:

 new 2dc92ba  Fixed the collided paths for some files

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[cloudstack-documentation] 01/01: Fixed the collided paths for some files

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git

commit 2dc92badcb05ac7fd2641a4d82d9c49748ffe86e
Author: Suresh Kumar Anaparti 
AuthorDate: Tue May 25 13:38:31 2021 +0530

Fixed the collided paths for some files
---
 .../images/legacy/template-permissions-update-1.png | Bin 20188 -> 20073 bytes
 .../legacy/vm-settings-values-dropdown-KVM-list.png | Bin 18276 -> 7805 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/source/_static/images/legacy/template-permissions-update-1.png 
b/source/_static/images/legacy/template-permissions-update-1.png
index f1961c1..f0bb692 100644
Binary files a/source/_static/images/legacy/template-permissions-update-1.png 
and b/source/_static/images/legacy/template-permissions-update-1.png differ
diff --git 
a/source/_static/images/legacy/vm-settings-values-dropdown-KVM-list.png 
b/source/_static/images/legacy/vm-settings-values-dropdown-KVM-list.png
index 1302f4b..74a2418 100644
Binary files 
a/source/_static/images/legacy/vm-settings-values-dropdown-KVM-list.png and 
b/source/_static/images/legacy/vm-settings-values-dropdown-KVM-list.png differ

[cloudstack] branch 4.16 updated (ce81a8e -> b275c29)

2022-02-09 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from ce81a8e  test: sleep 30s after restarting mgt server in 
test_kubernetes_supported_versions.py to fix test failures with 
test_secondary_storage.py (#5962)
 add b275c29  UI - Add Network: shows "Offering for Isolated networks with 
no Source Nat service" on Network Offering for normal users (#5904)

No new revisions were added by this update.

Summary of changes:
 ui/src/views/network/CreateIsolatedNetworkForm.vue | 1 -
 ui/src/views/network/CreateNetwork.vue | 9 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

[cloudstack] branch 4.16 updated (453aeb0 -> ce81a8e)

2022-02-08 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 453aeb0  Add ID search capability to sshkeypairs (#5963)
 add ce81a8e  test: sleep 30s after restarting mgt server in 
test_kubernetes_supported_versions.py to fix test failures with 
test_secondary_storage.py (#5962)

No new revisions were added by this update.

Summary of changes:
 test/integration/smoke/test_kubernetes_supported_versions.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[cloudstack] branch 4.16 updated (c7885f5 -> 453aeb0)

2022-02-08 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from c7885f5  maven: upgrade bouncycastle due to cve (#5949)
 add 453aeb0  Add ID search capability to sshkeypairs (#5963)

No new revisions were added by this update.

Summary of changes:
 .../apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java   | 5 +
 .../java/org/apache/cloudstack/api/response/SSHKeyPairResponse.java  | 4 
 server/src/main/java/com/cloud/server/ManagementServerImpl.java  | 5 +
 ui/src/components/view/InfoCard.vue  | 2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

[cloudstack] 01/01: Merge branch '4.16' into main

2022-02-08 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit 208ae84dd760aa7e18077ad063318df237fb23dc
Merge: 2c11171 da56a2a
Author: Suresh Kumar Anaparti 
AuthorDate: Tue Feb 8 19:01:34 2022 +0530

Merge branch '4.16' into main

 .../java/com/cloud/storage/VolumeApiService.java   |   2 +
 .../java/org/apache/cloudstack/api/BaseCmd.java|   2 +-
 .../service/VolumeOrchestrationService.java|   7 +
 .../cloud/entity/api/VMEntityManagerImpl.java  |   2 +-
 .../engine/orchestration/VolumeOrchestrator.java   |  23 +--
 framework/managed-context/pom.xml  |   6 +-
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |  33 ++-
 .../cloudstack/quota/QuotaManagerImplTest.java |   8 +-
 .../affinity/ExplicitDedicationProcessor.java  |   6 +
 plugins/alert-handlers/snmp-alerts/pom.xml |   4 +-
 plugins/alert-handlers/syslog-alerts/pom.xml   |   4 +-
 .../cloud/deploy/ImplicitDedicationPlanner.java|   2 +-
 plugins/hypervisors/ovm3/pom.xml   |   4 +-
 plugins/integrations/kubernetes-service/pom.xml|   6 +-
 plugins/network-elements/juniper-contrail/pom.xml  |   6 +
 plugins/user-authenticators/ldap/pom.xml   |   4 +
 pom.xml|  20 +-
 .../main/java/com/cloud/configuration/Config.java  |  18 +-
 .../configuration/ConfigurationManagerImpl.java|  18 +-
 .../deploy/DeploymentPlanningManagerImpl.java  |  19 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java|  20 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  33 +--
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  23 ++-
 services/console-proxy/server/pom.xml  |   4 +-
 services/secondary-storage/server/pom.xml  |   4 +-
 test/pom.xml   |   4 +-
 ui/public/locales/en.json  |   3 +-
 .../view/InstanceNicsNetworkSelectListView.vue | 149 ++
 ui/src/components/view/NicNetworkSelectForm.vue| 228 +
 ui/src/views/compute/DeployVM.vue  |  62 +++---
 ui/src/views/offering/AddComputeOffering.vue   |   2 +-
 utils/pom.xml  |   8 +-
 32 files changed, 583 insertions(+), 151 deletions(-)

diff --cc api/src/main/java/com/cloud/storage/VolumeApiService.java
index 516fe77,f7543b7..84559e6
--- a/api/src/main/java/com/cloud/storage/VolumeApiService.java
+++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java
@@@ -154,5 -153,5 +154,7 @@@ public interface VolumeApiService 
  
  Volume recoverVolume(long volumeId);
  
+ boolean validateVolumeSizeInBytes(long size);
++
 +Volume changeDiskOfferingForVolume(ChangeOfferingForVolumeCmd cmd) throws 
ResourceAllocationException;
  }
diff --cc 
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 3391532,9c1e998..a311912
--- 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@@ -83,9 -78,8 +78,9 @@@ import org.apache.cloudstack.storage.da
  import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
  import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
  import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
+ import org.apache.commons.collections.CollectionUtils;
  import org.apache.commons.collections.MapUtils;
 +import org.apache.commons.lang3.StringUtils;
- import org.apache.commons.collections.CollectionUtils;
  import org.apache.log4j.Logger;
  
  import com.cloud.agent.api.to.DataTO;
diff --cc 
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 7d98dfb,e5347c4..0b4fcf8
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@@ -268,8 -269,9 +268,9 @@@ import com.cloud.vm.dao.VMInstanceDao
  import com.google.common.base.Enums;
  import com.google.common.base.MoreObjects;
  import com.google.common.base.Preconditions;
 -import com.google.common.base.Strings;
 +import org.apache.commons.lang3.StringUtils;
  import com.google.common.collect.Sets;
+ import com.googlecode.ipv6.IPv6Address;
  
  public class ConfigurationManagerImpl extends ManagerBase implements 
ConfigurationManager, ConfigurationService, Configurable {
  public static final Logger s_logger = 
Logger.getLogger(ConfigurationManagerImpl.class);
@@@ -3004,72 -3022,6 +3001,76 @@@
  _serviceOfferingDetailsDao.saveDetails(detailsVO);
  }
  
 +CallContext.current().setEventDetails("Service offering id=" + 
serviceOffering.getId());
 +return servi

[cloudstack] branch main updated (2c11171 -> 208ae84)

2022-02-08 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 2c11171  Fix 'endpointe.url' global settings configuration typo (#5832)
 add 0f1cd60  add logging to deployment planners (#5859)
 add 5adf608  mvn: upgrade to xerces 2.12.2 (#5944)
 add 5db6b86  [issue-5946] upgrade to xstream 1.4.19 (#5947)
 add 81b49b8  ui: fix select networks for template nic (#5933)
 add 6c9f0c1  Fix #3448 quota calculation for monthly tariffs (#5517)
 add eeaad0b  [issue-5939] upgrade commons-compress to 1.21 (#5942)
 add af58284  server,config: respect storage.max.volume.size and make it 
dynamic (#5857)
 add da56a2a  maven: migrate short-term to reload4j v1.2.18 (#5878)
 new 208ae84  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/com/cloud/storage/VolumeApiService.java   |   2 +
 .../java/org/apache/cloudstack/api/BaseCmd.java|   2 +-
 .../service/VolumeOrchestrationService.java|   7 +
 .../cloud/entity/api/VMEntityManagerImpl.java  |   2 +-
 .../engine/orchestration/VolumeOrchestrator.java   |  23 +--
 framework/managed-context/pom.xml  |   6 +-
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |  33 ++-
 .../cloudstack/quota/QuotaManagerImplTest.java |   8 +-
 .../affinity/ExplicitDedicationProcessor.java  |   6 +
 plugins/alert-handlers/snmp-alerts/pom.xml |   4 +-
 plugins/alert-handlers/syslog-alerts/pom.xml   |   4 +-
 .../cloud/deploy/ImplicitDedicationPlanner.java|   2 +-
 plugins/hypervisors/ovm3/pom.xml   |   4 +-
 plugins/integrations/kubernetes-service/pom.xml|   6 +-
 plugins/network-elements/juniper-contrail/pom.xml  |   6 +
 plugins/user-authenticators/ldap/pom.xml   |   4 +
 pom.xml|  20 +-
 .../main/java/com/cloud/configuration/Config.java  |  18 +-
 .../configuration/ConfigurationManagerImpl.java|  18 +-
 .../deploy/DeploymentPlanningManagerImpl.java  |  19 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java|  20 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  33 +--
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  23 ++-
 services/console-proxy/server/pom.xml  |   4 +-
 services/secondary-storage/server/pom.xml  |   4 +-
 test/pom.xml   |   4 +-
 ui/public/locales/en.json  |   3 +-
 .../view/InstanceNicsNetworkSelectListView.vue | 149 ++
 ui/src/components/view/NicNetworkSelectForm.vue| 228 +
 ui/src/views/compute/DeployVM.vue  |  62 +++---
 ui/src/views/offering/AddComputeOffering.vue   |   2 +-
 utils/pom.xml  |   8 +-
 32 files changed, 583 insertions(+), 151 deletions(-)
 create mode 100644 ui/src/components/view/InstanceNicsNetworkSelectListView.vue
 create mode 100644 ui/src/components/view/NicNetworkSelectForm.vue

[cloudstack] branch 4.16 updated (af58284 -> da56a2a)

2022-02-08 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from af58284  server,config: respect storage.max.volume.size and make it 
dynamic (#5857)
 add da56a2a  maven: migrate short-term to reload4j v1.2.18 (#5878)

No new revisions were added by this update.

Summary of changes:
 framework/managed-context/pom.xml |  6 +++---
 plugins/alert-handlers/snmp-alerts/pom.xml|  4 ++--
 plugins/alert-handlers/syslog-alerts/pom.xml  |  4 ++--
 plugins/hypervisors/ovm3/pom.xml  |  4 ++--
 plugins/integrations/kubernetes-service/pom.xml   |  6 +++---
 plugins/network-elements/juniper-contrail/pom.xml |  6 ++
 plugins/user-authenticators/ldap/pom.xml  |  4 
 pom.xml   | 14 ++
 services/console-proxy/server/pom.xml |  4 ++--
 services/secondary-storage/server/pom.xml |  4 ++--
 test/pom.xml  |  4 ++--
 utils/pom.xml |  8 ++--
 12 files changed, 44 insertions(+), 24 deletions(-)

[cloudstack] branch 4.16 updated: server, config: respect storage.max.volume.size and make it dynamic (#5857)

2022-02-08 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new af58284  server,config: respect storage.max.volume.size and make it 
dynamic (#5857)
af58284 is described below

commit af58284560938f1320296d5e735c8e96175d95cb
Author: Abhishek Kumar 
AuthorDate: Tue Feb 8 13:29:35 2022 +0530

server,config: respect storage.max.volume.size and make it dynamic (#5857)

* server,config: respect storage.max.volume.size and make it dynamic

Fixes #5830

* fix test

* size change

* fix check

* server: donot include ISO size while checking volume sizes

* revert size check

* refactor

Signed-off-by: Abhishek Kumar 
Co-authored-by: sureshanaparti 
<12028987+sureshanapa...@users.noreply.github.com>
---
 .../java/com/cloud/storage/VolumeApiService.java   |  2 ++
 .../service/VolumeOrchestrationService.java|  7 +
 .../engine/orchestration/VolumeOrchestrator.java   | 25 
 .../main/java/com/cloud/configuration/Config.java  | 18 ++--
 .../configuration/ConfigurationManagerImpl.java| 18 ++--
 .../com/cloud/storage/VolumeApiServiceImpl.java| 18 ++--
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 33 ++
 .../java/com/cloud/vm/UserVmManagerImplTest.java   | 23 +--
 8 files changed, 82 insertions(+), 62 deletions(-)

diff --git a/api/src/main/java/com/cloud/storage/VolumeApiService.java 
b/api/src/main/java/com/cloud/storage/VolumeApiService.java
index 6087ece..f7543b7 100644
--- a/api/src/main/java/com/cloud/storage/VolumeApiService.java
+++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java
@@ -152,4 +152,6 @@ public interface VolumeApiService {
 Volume destroyVolume(long volumeId, Account caller, boolean expunge, 
boolean forceExpunge);
 
 Volume recoverVolume(long volumeId);
+
+boolean validateVolumeSizeInBytes(long size);
 }
diff --git 
a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
 
b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
index c6b96bc..aefe4e4 100644
--- 
a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
+++ 
b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -75,6 +75,13 @@ public interface VolumeOrchestrationService {
 true
 );
 
+ConfigKey MaxVolumeSize = new ConfigKey("Storage",
+Long.class,
+"storage.max.volume.size",
+"2000",
+"The maximum size for a volume (in GB).",
+true);
+
 VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long 
destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType)
 throws ConcurrentOperationException, StorageUnavailableException;
 
diff --git 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index d88e17d..9c1e998 100644
--- 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -18,10 +18,12 @@
  */
 package org.apache.cloudstack.engine.orchestration;
 
+import static 
com.cloud.storage.resource.StorageProcessor.REQUEST_TEMPLATE_RELOAD;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -35,14 +37,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.agent.api.to.DatadiskTO;
-import com.cloud.utils.StringUtils;
-import com.cloud.vm.SecondaryStorageVmVO;
-import com.cloud.vm.UserVmDetailVO;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.SecondaryStorageVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
 import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
 import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin;
 import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
@@ -84,11 +78,12 @@ import 
org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
 import org.apache.cloud

[cloudstack] branch 4.16 updated: [issue-5939] upgrade commons-compress to 1.21 (#5942)

2022-02-07 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new eeaad0b  [issue-5939] upgrade commons-compress to 1.21 (#5942)
eeaad0b is described below

commit eeaad0bfe750c25fb9e6c79bb7c644e6ef12175c
Author: PJ Fanning 
AuthorDate: Tue Feb 8 08:17:58 2022 +0100

[issue-5939] upgrade commons-compress to 1.21 (#5942)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c78dc9f..a8e50f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
 
 1.15
 4.4
-1.20
+1.21
 1.3
 1.4
 3.1

[cloudstack] branch 4.16 updated: ui: fix select networks for template nic (#5933)

2022-02-07 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 81b49b8  ui: fix select networks for template nic (#5933)
81b49b8 is described below

commit 81b49b835a477ed555decd43627d8ba7dc4f6e98
Author: Abhishek Kumar 
AuthorDate: Mon Feb 7 16:30:40 2022 +0530

ui: fix select networks for template nic (#5933)

* ui: fix select networks for template nic

Fixes #5927

Signed-off-by: Abhishek Kumar 
---
 ui/public/locales/en.json  |   2 +
 .../view/InstanceNicsNetworkSelectListView.vue | 149 ++
 ui/src/components/view/NicNetworkSelectForm.vue| 228 +
 ui/src/views/compute/DeployVM.vue  |  62 +++---
 4 files changed, 407 insertions(+), 34 deletions(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 60dbff4..7504bb7 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -552,6 +552,7 @@
 "label.certificate.upload.failed": "Certificate Upload Failed",
 "label.certificate.upload.failed.description": "Failed to update SSL 
Certificate. Failed to pass certificate validation check",
 "label.certificateid": "Certificate ID",
+"label.change": "Change",
 "label.change.affinity": "Change Affinity",
 "label.change.ip.addess": "Change IP Address",
 "label.change.ipaddress": "Change IP address for NIC",
@@ -1978,6 +1979,7 @@
 "label.select.instance": "Select instance",
 "label.select.instance.to.attach.volume.to": "Select instance to attach volume 
to",
 "label.select.iso.or.template": "Select ISO or template",
+"label.select.network": "Select Network",
 "label.select.offering": "Select offering",
 "label.select.project": "Select Project",
 "label.select.projects": "Select Projects",
diff --git a/ui/src/components/view/InstanceNicsNetworkSelectListView.vue 
b/ui/src/components/view/InstanceNicsNetworkSelectListView.vue
new file mode 100644
index 000..42b6162
--- /dev/null
+++ b/ui/src/components/view/InstanceNicsNetworkSelectListView.vue
@@ -0,0 +1,149 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+
+  
+
+  
+{{ record.elementName + ' - ' + record.name }}
+  
+
+  
+
+  
+  
+
+  {{ $bytesToHumanReadableSize(record.size) }}
+
+  
+  
+{{ record.selectednetworkname || '' }}
+  
+  
+{{ record.selectednetworkid ? 
$t('label.change') : $t('label.select') }}
+  
+
+
+
+  
+
+  
+
+
+
+import NicNetworkSelectForm from '@/components/view/NicNetworkSelectForm'
+
+export default {
+  name: 'InstanceNicsNetworkSelectListView',
+  components: {
+NicNetworkSelectForm
+  },
+  props: {
+nics: {
+  type: Array,
+  required: true
+},
+zoneid: {
+  type: String,
+  required: true
+}
+  },
+  data () {
+return {
+  nicColumns: [
+{
+  title: this.$t('label.nic'),
+  scopedSlots: { customRender: 'displaytext' }
+},
+{
+  title: this.$t('label.network'),
+  scopedSlots: { customRender: 'selectednetwork' }
+},
+{
+  title: '',
+  scopedSlots: { customRender: 'select' }
+}
+  ],
+  selectedNicForNetworkSelection: {}
+}
+  },
+  methods: {
+resetSelection () {
+  var nics = this.nics
+  this.nics = []
+  for (var nic of nics) {
+nic.selectednetworkid = null
+nic.selectednetworkname = ''
+  }
+  this.nics = nics
+  this.updateNicToNetworkSelection()
+},
+openNicNetworkSelector (nic) {
+  this.selectedNicForNetworkSelection = nic
+},
+closeNicNetworkSel

[cloudstack] branch 4.16 updated (5adf608 -> 5db6b86)

2022-02-06 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 5adf608  mvn: upgrade to xerces 2.12.2 (#5944)
 add 5db6b86  [issue-5946] upgrade to xstream 1.4.19 (#5947)

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[cloudstack] 01/01: Merge branch '4.16' into main

2022-02-04 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit e3f0e3b544bdf2db0c9c832563136c8e81573cc7
Merge: 194bf6e 966b32c
Author: Suresh Kumar Anaparti 
AuthorDate: Fri Feb 4 19:04:08 2022 +0530

Merge branch '4.16' into main

 .../java/com/cloud/agent/api/to/IpAddressTO.java   |  21 +++
 .../resources/META-INF/db/schema-41600to41610.sql  |  10 ++
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |  38 -
 .../cloud/hypervisor/guru/VmwareVmImplementer.java |   4 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |   2 -
 .../vmware/manager/VmwareManagerImpl.java  |   8 -
 .../hypervisor/vmware/resource/VmwareResource.java | 165 +
 .../cloud/network/router/CommandSetupHelper.java   |  58 
 .../router/VirtualNetworkApplianceManagerImpl.java |   2 +-
 .../java/com/cloud/usage/UsageServiceImpl.java | 104 +++--
 ui/src/components/view/ListView.vue|   2 +-
 ui/src/config/router.js|   8 +-
 ui/src/views/AutogenView.vue   |   4 +
 13 files changed, 272 insertions(+), 154 deletions(-)

diff --cc 
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 297e534,d2051f6..aba5150
--- 
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
@@@ -7497,25 -7813,4 +7476,25 @@@ public class VmwareResource implements 
  }
  return windowInterval;
  }
 -}
 +
 +@Override
 +public String createLogMessageException(Throwable e, Command command) {
 +if (e instanceof RemoteException) {
 +s_logger.warn("Encounter remote exception to vCenter, invalidate 
VMware session context.");
 +invalidateServiceContext();
 +}
 +
 +String message = String.format("%s failed due to [%s].", 
command.getClass().getSimpleName(), VmwareHelper.getExceptionMessage(e));
 +s_logger.error(message, e);
 +
 +return message;
 +}
 +
 +private void logCommand(Command cmd) {
 +try {
 +s_logger.debug(String.format(EXECUTING_RESOURCE_COMMAND, 
cmd.getClass().getSimpleName(), _gson.toJson(cmd)));
 +} catch (Exception e) {
 +s_logger.error(String.format("Failed to log command %s due to: 
[%s].", cmd.getClass().getSimpleName(), e.getMessage()), e);
 +}
 +}
- }
++}

[cloudstack] branch main updated (194bf6e -> e3f0e3b)

2022-02-04 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from 194bf6e  Merge remote-tracking branch 'apache/4.16'
 add f458964  ui: fix related key for section (#5929)
 add 26e4e18  kvm: Use lscpu to get cpu max speed (#5506)
 add ef7debb  Filter usage for project (#5866)
 add ecf85aa  VMware7 support: Add schema changes for update2 and update3 
(#5870)
 add 56a8852  Remove code that reserves extra interfaces based on the 
global setting router.extra.public.nics in case of VMware. (#5912)
 add 966b32c  ui: fix ssh keypair navigation (#5931)
 new e3f0e3b  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/com/cloud/agent/api/to/IpAddressTO.java   |  21 +++
 .../resources/META-INF/db/schema-41600to41610.sql  |  10 ++
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |  38 -
 .../cloud/hypervisor/guru/VmwareVmImplementer.java |   4 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |   2 -
 .../vmware/manager/VmwareManagerImpl.java  |   8 -
 .../hypervisor/vmware/resource/VmwareResource.java | 165 +
 .../cloud/network/router/CommandSetupHelper.java   |  58 
 .../router/VirtualNetworkApplianceManagerImpl.java |   2 +-
 .../java/com/cloud/usage/UsageServiceImpl.java | 104 +++--
 ui/src/components/view/ListView.vue|   2 +-
 ui/src/config/router.js|   8 +-
 ui/src/views/AutogenView.vue   |   4 +
 13 files changed, 272 insertions(+), 154 deletions(-)

[cloudstack] branch 4.16 updated (56a8852 -> 966b32c)

2022-02-04 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 56a8852  Remove code that reserves extra interfaces based on the 
global setting router.extra.public.nics in case of VMware. (#5912)
 add 966b32c  ui: fix ssh keypair navigation (#5931)

No new revisions were added by this update.

Summary of changes:
 ui/src/components/view/ListView.vue | 2 +-
 ui/src/views/AutogenView.vue| 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

[cloudstack] branch 4.16 updated: ui: fix related key for section (#5929)

2022-02-03 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new f458964  ui: fix related key for section (#5929)
f458964 is described below

commit f458964e52a46ca33594bb0d8be293e7f58e5858
Author: Abhishek Kumar 
AuthorDate: Fri Feb 4 10:27:01 2022 +0530

ui: fix related key for section (#5929)

Fixes #5928

Signed-off-by: Abhishek Kumar 
---
 ui/src/config/router.js | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/src/config/router.js b/ui/src/config/router.js
index d6daa01..c748b50 100644
--- a/ui/src/config/router.js
+++ b/ui/src/config/router.js
@@ -43,7 +43,13 @@ function generateRouterMap (section) {
 name: section.name,
 path: '/' + section.name,
 hidden: section.hidden,
-meta: { title: section.title, icon: section.icon, docHelp: 
Vue.prototype.$applyDocHelpMappings(section.docHelp), searchFilters: 
section.searchFilters },
+meta: {
+  title: section.title,
+  icon: section.icon,
+  docHelp: Vue.prototype.$applyDocHelpMappings(section.docHelp),
+  searchFilters: section.searchFilters,
+  related: section.related
+},
 component: RouteView
   }

[cloudstack] branch 4.16 updated: server: allow normal users to create isolated network without source nat (#5920)

2022-02-03 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 4a1ebb3  server: allow normal users to create isolated network without 
source nat (#5920)
4a1ebb3 is described below

commit 4a1ebb3fa56addb0f2ab011c92d2d22dc3fc8327
Author: Wei Zhou 
AuthorDate: Thu Feb 3 12:14:11 2022 +0100

server: allow normal users to create isolated network without source nat 
(#5920)
---
 .../java/com/cloud/network/NetworkServiceImpl.java| 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java 
b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index de13cd7..53dabc4 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1360,9 +1360,8 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 
 performBasicPrivateVlanChecks(vlanId, secondaryVlanId, 
privateVlanType);
 
-// Regular user can create Guest Isolated Source Nat enabled network 
or L2 network only
-if (_accountMgr.isNormalUser(caller.getId())) {
-validateNetworkOfferingForRegularUser(ntwkOff);
+if (!_accountMgr.isRootAdmin(caller.getId())) {
+validateNetworkOfferingForNonRootAdminUser(ntwkOff);
 }
 
 // Don't allow to specify vlan if the caller is not ROOT admin
@@ -1454,20 +1453,16 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 return network;
 }
 
-private void validateNetworkOfferingForRegularUser(NetworkOfferingVO 
ntwkOff) {
+private void validateNetworkOfferingForNonRootAdminUser(NetworkOfferingVO 
ntwkOff) {
 if (ntwkOff.getTrafficType() != TrafficType.Guest) {
-throw new InvalidParameterValueException("Regular users can only 
create a Guest network");
+throw new InvalidParameterValueException("This user can only 
create a Guest network");
 }
-if (ntwkOff.getGuestType() == GuestType.Isolated && 
areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat)) {
-s_logger.debug(String.format("Creating a network from network 
offerings having traffic type [%s] and network type [%s] with a service [%s] 
enabled.",
-TrafficType.Guest, GuestType.Isolated, 
Service.SourceNat.getName()));
-} else if (ntwkOff.getGuestType() == GuestType.L2) {
+if (ntwkOff.getGuestType() == GuestType.L2 || ntwkOff.getGuestType() 
== GuestType.Isolated) {
 s_logger.debug(String.format("Creating a network from network 
offerings having traffic type [%s] and network type [%s].",
-TrafficType.Guest, GuestType.L2));
+TrafficType.Guest, ntwkOff.getGuestType()));
 } else {
 throw new InvalidParameterValueException(
-String.format("Regular users can only create an %s network 
with a service [%s] enabled, or a %s network.",
-GuestType.Isolated, Service.SourceNat.getName(), 
GuestType.L2));
+String.format("This user can only create an %s network or 
a %s network.", GuestType.Isolated, GuestType.L2));
 }
 }

[cloudstack] branch 4.16 updated: vm-import: fix unmanaged instance listing (#5400)

2022-02-02 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 638779c  vm-import: fix unmanaged instance listing (#5400)
638779c is described below

commit 638779ca37d1917aa16c8045b99076dddc20618e
Author: Abhishek Kumar 
AuthorDate: Thu Feb 3 10:27:05 2022 +0530

vm-import: fix unmanaged instance listing (#5400)

* vm-import: fix unmanaged instance listing

When the host and last host ID is not set for the VM, it may appear in the 
list of unmanaged instances.
This changes fixes the behaviour by filtering unmanaged instances list for 
host for following three criteria:
- host is set as host_id for the VM
- host is set as the last_host_id for the VM
- pod of the host is set as the pod_id for the VM and both host_id and 
last_host_id is NULL

* use SearchBuilder to fix query condition

* add paranthesis

Signed-off-by: Abhishek Kumar 
---
 .../src/main/java/com/cloud/vm/dao/VMInstanceDao.java |  1 +
 .../main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 19 ++-
 .../apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 15 +++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java 
b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
index 0bbcb37..4db07c0 100755
--- a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
@@ -162,4 +162,5 @@ public interface VMInstanceDao extends 
GenericDao, StateDao<
 
 void updateSystemVmTemplateId(long templateId, Hypervisor.HypervisorType 
hypervisorType);
 
+List listByHostOrLastHostOrHostPod(long hostId, long podId);
 }
diff --git 
a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
index 7ceff5e..5701d7e 100755
--- a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -28,12 +28,12 @@ import java.util.Map;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
-import com.cloud.hypervisor.Hypervisor;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.server.ResourceTag.ResourceObjectType;
 import com.cloud.tags.dao.ResourceTagDao;
 import com.cloud.utils.DateUtil;
@@ -961,6 +961,23 @@ public class VMInstanceDaoImpl extends 
GenericDaoBase implem
 } catch (Throwable e) {
 throw new CloudRuntimeException("Caught: " + sql, e);
 }
+}
 
+@Override
+public List listByHostOrLastHostOrHostPod(long hostId, long 
podId) {
+SearchBuilder sb = createSearchBuilder();
+sb.or().op("hostId", sb.entity().getHostId(), Op.EQ);
+sb.or("lastHostId", sb.entity().getLastHostId(), Op.EQ);
+sb.and().op("hostIdNull", sb.entity().getHostId(), 
SearchCriteria.Op.NULL);
+sb.and("lastHostIdNull", sb.entity().getHostId(), 
SearchCriteria.Op.NULL);
+sb.and("podId", sb.entity().getPodIdToDeployIn(), Op.EQ);
+sb.cp();
+sb.cp();
+sb.done();
+SearchCriteria sc = sb.create();
+sc.setParameters("hostId", String.valueOf(hostId));
+sc.setParameters("lastHostId", String.valueOf(hostId));
+sc.setParameters("podId", String.valueOf(podId));
+return listBy(sc);
 }
 }
diff --git 
a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java 
b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index bf9ed7f..10a7ca7 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -363,18 +364,8 @@ public class UnmanagedVMsManagerImpl implements 
UnmanagedVMsManager {
 }
 
 private List getHostManagedVms(Host host) {
-List managedVms = new ArrayList<>();
-List instances = vmDao.listByHostId(host.getId());
-for (VMInstanceVO instance : instances) {
-managedVms.add(instance.getInstanceName());
-}
-instances = vmDao.listByLastHostIdAndStates(host.getId(),
-VirtualMachine.State.Stopped, VirtualMachine.State.Destroyed,
-Virtua

[cloudstack] branch 4.16 updated (8adb8df -> 62b806a)

2022-02-02 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 8adb8df  server: find suitable disk offering for volume upload (#5852)
 add 62b806a  api,server: add params for updatehypervisorcapabilities API 
(#5473)

No new revisions were added by this update.

Summary of changes:
 .../cloud/hypervisor/HypervisorCapabilities.java   |   2 +
 .../java/com/cloud/server/ManagementService.java   |   3 +-
 .../org/apache/cloudstack/api/ApiConstants.java|   1 +
 .../config/UpdateHypervisorCapabilitiesCmd.java|  30 ++-
 .../response/HypervisorCapabilitiesResponse.java   |  15 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   3 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java |   2 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   3 +-
 .../com/cloud/server/ManagementServerImpl.java |  41 ++-
 .../component/test_hypervisor_capabilities.py  | 289 +
 tools/marvin/marvin/lib/base.py|   5 +
 11 files changed, 378 insertions(+), 16 deletions(-)
 create mode 100644 test/integration/component/test_hypervisor_capabilities.py

[cloudstack] 01/01: Merge branch '4.16' into main

2022-02-02 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit bf70566c2c5b4abb423b603daeaf738833ee6872
Merge: a6567f3 8adb8df
Author: Suresh Kumar Anaparti 
AuthorDate: Wed Feb 2 17:30:21 2022 +0530

Merge branch '4.16' into main

 .../diagnostics/CopyToSecondaryStorageCommand.java |  8 ++-
 .../com/cloud/vm/VirtualMachineManagerImpl.java|  7 ++-
 .../com/cloud/storage/dao/DiskOfferingDao.java |  2 +
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 10 
 .../storage/image/NfsImageStoreDriverImpl.java | 22 ++--
 .../xenserver/resource/CitrixResourceBase.java | 35 +
 .../resource/XenServerStorageProcessor.java| 18 ---
 .../resource/Xenserver625StorageProcessor.java | 55 +++-
 .../xenserver/resource/CitrixResourceBaseTest.java | 33 
 .../vm/hypervisor/xenserver/cloud-plugin-storage   |  4 ++
 scripts/vm/hypervisor/xenserver/vmopsSnapshot  | 13 +++--
 .../api/query/dao/DiskOfferingJoinDaoImpl.java | 14 ++---
 .../java/com/cloud/network/NetworkServiceImpl.java | 39 --
 .../com/cloud/storage/VolumeApiServiceImpl.java| 60 --
 .../diagnostics/DiagnosticsServiceImpl.java|  4 +-
 .../SecondaryStorageManagerImpl.java   |  4 +-
 ui/src/components/view/DetailSettings.vue  | 45 +---
 ui/src/config/section/network.js   |  2 +-
 ui/src/views/storage/UploadLocalVolume.vue | 58 +++--
 19 files changed, 300 insertions(+), 133 deletions(-)

diff --cc 
engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
index 435474e,ce52b0e..78b2a54
--- a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
@@@ -141,6 -175,18 +141,16 @@@ public class DiskOfferingDaoImpl extend
  }
  
  @Override
+ public List findCustomDiskOfferings() {
+ SearchBuilder sb = createSearchBuilder();
 -sb.and("type", sb.entity().getType(), SearchCriteria.Op.EQ);
+ sb.and("customized", sb.entity().isCustomized(), 
SearchCriteria.Op.EQ);
+ sb.done();
+ SearchCriteria sc = sb.create();
+ sc.setParameters("customized", true);
 -sc.setParameters("type", DiskOffering.Type.Disk.toString());
+ return listBy(sc);
+ }
+ 
+ @Override
  public boolean remove(Long id) {
  DiskOfferingVO diskOffering = createForUpdate();
  diskOffering.setRemoved(new Date());
diff --cc 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index c3987fd,19625a2..fffbd80
--- 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@@ -1904,8 -1915,10 +1915,10 @@@ public abstract class CitrixResourceBas
  final Map details = vmSpec.getDetails();
  if (details != null) {
  final String platformstring = 
details.get(VmDetailConstants.PLATFORM);
+ final String coresPerSocket = 
details.get(VmDetailConstants.CPU_CORE_PER_SOCKET);
  if (platformstring != null && !platformstring.isEmpty()) {
 -final Map platform = 
StringUtils.stringToMap(platformstring);
 +final Map platform = 
com.cloud.utils.StringUtils.stringToMap(platformstring);
+ syncPlatformAndCoresPerSocketSettings(coresPerSocket, 
platform);
  vm.setPlatform(conn, platform);
  } else {
  final String timeoffset = 
details.get(VmDetailConstants.TIME_OFFSET);
@@@ -5671,8 -5684,8 +5684,8 @@@
  URI uri = new URI(secondaryStorageUrl);
  secondaryStorageMountPath = uri.getHost() + ":" + uri.getPath();
  localDir = BASE_MOUNT_POINT_ON_REMOTE + 
UUID.nameUUIDFromBytes(secondaryStorageMountPath.getBytes());
- String mountPoint = mountNfs(conn, secondaryStorageMountPath, 
localDir);
+ String mountPoint = mountNfs(conn, secondaryStorageMountPath, 
localDir, nfsVersion);
 -if (org.apache.commons.lang.StringUtils.isBlank(mountPoint)) {
 +if (StringUtils.isBlank(mountPoint)) {
  return new CopyToSecondaryStorageAnswer(cmd, false, "Could 
not mount secondary storage " + secondaryStorageMountPath + " on host " + 
localDir);
  }
  
diff --cc server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 2f10c78,35de68b..ce7f35a
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/clou

[cloudstack] branch main updated (a6567f3 -> bf70566)

2022-02-02 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


from a6567f3  Fix internet dependent test from 'UriUtilsParametrizedTest' 
class (#5905)
 add 3e92a63  [XenServer/XCP-ng] Pass the image store NFS version on 
storage commands (#5886)
 add 5f07e4d  ui: fix filtering readonly details while VM update (#5887)
 add c1bba2a  Do not restart VPC tiers with cleanup (#5873)
 add fde34df  Make sure other than user VMs can have multiple NICs in a 
network (#5896)
 add 1b3e7f6  Update proper destroy status when SSVM is destroyed. (#5908)
 add ddd311c  [XenServer/XCP-ng] Sync the 'platform' setting according to 
the 'cpu.corespersocket' setting (#5892)
 add 8adb8df  server: find suitable disk offering for volume upload (#5852)
 new bf70566  Merge branch '4.16' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../diagnostics/CopyToSecondaryStorageCommand.java |  8 ++-
 .../com/cloud/vm/VirtualMachineManagerImpl.java|  7 ++-
 .../com/cloud/storage/dao/DiskOfferingDao.java |  2 +
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 10 
 .../storage/image/NfsImageStoreDriverImpl.java | 22 ++--
 .../xenserver/resource/CitrixResourceBase.java | 35 +
 .../resource/XenServerStorageProcessor.java| 18 ---
 .../resource/Xenserver625StorageProcessor.java | 55 +++-
 .../xenserver/resource/CitrixResourceBaseTest.java | 33 
 .../vm/hypervisor/xenserver/cloud-plugin-storage   |  4 ++
 scripts/vm/hypervisor/xenserver/vmopsSnapshot  | 13 +++--
 .../api/query/dao/DiskOfferingJoinDaoImpl.java | 14 ++---
 .../java/com/cloud/network/NetworkServiceImpl.java | 39 --
 .../com/cloud/storage/VolumeApiServiceImpl.java| 60 --
 .../diagnostics/DiagnosticsServiceImpl.java|  4 +-
 .../SecondaryStorageManagerImpl.java   |  4 +-
 ui/src/components/view/DetailSettings.vue  | 45 +---
 ui/src/config/section/network.js   |  2 +-
 ui/src/views/storage/UploadLocalVolume.vue | 58 +++--
 19 files changed, 300 insertions(+), 133 deletions(-)

[cloudstack] branch 4.16 updated: server: find suitable disk offering for volume upload (#5852)

2022-02-02 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 8adb8df  server: find suitable disk offering for volume upload (#5852)
8adb8df is described below

commit 8adb8df2fe8a3b29f19dc571b65ac33987f9be59
Author: Abhishek Kumar 
AuthorDate: Wed Feb 2 16:35:47 2022 +0530

server: find suitable disk offering for volume upload (#5852)

* server: find suitable disk offering for volume upload

Fixes #5696

* fix npe check

* fixes, refactor, rename method and handle custom iops

* ui: allow offering selection

* list only disk offerings

* show name

* revert error check

* use checkaccess

Signed-off-by: Abhishek Kumar 
---
 .../com/cloud/storage/dao/DiskOfferingDao.java |  2 +
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 13 +
 .../api/query/dao/DiskOfferingJoinDaoImpl.java | 14 ++---
 .../com/cloud/storage/VolumeApiServiceImpl.java| 60 --
 ui/src/views/storage/UploadLocalVolume.vue | 58 +++--
 5 files changed, 121 insertions(+), 26 deletions(-)

diff --git 
a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java 
b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java
index 3305752..2425e58 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java
@@ -34,4 +34,6 @@ public interface DiskOfferingDao extends 
GenericDao {
 
 List listAllBySizeAndProvisioningType(long size, 
Storage.ProvisioningType provisioningType);
 
+List findCustomDiskOfferings();
+
 }
diff --git 
a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
index b9fa10c..ce52b0e 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
@@ -29,6 +29,7 @@ import javax.persistence.EntityExistsException;
 import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
 import org.springframework.stereotype.Component;
 
+import com.cloud.offering.DiskOffering;
 import com.cloud.offering.DiskOffering.Type;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.Storage;
@@ -174,6 +175,18 @@ public class DiskOfferingDaoImpl extends 
GenericDaoBase im
 }
 
 @Override
+public List findCustomDiskOfferings() {
+SearchBuilder sb = createSearchBuilder();
+sb.and("type", sb.entity().getType(), SearchCriteria.Op.EQ);
+sb.and("customized", sb.entity().isCustomized(), SearchCriteria.Op.EQ);
+sb.done();
+SearchCriteria sc = sb.create();
+sc.setParameters("customized", true);
+sc.setParameters("type", DiskOffering.Type.Disk.toString());
+return listBy(sc);
+}
+
+@Override
 public boolean remove(Long id) {
 DiskOfferingVO diskOffering = createForUpdate();
 diskOffering.setRemoved(new Date());
diff --git 
a/server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java 
b/server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
index 685f301..a738aed 100644
--- a/server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
@@ -19,11 +19,8 @@ package com.cloud.api.query.dao;
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.api.ApiDBUtils;
-import com.cloud.dc.VsphereStoragePolicyVO;
-import com.cloud.dc.dao.VsphereStoragePolicyDao;
-import com.cloud.server.ResourceTag;
-import com.cloud.user.AccountManager;
+import javax.inject.Inject;
+
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
@@ -32,16 +29,19 @@ import org.apache.cloudstack.context.CallContext;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
+import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.vo.DiskOfferingJoinVO;
+import com.cloud.dc.VsphereStoragePolicyVO;
+import com.cloud.dc.dao.VsphereStoragePolicyDao;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.server.ResourceTag;
+import com.cloud.user.AccountManager;
 import com.cloud.utils.db.Attribute;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
-import javax.inject.Inject;
-
 @Component
 public class DiskOfferingJoinDaoImpl extends 
GenericDaoBase implements

[cloudstack] branch 4.16 updated: [XenServer/XCP-ng] Sync the 'platform' setting according to the 'cpu.corespersocket' setting (#5892)

2022-02-01 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new ddd311c  [XenServer/XCP-ng] Sync the 'platform' setting according to 
the 'cpu.corespersocket' setting (#5892)
ddd311c is described below

commit ddd311c695d1c77b0cca159ab2fd04bd40affa2d
Author: Nicolas Vazquez 
AuthorDate: Wed Feb 2 03:51:47 2022 -0300

[XenServer/XCP-ng] Sync the 'platform' setting according to the 
'cpu.corespersocket' setting (#5892)

* Update platform setting if cpu.corespersocket is set

* Refactor conditions

* Allow empty map but not null
---
 .../xenserver/resource/CitrixResourceBase.java | 16 +--
 .../xenserver/resource/CitrixResourceBaseTest.java | 33 ++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 9348bca..19625a2 100644
--- 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -226,6 +226,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 protected static final HashMap 
s_powerStatesTable;
 
 public static final String XS_TOOLS_ISO_AFTER_70 = "guest-tools.iso";
+protected static final String PLATFORM_CORES_PER_SOCKET_KEY = 
"cores-per-socket";
 
 static {
 s_powerStatesTable = new HashMap();
@@ -1899,13 +1900,25 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 }
 
+protected void syncPlatformAndCoresPerSocketSettings(String 
coresPerSocket, Map platform) {
+if (org.apache.commons.lang3.StringUtils.isBlank(coresPerSocket) || 
platform == null) {
+return;
+}
+if (platform.containsKey(PLATFORM_CORES_PER_SOCKET_KEY)) {
+s_logger.debug("Updating the cores per socket value from: " + 
platform.get(PLATFORM_CORES_PER_SOCKET_KEY) + " to " + coresPerSocket);
+}
+platform.put(PLATFORM_CORES_PER_SOCKET_KEY, coresPerSocket);
+}
+
 protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final 
Connection conn, final VirtualMachineTO vmSpec) throws Exception {
 
 final Map details = vmSpec.getDetails();
 if (details != null) {
 final String platformstring = 
details.get(VmDetailConstants.PLATFORM);
+final String coresPerSocket = 
details.get(VmDetailConstants.CPU_CORE_PER_SOCKET);
 if (platformstring != null && !platformstring.isEmpty()) {
 final Map platform = 
StringUtils.stringToMap(platformstring);
+syncPlatformAndCoresPerSocketSettings(coresPerSocket, 
platform);
 vm.setPlatform(conn, platform);
 } else {
 final String timeoffset = 
details.get(VmDetailConstants.TIME_OFFSET);
@@ -1914,10 +1927,9 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 platform.put(VmDetailConstants.TIME_OFFSET, timeoffset);
 vm.setPlatform(conn, platform);
 }
-final String coresPerSocket = 
details.get(VmDetailConstants.CPU_CORE_PER_SOCKET);
 if (coresPerSocket != null) {
 final Map platform = vm.getPlatform(conn);
-platform.put("cores-per-socket", coresPerSocket);
+syncPlatformAndCoresPerSocketSettings(coresPerSocket, 
platform);
 vm.setPlatform(conn, platform);
 }
 }
diff --git 
a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java
 
b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java
index b1a89c9..e40c7e8 100644
--- 
a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java
+++ 
b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.cloud.utils.StringUtils;
 import org.apache.xmlrpc.XmlRpcException;
 import org.junit.Assert;
 import org.junit.Before;
@@ -51,6 +52,8 @@ import com.xensource.xenapi.PBD;
 import com.xensource.xenapi.SR;
 import com.xensource.xenapi.Types.XenAPIException;
 
+import static 
com.cloud.hypervisor.xenserver

[cloudstack] branch 4.16 updated: Update proper destroy status when SSVM is destroyed. (#5908)

2022-02-01 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 1b3e7f6  Update proper destroy status when SSVM is destroyed. (#5908)
1b3e7f6 is described below

commit 1b3e7f65b7b0ddf6a8bfbd69ae3783356dfc944f
Author: sureshanaparti <12028987+sureshanapa...@users.noreply.github.com>
AuthorDate: Wed Feb 2 10:02:00 2022 +0530

Update proper destroy status when SSVM is destroyed. (#5908)
---
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 99539a2..44e8a11 100644
--- 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -1036,12 +1036,10 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
 if (host != null) {
 s_logger.debug(String.format("Removing host entry for 
secondary storage VM [%s].", vmId));
 _hostDao.remove(host.getId());
-
 _tmplStoreDao.expireDnldUrlsForZone(host.getDataCenterId());
 _volumeStoreDao.expireDnldUrlsForZone(host.getDataCenterId());
-return true;
 }
-return false;
+return true;
 } catch (ResourceUnavailableException e) {
 s_logger.error(String.format("Unable to expunge secondary storage 
[%s] due to [%s].", ssvm.toString(), e.getMessage()), e);
 return false;

[cloudstack] branch 4.16 updated (c1bba2a -> fde34df)

2022-01-31 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from c1bba2a  Do not restart VPC tiers with cleanup (#5873)
 add fde34df  Make sure other than user VMs can have multiple NICs in a 
network (#5896)

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java  | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

[cloudstack] branch 4.16 updated: Do not restart VPC tiers with cleanup (#5873)

2022-01-31 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new c1bba2a  Do not restart VPC tiers with cleanup (#5873)
c1bba2a is described below

commit c1bba2a308e2df1eefb772b8ffa8a3abc2240d9b
Author: dahn 
AuthorDate: Mon Jan 31 13:29:26 2022 +0100

Do not restart VPC tiers with cleanup (#5873)

* do not restart VPC tiers with cleanup

* no option for cleanup for VPC tiers

* Update server/src/main/java/com/cloud/network/NetworkServiceImpl.java

* paramNames

* remove superfluent parameter

Co-authored-by: Daan Hoogland 
Co-authored-by: Daniel Augusto Veronezi Salvador 
<38945620+gutoveron...@users.noreply.github.com>
---
 .../java/com/cloud/network/NetworkServiceImpl.java | 39 --
 ui/src/config/section/network.js   |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java 
b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index de97c29..de13cd7 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -2000,12 +2000,7 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 Account caller = CallContext.current().getCallingAccount();
 
 // Verify network id
-NetworkVO network = _networksDao.findById(networkId);
-if (network == null) {
-// see NetworkVO.java
-
-throwInvalidIdException("unable to find network with specified 
id", String.valueOf(networkId), "networkId");
-}
+NetworkVO network = getNetworkVO(networkId, "Unable to find a network 
with the specified ID.");
 
 // don't allow to delete system network
 if (isNetworkSystem(network)) {
@@ -2035,10 +2030,20 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 @Override
 @ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART, 
eventDescription = "restarting network", async = true)
 public boolean restartNetwork(Long networkId, boolean cleanup, boolean 
makeRedundant, User user) throws ConcurrentOperationException, 
ResourceUnavailableException, InsufficientCapacityException {
+NetworkVO network = getNetworkVO(networkId, "Network with specified id 
doesn't exist");
+return restartNetwork(network, cleanup, makeRedundant, user);
+}
+
+private NetworkVO getNetworkVO(Long networkId, String errMsgFormat) {
 NetworkVO network = _networksDao.findById(networkId);
 if (network == null) {
-throwInvalidIdException("Network with specified id doesn't exist", 
networkId.toString(), "networkId");
+throwInvalidIdException(errMsgFormat, networkId.toString(), 
"networkId");
 }
+return network;
+}
+
+@ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART, 
eventDescription = "restarting network", async = true)
+public boolean restartNetwork(NetworkVO network, boolean cleanup, boolean 
makeRedundant, User user) throws ConcurrentOperationException, 
ResourceUnavailableException, InsufficientCapacityException {
 
 // Don't allow to restart network if it's not in Implemented/Setup 
state
 if (!(network.getState() == Network.State.Implemented || 
network.getState() == Network.State.Setup)) {
@@ -2064,11 +2069,12 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 cleanup = true;
 }
 
-boolean success = _networkMgr.restartNetwork(networkId, callerAccount, 
user, cleanup);
+long id = network.getId();
+boolean success = _networkMgr.restartNetwork(id, callerAccount, user, 
cleanup);
 if (success) {
-s_logger.debug("Network id=" + networkId + " is restarted 
successfully.");
+s_logger.debug(String.format("Network id=%d is restarted 
successfully.",id));
 } else {
-s_logger.warn("Network id=" + networkId + " failed to restart.");
+s_logger.warn(String.format("Network id=%d failed to 
restart.",id));
 }
 
 return success;
@@ -2078,11 +2084,14 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 @ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART, 
eventDescription = "restarting network", async = true)
 public boolean restartNetwork(RestartNetworkCmd cmd) throws 
ConcurrentOperationException, ResourceUnavailableException, 
InsufficientCapacityException {
 // This method restar

[cloudstack] branch 4.16 updated (3e92a63 -> 5f07e4d)

2022-01-31 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 3e92a63  [XenServer/XCP-ng] Pass the image store NFS version on 
storage commands (#5886)
 add 5f07e4d  ui: fix filtering readonly details while VM update (#5887)

No new revisions were added by this update.

Summary of changes:
 ui/src/components/view/DetailSettings.vue | 45 ++-
 1 file changed, 27 insertions(+), 18 deletions(-)

[cloudstack] branch 4.16 updated: [XenServer/XCP-ng] Pass the image store NFS version on storage commands (#5886)

2022-01-30 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.16 by this push:
 new 3e92a63  [XenServer/XCP-ng] Pass the image store NFS version on 
storage commands (#5886)
3e92a63 is described below

commit 3e92a631558cecc63f968a0af58b0c788a039fce
Author: Nicolas Vazquez 
AuthorDate: Mon Jan 31 03:51:13 2022 -0300

[XenServer/XCP-ng] Pass the image store NFS version on storage commands 
(#5886)

* Add NFS version to mount command

* Remove extra line

* Extend NFS version to mount secondary storage

* Unused import

* Refactor NFS version to be granular

* Make use of the ConfigKey on the NFS version setting value
---
 .../diagnostics/CopyToSecondaryStorageCommand.java |  8 +++-
 .../storage/image/NfsImageStoreDriverImpl.java | 22 ++---
 .../xenserver/resource/CitrixResourceBase.java | 19 
 .../resource/XenServerStorageProcessor.java| 18 ---
 .../resource/Xenserver625StorageProcessor.java | 55 +-
 .../vm/hypervisor/xenserver/cloud-plugin-storage   |  4 ++
 scripts/vm/hypervisor/xenserver/vmopsSnapshot  | 13 +++--
 .../diagnostics/DiagnosticsServiceImpl.java|  4 +-
 8 files changed, 79 insertions(+), 64 deletions(-)

diff --git 
a/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
 
b/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
index 8e76aad..5cd4991 100644
--- 
a/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
+++ 
b/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
@@ -22,11 +22,13 @@ public class CopyToSecondaryStorageCommand extends 
StorageSubSystemCommand {
 private String secondaryStorageUrl;
 private String systemVmIp;
 private String fileName;
+private String nfsVersion;
 
-public CopyToSecondaryStorageCommand(String secondaryStorageUrl, String 
systemVmIp, String fileName) {
+public CopyToSecondaryStorageCommand(String secondaryStorageUrl, String 
systemVmIp, String fileName, String nfsVersion) {
 this.secondaryStorageUrl = secondaryStorageUrl;
 this.systemVmIp = systemVmIp;
 this.fileName = fileName;
+this.nfsVersion = nfsVersion;
 }
 
 public String getSecondaryStorageUrl() {
@@ -41,6 +43,10 @@ public class CopyToSecondaryStorageCommand extends 
StorageSubSystemCommand {
 return fileName;
 }
 
+public String getNfsVersion() {
+return nfsVersion;
+}
+
 @Override
 public boolean executeInSequence() {
 return false;
diff --git 
a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java
 
b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java
index aea7922..6e5c979 100755
--- 
a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java
+++ 
b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java
@@ -18,31 +18,15 @@
  */
 package org.apache.cloudstack.storage.image;
 
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao;
-
 import com.cloud.capacity.CapacityManager;
 
 public abstract class NfsImageStoreDriverImpl extends BaseImageStoreDriverImpl 
{
 
-@Inject
-ImageStoreDetailsDao _imageStoreDetailsDao;
-
 /**
- * Retrieve NFS version to be used for imgStoreId store, if provided in 
image_store_details table
- * @param imgStoreId store id
- * @return "secstorage.nfs.version" associated value for imgStoreId in 
image_store_details table if exists, null if not
+ * Retrieve the NFS version to be used for the imgStoreId store
  */
-protected String getNfsVersion(long imgStoreId){
-Map imgStoreDetails = 
_imageStoreDetailsDao.getDetails(imgStoreId);
-String nfsVersionKey = CapacityManager.ImageStoreNFSVersion.key();
-if (imgStoreDetails != null && 
imgStoreDetails.containsKey(nfsVersionKey)){
-return imgStoreDetails.get(nfsVersionKey);
-}
-return null;
+protected String getNfsVersion(long imgStoreId) {
+return CapacityManager.ImageStoreNFSVersion.valueIn(imgStoreId);
 }
 
 }
diff --git 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index a971576..9348bca 100644
--- 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/main/java/co

[cloudstack] 01/01: Merge branch '4.16' into main

2022-01-30 Thread sureshanaparti

This is an automated email from the ASF dual-hosted git repository.

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

commit 571339f8724fc70c472f55f254125f0c6070d5de
Merge: f610e89 1fc7d70
Author: Suresh Kumar Anaparti 
AuthorDate: Mon Jan 31 00:10:03 2022 +0530

Merge branch '4.16' into main

 .../java/com/cloud/usage/UsageIPAddressVO.java |  19 +++-
 .../com/cloud/usage/UsageLoadBalancerPolicyVO.java |  18 +++-
 .../com/cloud/usage/UsageNetworkOfferingVO.java|  17 +++-
 .../com/cloud/usage/UsagePortForwardingRuleVO.java |  18 +++-
 .../java/com/cloud/usage/UsageSecurityGroupVO.java |  17 +++-
 .../com/cloud/usage/UsageSnapshotOnPrimaryVO.java  |  16 ++-
 .../main/java/com/cloud/usage/UsageStorageVO.java  |  20 +++-
 .../java/com/cloud/usage/UsageVMInstanceVO.java|  17 +++-
 .../java/com/cloud/usage/UsageVMSnapshotVO.java|  17 +++-
 .../main/java/com/cloud/usage/UsageVPNUserVO.java  |  17 +++-
 .../main/java/com/cloud/usage/UsageVolumeVO.java   |  18 +++-
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |   6 +-
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |  12 +--
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |  12 +--
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |  16 +--
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java|  12 +--
 .../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java |   6 +-
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java|  12 +--
 .../main/java/com/cloud/user/UserStatsLogVO.java   |  15 ++-
 .../resources/META-INF/db/schema-41600to41610.sql  | 107 +
 .../cloud/usage/dao/UsageStorageDaoImplTest.java   |   4 +-
 .../cloud/usage/parser/IPAddressUsageParser.java   |   4 +-
 .../usage/parser/LoadBalancerUsageParser.java  |   4 +-
 .../usage/parser/PortForwardingUsageParser.java|   4 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |   4 +-
 .../usage/parser/VMSnapshotOnPrimaryParser.java|   2 +-
 .../cloud/usage/parser/VMSnapshotUsageParser.java  |   4 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |   4 +-
 28 files changed, 342 insertions(+), 80 deletions(-)

1 2 3 >

1 - 100 of 208 matches

Mail list logo