Register nil_uuid filter for health check

Conflicts: src/vnsw/agent/cfg/cfg_filter.cc src/vnsw/agent/cfg/cfg_init.h Change-Id: I7d4f814e8db7a1dbd32de90d958af4c842eedbd0 closes-bug: #1661167
Juniper · Feb 9, 2017 · d07eec7 · d07eec7
1 parent 4de6a8d
commit d07eec7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/vnsw/agent/cfg/cfg_filter.cc b/src/vnsw/agent/cfg/cfg_filter.cc
@@ -69,6 +69,8 @@ int CfgFilter::GetIdPermsPropertyId(DBTable *table) const {
         return LogicalInterface::ID_PERMS;
     if (table == agent_cfg_->cfg_physical_device_table())
         return PhysicalRouter::ID_PERMS;
+    if (table == agent_cfg_->cfg_health_check_table())
+        return ServiceHealthCheck::ID_PERMS;
     return -1;
 }
 
@@ -139,6 +141,9 @@ void CfgFilter::Init() {
 
     agent_cfg_->cfg_physical_device_table()->RegisterPreFilter
         (boost::bind(&CfgFilter::CheckProperty, this, _1, _2, _3));
+
+    agent_cfg_->cfg_health_check_table()->RegisterPreFilter
+        (boost::bind(&CfgFilter::CheckProperty, this, _1, _2, _3));
 }
 
 void CfgFilter::Shutdown() {

diff --git a/src/vnsw/agent/cfg/cfg_init.cc b/src/vnsw/agent/cfg/cfg_init.cc
@@ -182,6 +182,10 @@ void AgentConfig::RegisterDBClients(DB *db) {
                                                        "physical-router")));
     assert(cfg_physical_device_table_);
 
+    cfg_health_check_table_ = (static_cast<IFMapAgentTable *>
+                                (IFMapTable::FindTable(agent_->db(),
+                                                       "service-health-check")));
+    assert(cfg_health_check_table_);
 
     cfg_interface_client_->Init();
 }

diff --git a/src/vnsw/agent/cfg/cfg_init.h b/src/vnsw/agent/cfg/cfg_init.h
@@ -77,6 +77,10 @@ class AgentConfig  {
         return cfg_physical_device_table_;
     }
 
+    IFMapAgentTable *cfg_health_check_table() const {
+        return cfg_health_check_table_;
+    }
+
     Agent *agent() const { return agent_; }
     CfgFilter *cfg_filter() const { return cfg_filter_.get(); }
     IFMapAgentParser *cfg_parser() const { return cfg_parser_.get(); }
@@ -133,6 +137,7 @@ class AgentConfig  {
     IFMapAgentTable *cfg_service_instance_table_;
     IFMapAgentTable *cfg_security_group_table_;
     IFMapAgentTable *cfg_physical_device_table_;
+    IFMapAgentTable *cfg_health_check_table_;
 
     DISALLOW_COPY_AND_ASSIGN(AgentConfig);
 };