You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sh...@apache.org on 2021/05/18 09:50:26 UTC
[cloudstack] branch master updated (6b9f3fb -> 426f14b)
This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 6b9f3fb Improve logs on KVMHAVMActivityChecker (#4705)
add 493d6a0 ui: Display Zone Name instead of Zone UUID in list view (#5011)
add 4ecef4b ui: prevent same string docHelp override (#5014)
add aa28954 vmware: Fix deploy-as-is not honoured on upload from local (#5015)
add 1b28ea1 network: fix dhcp/password/metadata issues on shared networks with multiple subnets (#5013)
add 57c8286 ui: pass podid for basic zone createvlaniprange (#5022)
add cc7f426 ui: Allow IP range creation for Physical Network - Guest Traffic in Basic Zones (#5020)
add 7557910 api/server: cpu, memory values with overprovisioning in metrics response (#4795)
add dc91a1f server: destroy ssvm, cpvm on last host maintenance (#4644)
add e2183ed forceha: fix two issues when (1)stop vm from inside (2) force remove host (#4647)
add 2286c8d Merge remote-tracking branch 'origin/4.14' into 4.15
add 06454ff tests: Fix in Marvin migrate_vm_with_volume (#5023)
new 426f14b Merge remote-tracking branch 'apache/4.15'
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/agent/api/Command.java | 9 ++
.../java/com/cloud/resource/ResourceState.java | 1 +
.../template/GetUploadParamsForTemplateCmd.java | 10 ++
.../cloudstack/api/response/HostResponse.java | 8 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../java/com/cloud/network/IpAddressManager.java | 3 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 8 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 10 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 15 ++-
.../cloudstack/response/HostMetricsResponse.java | 47 ++++-----
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 ++++-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 14 +--
.../consoleproxy/ConsoleProxyManagerImpl.java | 7 ++
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 108 +++++++++++++--------
.../com/cloud/network/IpAddressManagerImpl.java | 28 +++---
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../com/cloud/resource/ResourceManagerImpl.java | 78 ++++++++-------
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../upload/params/TemplateUploadParams.java | 4 +-
.../storage/upload/params/UploadParamsBase.java | 6 +-
.../com/cloud/template/TemplateAdapterBase.java | 4 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 ++
.../SecondaryStorageManagerImpl.java | 7 ++
systemvm/debian/opt/cloud/bin/configure.py | 1 +
tools/marvin/marvin/lib/base.py | 2 +-
ui/package.json | 2 +
.../scripts/consoleproxy.sh => ui/postbuild.sh | 25 ++---
.../scripts/consoleproxy.sh => ui/prebuild.sh | 36 ++++---
ui/public/config.json | 6 +-
ui/src/config/section/offering.js | 2 +-
ui/src/utils/plugins.js | 2 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 1 -
ui/src/views/infra/network/IpRangesTabPublic.vue | 87 +++++++++++++----
ui/src/views/infra/network/TrafficTypesTab.vue | 55 ++++++++++-
ui/src/views/network/CreateVlanIpRange.vue | 49 ++++++++++
35 files changed, 471 insertions(+), 204 deletions(-)
copy systemvm/agent/scripts/consoleproxy.sh => ui/postbuild.sh (68%)
copy systemvm/agent/scripts/consoleproxy.sh => ui/prebuild.sh (54%)
[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.15'
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 426f14b6ed87c3dc072ee1d95d84892fc624bcf0
Merge: 6b9f3fb 06454ff
Author: Abhishek Kumar <ab...@gmail.com>
AuthorDate: Tue May 18 15:19:20 2021 +0530
Merge remote-tracking branch 'apache/4.15'
Signed-off-by: Abhishek Kumar <ab...@gmail.com>
api/src/main/java/com/cloud/agent/api/Command.java | 9 ++
.../java/com/cloud/resource/ResourceState.java | 1 +
.../template/GetUploadParamsForTemplateCmd.java | 10 ++
.../cloudstack/api/response/HostResponse.java | 8 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../java/com/cloud/network/IpAddressManager.java | 3 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 8 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 10 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 15 ++-
.../cloudstack/response/HostMetricsResponse.java | 47 ++++-----
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 ++++-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 14 +--
.../consoleproxy/ConsoleProxyManagerImpl.java | 7 ++
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 108 +++++++++++++--------
.../com/cloud/network/IpAddressManagerImpl.java | 28 +++---
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../com/cloud/resource/ResourceManagerImpl.java | 78 ++++++++-------
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../upload/params/TemplateUploadParams.java | 4 +-
.../storage/upload/params/UploadParamsBase.java | 6 +-
.../com/cloud/template/TemplateAdapterBase.java | 4 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 ++
.../SecondaryStorageManagerImpl.java | 7 ++
systemvm/debian/opt/cloud/bin/configure.py | 1 +
tools/marvin/marvin/lib/base.py | 2 +-
ui/package.json | 2 +
ui/postbuild.sh | 36 +++++++
ui/prebuild.sh | 47 +++++++++
ui/public/config.json | 6 +-
ui/src/config/section/offering.js | 2 +-
ui/src/utils/plugins.js | 2 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 1 -
ui/src/views/infra/network/IpRangesTabPublic.vue | 87 +++++++++++++----
ui/src/views/infra/network/TrafficTypesTab.vue | 55 ++++++++++-
ui/src/views/network/CreateVlanIpRange.vue | 49 ++++++++++
35 files changed, 515 insertions(+), 182 deletions(-)
diff --cc plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
index 30a3fb7,05e2f5f..7a557e3
--- a/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
+++ b/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
@@@ -17,14 -17,11 +17,15 @@@
package org.apache.cloudstack.response;
- import com.cloud.serializer.Param;
- import com.cloud.utils.exception.CloudRuntimeException;
- import com.google.gson.annotations.SerializedName;
++import java.text.DecimalFormat;
++import java.text.ParseException;
++
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.outofbandmanagement.OutOfBandManagement;
- import java.text.DecimalFormat;
- import java.text.ParseException;
+ import com.cloud.serializer.Param;
++import com.cloud.utils.exception.CloudRuntimeException;
+ import com.google.gson.annotations.SerializedName;
public class HostMetricsResponse extends HostResponse {
@SerializedName("powerstate")
diff --cc plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index 3cbcc85,65b55f7..3cdb843
--- a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@@ -76,11 -78,10 +78,11 @@@ import com.cloud.storage.dao.VMTemplate
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.snapshot.SnapshotManager;
import com.cloud.template.TemplateManager;
+import com.cloud.utils.Pair;
+ import com.cloud.vm.VMInstanceVO;
+ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.VMInstanceDao;
- import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
-
public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver {
@Override
public Map<String, String> getCapabilities() {
diff --cc server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
index 3a6e184,99c9ae4..9ba8c1f
--- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
@@@ -865,12 -866,12 +867,16 @@@ public class IpAddressManagerImpl exten
sc.setJoinParameters("vlan", "networkId", guestNetworkId);
errorMessage.append(", network id=" + guestNetworkId);
}
+ if (requestedGateway != null) {
+ sc.setJoinParameters("vlan", "vlanGateway", requestedGateway);
+ errorMessage.append(", requested gateway=" + requestedGateway);
+ }
sc.setJoinParameters("vlan", "type", vlanUse);
-
+ String routerIpAddress = null;
+ if (network != null) {
+ NetworkDetailVO routerIpDetail = _networkDetailsDao.findDetail(network.getId(), ApiConstants.ROUTER_IP);
+ routerIpAddress = routerIpDetail != null ? routerIpDetail.getValue() : null;
+ }
if (requestedIp != null) {
sc.addAnd("address", SearchCriteria.Op.EQ, requestedIp);
errorMessage.append(": requested ip " + requestedIp + " is not available");