reworked target code to support multiple targets and different target types.

user can now specify a sequence of targets to test (ordered by rule number). The first success satifies the success
criteria for the test and no further tests will be performed on the interface for this period.

Additional test types can be coded and added to the target framework.

configuration has changed as a result of the rework.

1 files changed, 18 insertions, 1 deletions

diff --git a/src/lbdatafactory.hh b/src/lbdatafactory.hh
index 12648e8..74b2df6 100644
--- a/src/lbdatafactory.hh
+++ b/src/lbdatafactory.hh
@@ -50,12 +50,27 @@ private:
   process_health(const string &key, const string &value);
 
   void
-  process_health_hook(const string &key, const string &value);
+  process_hook(const string &key, const string &value);
 
   void
   process_health_interface(const string &key, const string &value);
 
   void
+  process_health_interface_rule(const string &key, const string &value);
+
+  void
+  process_health_interface_rule_type(const string &key, const string &value);
+
+  void
+  process_health_interface_rule_type_target(const string &key, const string &value);
+
+  void
+  process_health_interface_rule_type_resptime(const string &key, const string &value);
+
+  void
+  process_health_interface_rule_type_ttl(const string &key, const string &value);
+
+  void
   process_rule(const string &key, const string &value);
 
   void
@@ -88,10 +103,12 @@ private:
   LBRule _lb_rule;
   LBData _lb_data;
   int _interface_index;
+  int _current_test_rule_number;
 
   LBData::LBRuleIter _rule_iter;
   LBData::InterfaceHealthIter _health_iter;
   LBRule::InterfaceDistIter _rule_iface_iter;
+  LBHealth::TestIter _test_iter;
 };
 
 #endif //__LBDATALOADER_HH__