From d4580f3e50a08ae99f9ab761e4cb0e4ad7341b5d Mon Sep 17 00:00:00 2001 From: davidjumani Date: Tue, 5 Jan 2021 12:54:26 +0530 Subject: [PATCH 1/2] networkorchestrator: Fix typo in exception message (#4559) --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 9aa02360453..8a3c07238c3 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -2352,7 +2352,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // Validate network offering if (ntwkOff.getState() != NetworkOffering.State.Enabled) { // see NetworkOfferingVO - final InvalidParameterValueException ex = new InvalidParameterValueException("Can't use specified network offering id as its stat is not " + NetworkOffering.State.Enabled); + final InvalidParameterValueException ex = new InvalidParameterValueException("Can't use specified network offering id as its state is not " + NetworkOffering.State.Enabled); ex.addProxyObject(ntwkOff.getUuid(), "networkOfferingId"); throw ex; } From c82688a3559929fafa388192b949f4136b5d3d27 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 5 Jan 2021 15:23:38 +0530 Subject: [PATCH 2/2] kvm: Fix double-escape issue while creating rbd disk options (#4568) This fixes issue introduced in c3554ec31dafbdfaa0ed646afb17a6f3378571f5 which enable block of code that will double escape rados host/monitor port. Signed-off-by: Rohit Yadav --- .../java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java | 2 +- .../com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java index 221a3d7c180..5b4a61058d5 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java @@ -29,7 +29,7 @@ public class KVMPhysicalDisk { rbdOpts = "rbd:" + image; rbdOpts += ":mon_host=" + monHost; if (monPort > 0) { - rbdOpts += "\\\\:" + monPort; + rbdOpts += "\\:" + monPort; } if (authUserName == null) { diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java index bd644c85cd8..cf39dceb1a5 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java @@ -25,7 +25,7 @@ public class KVMPhysicalDiskTest extends TestCase { public void testRBDStringBuilder() { assertEquals(KVMPhysicalDisk.RBDStringBuilder("ceph-monitor", 8000, "admin", "supersecret", "volume1"), - "rbd:volume1:mon_host=ceph-monitor\\\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30"); + "rbd:volume1:mon_host=ceph-monitor\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30"); } public void testAttributes() {