Removed the old-style validation code.

diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index d850b1013b88a155030cb865332d8778fa528b0e..9576de49856f0ea515424fcabb8d8bd0585541b2 100644 (file)
--- a/lib/base/dynamicobject.cpp
+++ b/lib/base/dynamicobject.cpp
@@ -120,13 +120,6 @@ void DynamicObject::InternalApplyUpdate(const Dictionary::Ptr& serializedUpdate,
                Value data = attr->Get("data");
                double tx = attr->Get("tx");
 
-               if (!HasAttribute(it->first)) {
-                       DynamicType::Ptr dtype = GetType();
-                       if (dtype && !dtype->HasAttribute(it->first))
-                               Logger::Write(LogWarning, "base", "Adding unknown attribute '" +
-                                   it->first + "' to object '" + GetName() + "' of type '" + dtype->GetName() + "'");
-               }
-
                if (type & Attribute_Config)
                        RegisterAttribute(it->first, Attribute_Config);
 
@@ -485,4 +478,4 @@ DynamicObject::Ptr DynamicObject::GetObject(const String& type, const String& na
 const DynamicObject::AttributeMap& DynamicObject::GetAttributes(void) const
 {
        return m_Attributes;
-}
\ No newline at end of file
+}

diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index c5e9635d89ec722dbaaa2da673366421248005e1..86871cdf641a9e8b76d2a9ba773e2d8bc5746bd8 100644 (file)
--- a/lib/base/logger.cpp
+++ b/lib/base/logger.cpp
@@ -21,13 +21,7 @@
 
 using namespace icinga;
 
-static AttributeDescription loggerAttributes[] = {
-       { "type", Attribute_Config },
-       { "path", Attribute_Config },
-       { "severity", Attribute_Config }
-};
-
-REGISTER_TYPE(Logger, loggerAttributes);
+REGISTER_TYPE(Logger, NULL);
 
 /**
  * Constructor for the Logger class.

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 8bf06eb0d9a1cbeabe41b04d9059e83301a2a178..600e3026ba8cf6ae12551889ed5bc3574b04a69e 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -25,12 +25,6 @@ map<String, vector<Service::WeakPtr> > Host::m_ServicesCache;
 bool Host::m_ServicesCacheValid = true;
 
 static AttributeDescription hostAttributes[] = {
-       { "alias", Attribute_Config },
-       { "hostgroups", Attribute_Config },
-       { "dependencies", Attribute_Config },
-       { "hostchecks", Attribute_Config },
-       { "macros", Attribute_Config },
-       { "services", Attribute_Config },
        { "acknowledgement", Attribute_Replicated },
        { "acknowledgement_expiry", Attribute_Replicated },
        { "downtimes", Attribute_Replicated },

diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index debd7bdde684decf576154806850b3e8c176e0b6..c79bb042942eb05d36eb552451ebedb873a47d95 100644 (file)
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -24,13 +24,7 @@ using namespace icinga;
 map<String, vector<Host::WeakPtr> > HostGroup::m_MembersCache;
 bool HostGroup::m_MembersCacheValid = true;
 
-static AttributeDescription hostGroupAttributes[] = {
-       { "alias", Attribute_Config },
-       { "notes_url", Attribute_Config },
-       { "action_url", Attribute_Config }
-};
-
-REGISTER_TYPE(HostGroup, hostGroupAttributes);
+REGISTER_TYPE(HostGroup, NULL);
 
 String HostGroup::GetAlias(void) const
 {

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 68b716f474cbaeda7ef89d1ee1267074523a3ee1..777180756e334947867cb03751da09479eef2f0e 100644 (file)
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -23,17 +23,7 @@
 
 using namespace icinga;
 
-static AttributeDescription icingaApplicationAttributes[] = {
-       { "cert_path", Attribute_Config },
-       { "ca_path", Attribute_Config },
-       { "node", Attribute_Config },
-       { "service", Attribute_Config },
-       { "pid_path", Attribute_Config },
-       { "state_path", Attribute_Config },
-       { "macros", Attribute_Config }
-};
-
-REGISTER_TYPE(IcingaApplication, icingaApplicationAttributes);
+REGISTER_TYPE(IcingaApplication, NULL);
 
 #ifndef _WIN32
 #      include "icinga-version.h"

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index c1184f1f6009fb311c14c0edd53fc91cce731c84..b1aab631f4bfa6f69960aaef7bcc3e1ec41f7117 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -22,17 +22,6 @@
 using namespace icinga;
 
 static AttributeDescription serviceAttributes[] = {
-       { "alias", Attribute_Config },
-       { "host_name", Attribute_Config },
-       { "macros", Attribute_Config },
-       { "check_command", Attribute_Config },
-       { "max_check_attempts", Attribute_Config },
-       { "check_interval", Attribute_Config },
-       { "retry_interval", Attribute_Config },
-       { "dependencies", Attribute_Config },
-       { "servicegroups", Attribute_Config },
-       { "checkers", Attribute_Config },
-
        { "scheduling_offset", Attribute_Transient },
        { "first_check", Attribute_Transient },
        { "next_check", Attribute_Replicated },

diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 942e121e68b00f6533eed7e8f122bc9aa0999201..b59d882a4e5422ed435d442a3aaa00f318e6e3bb 100644 (file)
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -24,13 +24,7 @@ using namespace icinga;
 map<String, vector<Service::WeakPtr> > ServiceGroup::m_MembersCache;
 bool ServiceGroup::m_MembersCacheValid;
 
-static AttributeDescription serviceGroupAttributes[] = {
-       { "alias", Attribute_Config },
-       { "notes_url", Attribute_Config },
-       { "action_url",  Attribute_Config }
-};
-
-REGISTER_TYPE(ServiceGroup, serviceGroupAttributes);
+REGISTER_TYPE(ServiceGroup, NULL);
 
 String ServiceGroup::GetAlias(void) const
 {

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index 7e35ef252592907eac93d64cac6ec633e30d42b5..b46caef37ee98870f36b9a18d28900546d92ff9f 100644 (file)
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -22,7 +22,6 @@
 using namespace icinga;
 
 static AttributeDescription timePeriodAttributes[] = {
-       { "alias", Attribute_Config },
        { "cached_state", Attribute_Transient },
        { "cached_next_change", Attribute_Transient }
 };

diff --git a/lib/remoting/endpoint.cpp b/lib/remoting/endpoint.cpp
index ebe6f74a14663d7e1acc8998dec70defb00406da..c927fdb1183246320d2c3b33b423d99f229187e4 100644 (file)
--- a/lib/remoting/endpoint.cpp
+++ b/lib/remoting/endpoint.cpp
@@ -24,7 +24,6 @@ using namespace icinga;
 static AttributeDescription endpointAttributes[] = {
        { "node", Attribute_Replicated },
        { "service", Attribute_Replicated },
-       { "local", Attribute_Config },
        { "subscriptions", Attribute_Replicated },
        { "client", Attribute_Transient }
 };