From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Jul 2018 21:21:37 +0000 (-0500)
Subject: mon/MonMap: use addrvecs for test instances
X-Git-Tag: v14.1.0~484^2~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3045133dda9161cc2c21dd9feaa76c8c5b0c8e22;p=ceph-ci.git

mon/MonMap: use addrvecs for test instances

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 458a3a1acd0..94a6c258c3c 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -230,29 +230,29 @@ void MonMap::generate_test_instances(list<MonMap*>& o)
   o.back()->epoch = 1;
   o.back()->last_changed = utime_t(123, 456);
   o.back()->created = utime_t(789, 101112);
-  o.back()->add("one", entity_addr_t());
+  o.back()->add("one", entity_addrvec_t());
 
   MonMap *m = new MonMap;
   {
     m->epoch = 1;
     m->last_changed = utime_t(123, 456);
 
-    entity_addr_t empty_addr_one;
-    empty_addr_one.set_nonce(1);
+    entity_addrvec_t empty_addr_one = entity_addrvec_t(entity_addr_t());
+    empty_addr_one.v[0].set_nonce(1);
     m->add("empty_addr_one", empty_addr_one);
-    entity_addr_t empty_addr_two;
-    empty_addr_two.set_nonce(2);
-    m->add("empty_adrr_two", empty_addr_two);
+    entity_addrvec_t empty_addr_two = entity_addrvec_t(entity_addr_t());
+    empty_addr_two.v[0].set_nonce(2);
+    m->add("empty_addr_two", empty_addr_two);
 
     const char *local_pub_addr_s = "127.0.1.2";
 
     const char *end_p = local_pub_addr_s + strlen(local_pub_addr_s);
-    entity_addr_t local_pub_addr;
+    entity_addrvec_t local_pub_addr;
     local_pub_addr.parse(local_pub_addr_s, &end_p);
 
     m->add(mon_info_t("filled_pub_addr", entity_addrvec_t(local_pub_addr), 1));
 
-    m->add("empty_addr_zero", entity_addr_t());
+    m->add("empty_addr_zero", entity_addrvec_t());
   }
   o.push_back(m);
 }