[#3106] Return default relationship

diff --git a/src/hooks/dhcp/high_availability/ha_relationship_mapper.h b/src/hooks/dhcp/high_availability/ha_relationship_mapper.h
index 2f9c7cf83f556149cc3dc3271c09ae0072b85941..2f70d8d09aaeba37bffd0866f14d19c7ee43c4a7 100644 (file)
--- a/src/hooks/dhcp/high_availability/ha_relationship_mapper.h
+++ b/src/hooks/dhcp/high_availability/ha_relationship_mapper.h
@@ -70,13 +70,12 @@ public:
         return (obj->second);
     }
 
-    /// @brief Returns the sole mapped object.
+    /// @brief Returns the default mapped object.
     ///
     /// @return Mapped object.
-    /// @throw InvalidOperation when there is no mapped object or if there
-    /// are multiple mapped objects.
+    /// @throw InvalidOperation when there is no mapped object.
     MappedTypePtr get() const {
-        if (vector_.empty() || vector_.size() > 1) {
+        if (vector_.empty()) {
             isc_throw(InvalidOperation, "expected one relationship to be configured");
         }
         return (vector_[0]);

diff --git a/src/hooks/dhcp/high_availability/tests/ha_relationship_mapper_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_relationship_mapper_unittest.cc
index 3be801d96ddec618b9db949384061d9c60407df2..3d37c8cd7d0bc1db14e67f9abb0039f1e82580a5 100644 (file)
--- a/src/hooks/dhcp/high_availability/tests/ha_relationship_mapper_unittest.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_relationship_mapper_unittest.cc
@@ -64,18 +64,6 @@ TEST(HARelationshipMapper, mapGetAll) {
     EXPECT_EQ(rel2, all[1]);
 }
 
-/// Tests that getting a sole mapped object fails when there are multiple.
-TEST(HARelationshipMapper, multipleMappingsGetError) {
-    HARelationshipMapper<HAConfig> mapper;
-
-    auto rel1 = HAConfig::create();
-    auto rel2 = HAConfig::create();
-    EXPECT_NO_THROW(mapper.map("server1", rel1));
-    EXPECT_NO_THROW(mapper.map("server2", rel2));
-
-    EXPECT_THROW(mapper.get(), InvalidOperation);
-}
-
 /// Tests that the same server can't be associated with many relationships.
 TEST(HARelationshipMapper, existingMappingError) {
     HARelationshipMapper<HAConfig> mapper;