MT#9281 cluster_set helpers: rework with info split into config.yml and network.yml

Change-Id: I5b3f04a01a27b0dfe8d0c5372943d841eb7e50e4

lib/get_all_cluster_set_ip_maps

@@ -1,29 +1,42 @@
 [%
-  # Return an array of hashes, each hash containing dispatcher_id and ips, 
+  # Return an array of hashes, each hash containing dispatcher_id and ips,
   # which is an array of ips, for a given cluster set type.
   #
+  # @param argv.host  If the cluster_set type is 'central; we need to filter by pair
   # @param argv.type	The type of element we are interested in (rtp, lb)
   # @return out		The array of hashes
 -%]
-[% 
+[%
+  IF !hosts.${argv.host}.defined;
+    argv.host = 'self';
+  END;
+-%]
+[%
   out = [];
+
+  IF cluster_sets.type == 'central';
+    set_hosts = [ hosts.$host, hosts.$host.peer ];
+  ELSE;
+    set_hosts = hosts.keys;
+  END;
+
+
   FOREACH set IN cluster_sets.keys;
-    set = cluster_sets.$set;
-    IF set.${argv.type}.defined;
-      theset = { dispatcher_id = set.dispatcher_id };
-      theset.ips = [];
-      FOREACH entry IN set.${argv.type};
-        iftype = entry.iface;
-        host = entry.host;
-        FOREACH iface IN hosts.$host.interfaces;
-          realiface = hosts.$host.$iface;
-          NEXT UNLESS realiface.type.grep('^' _ iftype _ '$').size();
-          theset.ips.push(realiface.ip);
-        END;
-      END;
-      IF theset.ips.size();
-        out.push(theset);
+    NEXT IF (set == 'default_set' || set == 'type');
+    theset = { dispatcher_id = cluster_sets.$set.dispatcher_id };
+    theset.ips = [];
+
+    FOREACH host IN set_hosts;
+      NEXT UNLESS hosts.$host.role.grep('^' _ argv.type _ '$').size();
+      FOREACH iface IN hosts.$host.interfaces;
+        NEXT UNLESS hosts.$host.$iface.cluster_sets.grep('^' _ set _ '$').size();
+        theset.ips.push(hosts.$host.$iface.ip);
       END;
     END;
+
+    IF theset.ips.size();
+      out.push(theset);
+    END;
+
   END;
 -%]

lib/get_all_cluster_set_shared_ip_maps

@@ -1,34 +1,48 @@
 [%
-  # Return an array of hashes, each hash containing dispatcher_id and ips, 
+  # Return an array of hashes, each hash containing dispatcher_id and ips,
   # which is an array of shared ips, for a given cluster set type.
   #
+  # @param argv.host  If the cluster_set type is 'central; we need to filter by pair
   # @param argv.type	The type of element we are interested in (rtp, lb)
   # @return out		The array of hashes
 -%]
-[% 
-  blktmp.processed_hosts = {};
+[%
+  IF !hosts.${argv.host}.defined;
+    argv.host = 'self';
+  END;
+-%]
+[%
   out = [];
+
+  IF cluster_sets.type == 'central';
+    set_hosts = [ hosts.$host, hosts.$host.peer ];
+  ELSE;
+    set_hosts = hosts.keys;
+  END;
+
+
   FOREACH set IN cluster_sets.keys;
-    set = cluster_sets.$set;
-    IF set.${argv.type}.defined;
-      theset = { dispatcher_id = set.dispatcher_id };
-      theset.ips = [];
-      FOREACH entry IN set.${argv.type};
-        iftype = entry.iface;
-        host = entry.host;
-        NEXT IF blktmp.processed_hosts.$host.defined;
-        FOREACH iface IN hosts.$host.interfaces;
-          realiface = hosts.$host.$iface;
-          NEXT UNLESS realiface.type.grep('^' _ iftype _ '$').size();
-          blktmp.processed_hosts.$peer = 1;
-          FOREACH ip IN realiface.shared_ip; 
-            theset.ips.push(ip);
-          END;
+    NEXT IF (set == "default_set" || set == "type");
+    blktmp.processed_hosts = {};
+    theset = { dispatcher_id = cluster_sets.$set.dispatcher_id };
+    theset.ips = [];
+
+    FOREACH host IN set_hosts;
+      NEXT UNLESS blktmp.processed_hosts.$host.defined;
+      NEXT UNLESS hosts.$host.role.grep('^' _ argv.type _ '$').size();
+      FOREACH iface IN hosts.$host.interfaces;
+        NEXT UNLESS hosts.$host.$iface.cluster_sets.grep('^' _ set _ '$').size();
+        blktmp.processed_hosts.$peer = 1;
+        theset.ips.push(hosts.$host.$iface.ip);
+        FOREACH ip IN hosts.$host.$iface.shared_ip;
+          theset.ips.push(ip);
         END;
       END;
-      IF theset.ips.size();
-        out.push(theset);
-      END;
     END;
+
+    IF theset.ips.size();
+      out.push(theset);
+    END;
+
   END;
 -%]

lib/get_all_cluster_sets

@@ -4,13 +4,19 @@
   # @param argv.type	The type of element we are interested in (rtp, lb)
   # @return out		The hash
 -%]
-[% 
+[%
   out = {};
-  FOR setname IN cluster_sets.keys;
-    NEXT IF setname == "default_set";
-    set = cluster_sets.$setname;
-    IF set.${argv.type}.defined;
-      out.$setname = set.dispatcher_id;
+
+  FOREACH set IN cluster_sets.keys;
+    NEXT IF (set == 'default_set' || set == 'type');
+
+    FOREACH host IN hosts.keys;
+      NEXT UNLESS hosts.$host.role.grep('^' _ argv.type _ '$').size();
+      FOREACH iface IN hosts.$host.interfaces;
+        NEXT UNLESS hosts.$host.$iface.cluster_sets.grep('^' _ set _ '$').size();
+        out.$set = cluster_sets.$set.dispatcher_id;
+      END;
     END;
+
   END;
 -%]