kvm: Fix double-escape issue while creating rbd disk options (#4568)

rohityadavcloud · web-flow · commit c82688a35599 · 2021-01-05T15:23:38.000+05:30
This fixes issue introduced in c3554ec which enable block of code that will double escape rados host/monitor port. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
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
@@ -29,7 +29,7 @@ public static String RBDStringBuilder(String monHost, int monPort, String authUs
         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
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static String RBDStringBuilder(String monHost, int monPort, String authUs`
`29`	`29`	`rbdOpts = "rbd:" + image;`
`30`	`30`	`rbdOpts += ":mon_host=" + monHost;`
`31`	`31`	`if (monPort > 0) {`
`32`		`- rbdOpts += "\\\\:" + monPort;`
	`32`	`+ rbdOpts += "\\:" + monPort;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (authUserName == null) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class KVMPhysicalDiskTest extends TestCase {`
`25`	`25`
`26`	`26`	`public void testRBDStringBuilder() {`
`27`	`27`	`assertEquals(KVMPhysicalDisk.RBDStringBuilder("ceph-monitor", 8000, "admin", "supersecret", "volume1"),`
`28`		`- "rbd:volume1:mon_host=ceph-monitor\\\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30");`
	`28`	`+ "rbd:volume1:mon_host=ceph-monitor\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30");`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public void testAttributes() {`