tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: Rename Host::hostgroups to Host::groups.

This commit is contained in:
Gunnar Beutner 2013-09-25 09:15:30 +02:00
parent e766b4534f
commit 0b265c18af
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/host.cpp
View File

@ -93,7 +93,7 @@ String Host::GetDisplayName(void) const
Array::Ptr Host::GetGroups(void) const Array::Ptr Host::GetGroups(void) const
{ {
return m_HostGroups; return m_Groups;
} }
Dictionary::Ptr Host::GetMacros(void) const Dictionary::Ptr Host::GetMacros(void) const
@ -661,7 +661,7 @@ void Host::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) con
if (attributeTypes & Attribute_Config) { if (attributeTypes & Attribute_Config) {
bag->Set("display_name", m_DisplayName); bag->Set("display_name", m_DisplayName);
bag->Set("hostgroups", m_HostGroups); bag->Set("groups", m_Groups);
bag->Set("macros", m_Macros); bag->Set("macros", m_Macros);
bag->Set("hostdependencies", m_HostDependencies); bag->Set("hostdependencies", m_HostDependencies);
bag->Set("servicedependencies", m_ServiceDependencies); bag->Set("servicedependencies", m_ServiceDependencies);
@ -677,7 +677,7 @@ void Host::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
if (attributeTypes & Attribute_Config) { if (attributeTypes & Attribute_Config) {
m_DisplayName = bag->Get("display_name"); m_DisplayName = bag->Get("display_name");
m_HostGroups = bag->Get("hostgroups"); m_Groups = bag->Get("groups");
m_Macros = bag->Get("macros"); m_Macros = bag->Get("macros");
m_HostDependencies = bag->Get("hostdependencies"); m_HostDependencies = bag->Get("hostdependencies");
m_ServiceDependencies = bag->Get("servicedependencies"); m_ServiceDependencies = bag->Get("servicedependencies");

2
lib/icinga/host.h
View File

@ -132,7 +132,7 @@ protected:
private: private:
String m_DisplayName; String m_DisplayName;
Array::Ptr m_HostGroups; Array::Ptr m_Groups;
Dictionary::Ptr m_Macros; Dictionary::Ptr m_Macros;
Array::Ptr m_HostDependencies; Array::Ptr m_HostDependencies;
Array::Ptr m_ServiceDependencies; Array::Ptr m_ServiceDependencies;

4
lib/icinga/icinga-type.conf
View File

@ -19,8 +19,8 @@
type Host { type Host {
%attribute string "display_name", %attribute string "display_name",
%attribute string "hostcheck", %attribute string "check",
%attribute array "hostgroups" { %attribute array "groups" {
%attribute name(HostGroup) "*" %attribute name(HostGroup) "*"
}, },
%attribute array "hostdependencies" { %attribute array "hostdependencies" {