From: Kefu Chai <kchai@redhat.com>
Date: Sat, 29 Oct 2016 17:19:06 +0000 (+0800)
Subject: ceph-rest-api: understand the new style entity_addr_t representation
X-Git-Tag: v11.1.0~474^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11686%2Fhead;p=ceph.git

ceph-rest-api: understand the new style entity_addr_t representation

the new entity_addr_t representation was introduced by 3561eb3, we
should update ceph_rest_api.py accordingly.

Fixes: http://tracker.ceph.com/issues/17742
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/ceph_rest_api.py b/src/pybind/ceph_rest_api.py
index 2dfe6b6140c3..9bae3ef62a00 100755
--- a/src/pybind/ceph_rest_api.py
+++ b/src/pybind/ceph_rest_api.py
@@ -111,9 +111,18 @@ def api_setup(app, conf, cluster, clientname, clientid, args):
         app.ceph_baseurl = app.ceph_baseurl[:-1]
     addr = app.ceph_cluster.conf_get('public_addr') or DEFAULT_ADDR
 
-    # remove any nonce from the conf value
-    addr = addr.split('/')[0]
-    addr, port = addr.rsplit(':', 1)
+    if addr == '-':
+        addr = None
+        port = None
+    else:
+        # remove the type prefix from the conf value if any
+        for t in ('legacy:', 'msgr2:'):
+            if addr.startswith(t):
+                addr = addr[len(t):]
+                break
+        # remove any nonce from the conf value
+        addr = addr.split('/')[0]
+        addr, port = addr.rsplit(':', 1)
     addr = addr or DEFAULT_ADDR
     port = port or DEFAULT_PORT
     port = int(port)