config: Rename servicedependencies/hostdependencies.

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 7fa8daf5da2809b456b5f95f1bdbb0eb052ac952..5a46315ef5dee2c130c4828e5ab9669752702bfc 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -663,8 +663,8 @@ void Host::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) con
                bag->Set("display_name", m_DisplayName);
                bag->Set("groups", m_Groups);
                bag->Set("macros", m_Macros);
-               bag->Set("hostdependencies", m_HostDependencies);
-               bag->Set("servicedependencies", m_ServiceDependencies);
+               bag->Set("host_dependencies", m_HostDependencies);
+               bag->Set("service_dependencies", m_ServiceDependencies);
                bag->Set("check", m_Check);
                bag->Set("services", m_ServiceDescriptions);
                bag->Set("notifications", m_NotificationDescriptions);
@@ -679,8 +679,8 @@ void Host::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
                m_DisplayName = bag->Get("display_name");
                m_Groups = bag->Get("groups");
                m_Macros = bag->Get("macros");
-               m_HostDependencies = bag->Get("hostdependencies");
-               m_ServiceDependencies = bag->Get("servicedependencies");
+               m_HostDependencies = bag->Get("host_dependencies");
+               m_ServiceDependencies = bag->Get("service_dependencies");
                m_Check = bag->Get("check");
                m_ServiceDescriptions = bag->Get("services");
                m_NotificationDescriptions = bag->Get("notifications");

diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index 19170ef1a9ed08f5ea6dd16e030357090a677622..0ae3803b44ddeddbef882e1d6fd29a70dd9ed02d 100644 (file)
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -23,10 +23,10 @@ type Host {
        %attribute array "groups" {
                %attribute name(HostGroup) "*"
        },
-       %attribute array "hostdependencies" {
+       %attribute array "host_dependencies" {
                %attribute name(Host) "*"
        },
-       %attribute array "servicedependencies" {
+       %attribute array "service_dependencies" {
                %attribute dictionary "*" {
                        %require "host",
                        %attribute name(Host) "host",
@@ -83,10 +83,10 @@ type Service {
 
        %attribute number "volatile",
 
-       %attribute array "hostdependencies" {
+       %attribute array "host_dependencies" {
                %attribute name(Host) "*"
        },
-       %attribute array "servicedependencies" {
+       %attribute array "service_dependencies" {
                %attribute dictionary "*" {
                        %require "host",
                        %attribute name(Host) "host",

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 26bdd5fc973bc42fd3d97b2d8e4d9294696655bb..2a5eda8a5b4c0173fe45abdea4f26de2e292c6a8 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -412,8 +412,8 @@ void Service::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes)
        if (attributeTypes & Attribute_Config) {
                bag->Set("display_name", m_DisplayName);
                bag->Set("macros", m_Macros);
-               bag->Set("hostdependencies", m_HostDependencies);
-               bag->Set("servicedependencies", m_ServiceDependencies);
+               bag->Set("host_dependencies", m_HostDependencies);
+               bag->Set("service_dependencies", m_ServiceDependencies);
                bag->Set("servicegroups", m_ServiceGroups);
                bag->Set("check_command", m_CheckCommand);
                bag->Set("max_check_attempts", m_MaxCheckAttempts);
@@ -470,8 +470,8 @@ void Service::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes
        if (attributeTypes & Attribute_Config) {
                m_DisplayName = bag->Get("display_name");
                m_Macros = bag->Get("macros");
-               m_HostDependencies = bag->Get("hostdependencies");
-               m_ServiceDependencies = bag->Get("servicedependencies");
+               m_HostDependencies = bag->Get("host_dependencies");
+               m_ServiceDependencies = bag->Get("service_dependencies");
                m_ServiceGroups = bag->Get("servicegroups");
                m_CheckCommand = bag->Get("check_command");
                m_MaxCheckAttempts = bag->Get("max_check_attempts");