From 1dd064c8a9f7134d6eb689e28fbcb634228f42c0 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 12 Jan 2023 13:40:53 +0100 Subject: [PATCH 1/3] server: fix cannot update vm if it uses unconstraint dynamic offering (#7077) Co-authored-by: Abhishek Kumar --- .../src/main/java/com/cloud/service/ServiceOfferingVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java index 6e309376924..f34a89b42f8 100644 --- a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java +++ b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java @@ -327,7 +327,7 @@ public class ServiceOfferingVO implements ServiceOffering { } public boolean isCustomCpuSpeedSupported() { - return isCustomized() && getDetail("minCPU") != null; + return isCustomized() && speed == null; } @Override From 4d80ea68465641b405beb5b531106f92cf904e46 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 12 Jan 2023 14:04:09 +0100 Subject: [PATCH 2/3] UI: fix diskofferingstrictness is not passed when create compute offering (#7072) --- ui/public/locales/en.json | 1 + ui/src/views/offering/AddComputeOffering.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 9bb0df89bb2..a047af20fd5 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -1977,6 +1977,7 @@ "label.rootdisk": "ROOT disk", "label.rootdiskcontrollertype": "Root disk controller", "label.rootdiskcontrollertypekvm": "Root disk controller", +"label.rootdisksize": "Root disk size (GB)", "label.router.health.check.last.updated": "Last updated", "label.router.health.check.name": "Check name", "label.router.health.check.success": "Success", diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue index 2022a53b186..040de18c946 100644 --- a/ui/src/views/offering/AddComputeOffering.vue +++ b/ui/src/views/offering/AddComputeOffering.vue @@ -560,7 +560,7 @@ - + From e5158b29ee9a950b57bd25333ed20364998d8988 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 12 Jan 2023 19:50:48 +0530 Subject: [PATCH 3/3] vmware: encode disk path for URL based access (#6989) --- .../hypervisor/vmware/util/VmwareContext.java | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java index 14c8667cbd6..0c7487cfab7 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java @@ -16,29 +16,6 @@ // under the License. package com.cloud.hypervisor.vmware.util; -import com.cloud.hypervisor.vmware.mo.DatacenterMO; -import com.cloud.hypervisor.vmware.mo.DatastoreFile; -import com.cloud.utils.ActionDelegate; -import com.cloud.utils.StringUtils; -import com.vmware.pbm.PbmPortType; -import com.vmware.pbm.PbmServiceInstanceContent; -import com.vmware.vim25.ManagedObjectReference; -import com.vmware.vim25.ObjectContent; -import com.vmware.vim25.ObjectSpec; -import com.vmware.vim25.PropertyFilterSpec; -import com.vmware.vim25.PropertySpec; -import com.vmware.vim25.ServiceContent; -import com.vmware.vim25.TaskInfo; -import com.vmware.vim25.TraversalSpec; -import com.vmware.vim25.VimPortType; -import org.apache.cloudstack.utils.security.SSLUtils; -import org.apache.cloudstack.utils.security.SecureSSLSocketFactory; -import org.apache.log4j.Logger; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLSession; -import javax.xml.ws.soap.SOAPFaultException; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -59,6 +36,31 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLSession; +import javax.xml.ws.soap.SOAPFaultException; + +import org.apache.cloudstack.utils.security.SSLUtils; +import org.apache.cloudstack.utils.security.SecureSSLSocketFactory; +import org.apache.log4j.Logger; + +import com.cloud.hypervisor.vmware.mo.DatacenterMO; +import com.cloud.hypervisor.vmware.mo.DatastoreFile; +import com.cloud.utils.ActionDelegate; +import com.cloud.utils.StringUtils; +import com.vmware.pbm.PbmPortType; +import com.vmware.pbm.PbmServiceInstanceContent; +import com.vmware.vim25.ManagedObjectReference; +import com.vmware.vim25.ObjectContent; +import com.vmware.vim25.ObjectSpec; +import com.vmware.vim25.PropertyFilterSpec; +import com.vmware.vim25.PropertySpec; +import com.vmware.vim25.ServiceContent; +import com.vmware.vim25.TaskInfo; +import com.vmware.vim25.TraversalSpec; +import com.vmware.vim25.VimPortType; + public class VmwareContext { private static final Logger s_logger = Logger.getLogger(VmwareContext.class); @@ -631,12 +633,12 @@ public class VmwareContext { sb.append("https://"); sb.append(_serverAddress); sb.append("/folder/"); - sb.append(relativePath); try { + sb.append(URLEncoder.encode(relativePath, "UTF-8")); sb.append("?dcPath=").append(URLEncoder.encode(dcName, "UTF-8")); sb.append("&dsName=").append(URLEncoder.encode(datastoreName, "UTF-8")); } catch (UnsupportedEncodingException e) { - s_logger.error("Unable to encode URL. dcPath : " + dcName + ", dsName :" + datastoreName, e); + s_logger.error(String.format("Unable to encode URL. relativePath : %s, dcPath : %s, dsName : %s", relativePath, dcName, datastoreName), e); } return sb.toString(); }