[icinga-checkins] icinga.org: icinga2-migration/master: Ignore group name attributes

git at icinga.org git at icinga.org
Tue Jun 10 23:10:30 CEST 2014


Module: icinga2-migration
Branch: master
Commit: 24a85482a972e0910e102b2b51331a27b0d13dd8
URL:    https://git.icinga.org/?p=icinga2-migration.git;a=commit;h=24a85482a972e0910e102b2b51331a27b0d13dd8

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Tue Jun 10 18:54:47 2014 +0200

Ignore group name attributes

---

 modules/conftool/library/Conftool/Icinga2/Icinga2Hostgroup.php   |    6 +++++-
 .../conftool/library/Conftool/Icinga2/Icinga2Servicegroup.php    |    4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/conftool/library/Conftool/Icinga2/Icinga2Hostgroup.php b/modules/conftool/library/Conftool/Icinga2/Icinga2Hostgroup.php
index c7670f8..74242de 100644
--- a/modules/conftool/library/Conftool/Icinga2/Icinga2Hostgroup.php
+++ b/modules/conftool/library/Conftool/Icinga2/Icinga2Hostgroup.php
@@ -18,6 +18,10 @@ class Icinga2Hostgroup extends Icinga2ObjectDefinition
         'hostgroup_members' => 'groups',
     );
 
+    protected $v1RejectedAttributeMap = array(
+        'hostgroup_name',
+	);
+
     protected function convertMembers($members)
     {
         foreach ($this->splitComma($members) as $member) {
@@ -29,4 +33,4 @@ class Icinga2Hostgroup extends Icinga2ObjectDefinition
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/conftool/library/Conftool/Icinga2/Icinga2Servicegroup.php b/modules/conftool/library/Conftool/Icinga2/Icinga2Servicegroup.php
index bef3212..dc655a6 100644
--- a/modules/conftool/library/Conftool/Icinga2/Icinga2Servicegroup.php
+++ b/modules/conftool/library/Conftool/Icinga2/Icinga2Servicegroup.php
@@ -18,6 +18,10 @@ class Icinga2Servicegroup extends Icinga2ObjectDefinition
         'servicegroup_members' => 'groups',
     );
 
+    protected $v1RejectedAttributeMap = array(
+        'servicegroup_name',
+    );
+
     protected function convertMembers($members)
     {
         $count = 0;



More information about the icinga-checkins mailing list