enh(group) : adding constructor for host_group and service_group

include/com/centreon/broker/neb/host_group.hh

@@ -38,9 +38,13 @@ namespace neb {
 class host_group : public group {
  public:
   host_group();
+  host_group(uint32_t poller_id,
+             uint32_t id,
+             bool enabled,
+             std::string const& name);
   host_group(host_group const& other);
   ~host_group();
-  host_group& operator=(host_group const& other);
+  host_group& operator=(host_group const& other) = delete;
   constexpr static uint32_t static_type() {
     return io::events::data_type<io::events::neb, neb::de_host_group>::value;
   }

include/com/centreon/broker/neb/service_group.hh

@@ -39,9 +39,13 @@ namespace neb {
 class service_group : public group {
  public:
   service_group();
+  service_group(uint32_t poller_id,
+                uint32_t id,
+                bool enabled,
+                std::string const& name);
   service_group(service_group const& other);
   ~service_group();
-  service_group& operator=(service_group const& other);
+  service_group& operator=(service_group const&) = delete;
   constexpr static uint32_t static_type() {
     return io::events::data_type<io::events::neb, neb::de_service_group>::value;
   }

src/cbmod/callbacks.cc

@@ -908,12 +908,11 @@ int neb::callback_group(int callback_type, void* data) {
       engine::hostgroup const* host_group(
           static_cast<engine::hostgroup*>(group_data->object_ptr));
       if (!host_group->get_group_name().empty()) {
-        std::shared_ptr<neb::host_group> new_hg(new neb::host_group);
-        new_hg->poller_id = config::applier::state::instance().poller_id();
-        new_hg->id = host_group->get_id();
-        new_hg->enabled = (group_data->type != NEBTYPE_HOSTGROUP_DELETE &&
-                           !host_group->members.empty());
-        new_hg->name = host_group->get_group_name();
+        std::shared_ptr<neb::host_group> new_hg = std::make_shared<neb::host_group>(
+            config::applier::state::instance().poller_id(),
+            host_group->get_id(),
+            (group_data->type != NEBTYPE_HOSTGROUP_DELETE && !host_group->members.empty()),
+            host_group->get_group_name());
 
         // Send host group event.
         if (new_hg->id) {
@@ -932,11 +931,13 @@ int neb::callback_group(int callback_type, void* data) {
           static_cast<engine::servicegroup*>(group_data->object_ptr));
       if (!service_group->get_group_name().empty()) {
         std::shared_ptr<neb::service_group> new_sg(new neb::service_group);
-        new_sg->poller_id = config::applier::state::instance().poller_id();
-        new_sg->id = service_group->get_id();
-        new_sg->enabled = (group_data->type != NEBTYPE_SERVICEGROUP_DELETE &&
-                           !service_group->members.empty());
-        new_sg->name = service_group->get_group_name();
+        auto s_g = std::make_shared<neb::service_group>(
+            config::applier::state::instance().poller_id(),
+            new_sg->id = service_group->get_id(),
+            new_sg->enabled =
+                (group_data->type != NEBTYPE_SERVICEGROUP_DELETE &&
+                 !service_group->members.empty()),
+            new_sg->name = service_group->get_group_name());
 
         // Send service group event.
         if (new_sg->id) {

src/ccb_neb/host_group.cc

@@ -34,6 +34,12 @@ using namespace com::centreon::broker::neb;
  */
 host_group::host_group() : group(host_group::static_type()) {}
 
+host_group::host_group(uint32_t poller_id,
+                       uint32_t id,
+                       bool enabled,
+                       std::string const& name)
+    : group(host_group::static_type()) {}
+
 /**
  *  @brief Copy constructor.
  *
@@ -57,10 +63,10 @@ host_group::~host_group() {}
  *
  *  @return This object.
  */
-host_group& host_group::operator=(host_group const& other) {
+/*host_group& host_group::operator=(host_group const& other) {
   group::operator=(other);
   return *this;
-}
+}*/
 
 /**************************************
  *                                     *
@@ -81,8 +87,6 @@ mapping::entry const host_group::entries[] = {
     mapping::entry()};
 
 // Operations.
-static io::data* new_host_group() {
-  return new host_group;
-}
+static io::data* new_host_group() { return new host_group; }
 io::event_info::event_operations const host_group::operations = {
     &new_host_group};

src/ccb_neb/service_group.cc

@@ -34,6 +34,12 @@ using namespace com::centreon::broker::neb;
  */
 service_group::service_group() : group(service_group::static_type()) {}
 
+service_group::service_group(uint32_t poller_id,
+                             uint32_t id,
+                             bool enabled,
+                             std::string const& name)
+    : group(service_group::static_type()) {}
+
 /**
  *  @brief Copy constructor.
  *
@@ -59,10 +65,6 @@ service_group::~service_group() {}
  *
  *  @return This object.
  */
-service_group& service_group::operator=(service_group const& other) {
-  group::operator=(other);
-  return *this;
-}
 
 /**************************************
  *                                     *
@@ -83,8 +85,6 @@ mapping::entry const service_group::entries[] = {
     mapping::entry()};
 
 // Operations.
-static io::data* new_service_group() {
-  return new service_group;
-}
+static io::data* new_service_group() { return new service_group; }
 io::event_info::event_operations const service_group::operations = {
     &new_service_group};

tests/broker/CMakeLists.txt

@@ -89,6 +89,7 @@ add_executable(ccb_ut
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/host.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/host_check.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/host_dependency.cc
+  ${CMAKE_SOURCE_DIR}/tests/broker/neb/host_group.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/host_parent.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/host_status.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/instance.cc
@@ -97,6 +98,7 @@ add_executable(ccb_ut
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/module.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/randomize.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/service.cc
+  ${CMAKE_SOURCE_DIR}/tests/broker/neb/service_group.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/service_check.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/service_dependency.cc
   ${CMAKE_SOURCE_DIR}/tests/broker/neb/service_status.cc

tests/broker/neb/host_group.cc

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Centreon (https://www.centreon.com/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ *
+ */
+
+#include "com/centreon/broker/neb/host_group.hh"
+#include <gtest/gtest.h>
+
+using namespace com::centreon::broker;
+
+TEST(HostGroup, Constructor) {
+  neb::host_group hg(1,
+                     2,
+                     true,
+                     "test host_group");
+
+  ASSERT_EQ(hg.poller_id, 1);
+  ASSERT_EQ(hg.id, 2);
+  ASSERT_EQ(hg.enabled, true);
+  ASSERT_EQ(hg.name, "test host_group");
+}

tests/broker/neb/service_group.cc

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Centreon (https://www.centreon.com/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ *
+ */
+
+#include "com/centreon/broker/neb/service_group.hh"
+#include <gtest/gtest.h>
+
+using namespace com::centreon::broker;
+
+TEST(ServiceGroup, Constructor) {
+  neb::service_group sg(3,
+                     5,
+                     true,
+                     "test service_group");
+
+  ASSERT_EQ(sg.poller_id, 3);
+  ASSERT_EQ(sg.id, 5);
+  ASSERT_EQ(sg.enabled, true);
+  ASSERT_EQ(sg.name, "test service_group");
+}