utils: test the escaped colons of an IPv6 Ceph monitor without a port

composeOptionForMonHosts escapes every ':' of a monitor, because the colons
separate the options of the rbd: string. That includes the colons of an IPv6
address, also when the pool has no port to add. Test that case, and make
addPortToRbdMonitor, which is only used by RbdUtils itself, protected.

Author: weizhouapache

utils/src/main/java/com/cloud/utils/RbdUtils.java

@@ -46,7 +46,7 @@ public static String getRbdMonitors(String sourceHost, int sourcePort) {
         return String.join(",", monitors);
     }
 
-    public static String addPortToRbdMonitor(String monitor, int port) {
+    protected static String addPortToRbdMonitor(String monitor, int port) {
         if (monitor.startsWith("[")) {
             // IPv6 address in square brackets, which has a port if followed by ":<port>"
             return monitor.contains("]:") ? monitor : monitor + ":" + port;

utils/src/test/java/com/cloud/utils/RbdUtilsTest.java

@@ -119,6 +119,7 @@ public void testComposeOptionForMonHostsEscapesEveryColonOfAnIpv6Monitor() {
     @Test
     public void testComposeOptionForMonHostsWithoutAPortLeavesTheMonitorAlone() {
         assertEquals("ceph-monitor", RbdUtils.composeOptionForMonHosts("ceph-monitor", 0));
+        assertEquals("fd00\\:\\:1", RbdUtils.composeOptionForMonHosts("fd00::1", 0));
     }
 
     @Test