update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / mon / MonMap.cc

diff --git a/ceph/src/test/mon/MonMap.cc b/ceph/src/test/mon/MonMap.cc
index 84d8b2691befd199dccb921998581a758c3a8c19..f3c00bfd79442746c3521ca25fed58aef47a03b6 100644 (file)
--- a/ceph/src/test/mon/MonMap.cc
+++ b/ceph/src/test/mon/MonMap.cc
@@ -97,9 +97,9 @@ TEST_F(MonMapTest, build_initial_config_from_dns) {
 
 
   CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_MON))->get();
-  cct->_conf->set_val("mon_dns_srv_name", "cephmon", false);
+  cct->_conf.set_val("mon_dns_srv_name", "cephmon");
   MonMap monmap;
-  int r = monmap.build_initial(cct, std::cerr);
+  int r = monmap.build_initial(cct, false, std::cerr);
 
   ASSERT_EQ(r, 0);
   ASSERT_EQ(monmap.mon_addr.size(), (unsigned int)3);
@@ -136,7 +136,7 @@ TEST_F(MonMapTest, build_initial_config_from_dns_fail) {
   CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_MON))->get();
   // using default value of mon_dns_srv_name option
   MonMap monmap;
-  int r = monmap.build_initial(cct, std::cerr);
+  int r = monmap.build_initial(cct, false, std::cerr);
 
   ASSERT_EQ(r, -ENOENT);
   ASSERT_EQ(monmap.mon_addr.size(), (unsigned int)0);
@@ -195,9 +195,9 @@ TEST_F(MonMapTest, build_initial_config_from_dns_with_domain) {
 
 
   CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_MON))->get();
-  cct->_conf->set_val("mon_dns_srv_name", "cephmon_ceph.com", false);
+  cct->_conf.set_val("mon_dns_srv_name", "cephmon_ceph.com");
   MonMap monmap;
-  int r = monmap.build_initial(cct, std::cerr);
+  int r = monmap.build_initial(cct, false, std::cerr);
 
   ASSERT_EQ(r, 0);
   ASSERT_EQ(monmap.mon_addr.size(), (unsigned int)3);