XXX monitor: Implement edgetest regions

XXX:
 * cover more
 * slave: allow to set check-frontend-ip-list per each region, as globally per slave it makes no sense!!!!!
 * slave: publish check-frontend-ip-list and nameserver-list per each region
 * test adding a region
 * test removing a region

The requests are backward compatible, so for current and simple usage
automatic region is setup.

Much more information are published to main and shared instances, like
lists of available and assigned regions.

software/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 6c75441c334051d3c7d50f52b14eac0e
+md5sum = 3e579a4643cf2e4ea611bd37dfa5fc31
 
 [template-monitor]
 _update_hash_filename_ = instance-monitor.cfg.jinja2
@@ -26,11 +26,11 @@ md5sum = 2eb5596544d9c341acf653d4f7ce2680
 
 [template-monitor-edgetest]
 _update_hash_filename_ = instance-monitor-edgetest.cfg.jinja2
-md5sum = 7f257f581e1e0fdec0dcfedd5ea6ddfd
+md5sum = dcd6be5cf57f8f6f22d72d645f445858
 
 [template-monitor-edgebot]
 _update_hash_filename_ = instance-monitor-edgebot.cfg.jinja2
-md5sum = a5cbf6d4d00a6341e5c3c92b567d8d63
+md5sum = 9095cd0b23311df334377dc7b63722b3
 
 [network-bench-cfg]
 filename = network_bench.cfg.in

software/monitor/instance-edgetest-input-schema.json

@@ -2,16 +2,57 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "properties": {
+    "region-dict": {
+      "title": "Regions",
+      "description": "Defines regions of the cluster",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "state": {
+              "title": "State",
+              "description": "State of the node of the region. Can be used to destroy not needed regions.",
+              "type": "string",
+              "default": "started",
+              "enum": [
+                "started",
+                "stopped",
+                "destroyed"
+              ]
+            },
+            "sla-computer_guid": {
+              "title": "GUID of the computer on which this region shall be deployed",
+              "description": "Unique identifier of the computer, like \"COMP-1234\". By default, let Master choose a computer.",
+              "type": "string",
+              "default": ""
+            },
+            "nameserver-list": {
+              "default": [],
+              "title": "Nameservers",
+              "description": "List of nameservers to use.",
+              "type": "array"
+            },
+            "check-frontend-ip-list": {
+              "default": [],
+              "title": "Default Check Frontend IPs",
+              "description": "List of default frontend IPs to check, if empty no constraint is used.",
+              "type": "array"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "nameserver-list": {
       "default": [],
-      "title": "Nameservers",
-      "description": "List of name servers to use.",
+      "title": "Nameservers (backward compatibility)",
+      "description": "List of nameservers to use. Note: This is backward compatibility, use region-dict for full configuration control.",
       "type": "array"
     },
     "check-frontend-ip-list": {
       "default": [],
-      "title": "Default frontend IPs to check",
-      "description": "Default list of Frontend IPs to check, if empty no constraint is used.",
+      "title": "Default Check Frontend IPs (backward compatibility)",
+      "description": "List of default frontend IPs to check, if empty no constraint is used. Note: This is backward compatibility, use region-dict for full configuration control.",
       "type": "array"
     }
   }

software/monitor/instance-edgetest-slave-input-schema.json

@@ -7,6 +7,12 @@
       "description": "URL to check, like https://example.com/",
       "type": "string"
     },
+    "region-list": {
+      "title": "Applicable Regions",
+      "description": "Puts the check on the defined regions. Empty will result with presence in all regions.",
+      "type": "array",
+      "default": []
+    },
     "check-status-code": {
       "title": "HTTP Code Check",
       "description": "Expected response HTTP Code.",
@@ -37,7 +43,7 @@
     },
     "check-frontend-ip-list": {
       "title": "Frontend IPs to check",
-      "description": "List of Frontend IPs to check, if empty no constraint is used (default: comes from master partition).",
+      "description": "List of Frontend IPs to check, if empty no constraint is used. Defaults to region configuration.",
       "type": "array"
     },
     "failure-amount": {

software/monitor/instance-monitor-edgebot.cfg.jinja2

@@ -9,22 +9,20 @@
 {%- set extra_slave_instance_list = slapparameter_dict.get('extra_slave_instance_list') %}
 {%- if extra_slave_instance_list %}
 {#- Create slaves to process with setting up defaults #}
-{%-   for slave in json_module.loads(extra_slave_instance_list) | sort(attribute='slave_title') %}
-{%-     if '_' in slave %}
-{%-       do slave.update(json_module.loads(slave.pop('_'))) %}
-{%-       do slave.setdefault('check-status-code', 200) %}
-{%-       do slave.setdefault('check-http-header-dict', {}) %}
-{%-       do slave.setdefault('check-certificate-expiration-days', 15) %}
-{%-       do slave.setdefault('failure-amount', 2) %}
-{%-       do slave.setdefault('check-maximum-elapsed-time', 2) %}
-{%-       do slave.setdefault('check-frontend-ip-list', CONFIGURATION['check-frontend-ip-list']) %}
-{%-       if 'url' in slave %}
-{%-         set class = slave['check-maximum-elapsed-time'] %}
-{%-         if class not in slave_instance_dict %}
-{%-           do slave_instance_dict.__setitem__(class, []) %}
-{%-         endif %}
-{%-         do slave_instance_dict[class].append(slave) %}
+{%-   for slave in extra_slave_instance_list | sort(attribute='slave_title') %}
+{%-     do slave.update(slave.pop('_')) %}
+{%-     do slave.setdefault('check-status-code', 200) %}
+{%-     do slave.setdefault('check-http-header-dict', {}) %}
+{%-     do slave.setdefault('check-certificate-expiration-days', 15) %}
+{%-     do slave.setdefault('failure-amount', 2) %}
+{%-     do slave.setdefault('check-maximum-elapsed-time', 2) %}
+{%-     do slave.setdefault('check-frontend-ip-list', CONFIGURATION['check-frontend-ip-list']) %}
+{%-     if 'url' in slave %}
+{%-       set class = slave['check-maximum-elapsed-time'] %}
+{%-       if class not in slave_instance_dict %}
+{%-         do slave_instance_dict.__setitem__(class, []) %}
 {%-       endif %}
+{%-       do slave_instance_dict[class].append(slave) %}
 {%-     endif %}
 {%-   endfor %}
 {%- endif %}

software/monitor/instance-monitor-edgetest.cfg.jinja2

@@ -17,33 +17,78 @@ extra-context =
   section slave_information slap-configuration
 
 {%  set part_list = [] -%}
-# Publish information for each slave
 {%- set edgebot_software_type = 'edgebot' %}
-{%- set edgebot_quantity = slapparameter_dict.pop('edgebot-quantity', '1') | int %}
-{%- set edgebot_list = [] %}
-{%- set edgebot_section_list = [] %}
 {%- set slave_list_name = 'extra_slave_instance_list' %}
 {%- set request_dict = {} %}
 {%- set namebase = "edgebot" %}
-{%- set authorized_slave_list = [] %}
+{%- if 'region-dict' not in slapparameter_dict %}
+{#-   Be nice and allow to work with default configuration #}
+{%-   do slapparameter_dict.__setitem__('region-dict', {
+          '1': {
+            'sla-computer_guid': slap_configuration['computer'],
+            'state': slap_configuration['instance-state'],
+            'nameserver-list': slapparameter_dict.get('nameserver-list', []),
+            'check-frontend-ip-list': slapparameter_dict.get('check-frontend-ip-list', []),
+          }
+        }) %}
+{%- endif %}
+{%- set region_list = slapparameter_dict['region-dict'].keys() %}
+{%- set authorized_slave_dict = {} %}
 {%- set monitor_base_url_dict = {} -%}
+{%- set processed_slave_instance_dict_list = [] %}
+{%- set active_region_list = [] %}
+{%- for region_name, region_parameter_dict in slapparameter_dict['region-dict'].items() %}
+{%-   if region_parameter_dict.get('state', 'started') == 'started' %}
+{%-     do active_region_list.append(region_name) %}
+{%-   endif %}
+{%- endfor %}
 {%- for slave in slave_instance_list | sort(attribute='slave_title') %}
-{%-   do authorized_slave_list.append(slave) %}
+{%-   set processed_slave = {'reference': slave['slave_reference']} %}
+{%-   do processed_slave.__setitem__('assigned-region-dict', {}) %}
+{%-   if '_' in slave %}
+{%-     set slave_dict = json_module.loads(slave.pop('_')) %} {#- XXX: Unsafe! #}
+{%-     set slave_region_list = slave_dict.pop('region-list', []) %}
+{%-     if slave_region_list == [] %}
+{%-       do slave_region_list.extend(region_list) %}
+{%-     endif %}
+{%-     do slave.__setitem__('_', slave_dict) %}
+{%-     for region in slave_region_list %}
+{%-       if region in slapparameter_dict['region-dict'] and slapparameter_dict['region-dict'][region].get('state', 'started') == 'started' %}
+{%-         set region_info = {
+  'nameserver-list': slapparameter_dict['region-dict'].get('nameserver-list', []),
+  'check-frontend-ip-list': slave_dict.get('check-frontend-ip-list') or slapparameter_dict['region-dict'].get('check-frontend-ip-list', []), 
+} %}
+{%-         do processed_slave['assigned-region-dict'].__setitem__(region, region_info) %}
+{%-         if region not in authorized_slave_dict %}
+{%-           do authorized_slave_dict.__setitem__(region, [slave]) %}
+{%-         else %}
+{%-           do authorized_slave_dict[region].append(slave) %}
+{%-         endif %}
+{%-       endif %}
+{%-     endfor %}
+{%-   endif %}
+{%-   do processed_slave_instance_dict_list.append(processed_slave) %}
 {%- endfor %}
 {%- set monitor_base_port = int(slap_configuration['configuration.monitor-base-port']) %}
-{%- for i in range(1, edgebot_quantity + 1) %}
-{%-   set edgebot_name = "%s-%s" % (namebase, i) %}
-{%-   set request_section_title = 'request-%s' % edgebot_name %}
-{%-   do edgebot_list.append(edgebot_name) %}
-{%-   do edgebot_section_list.append(request_section_title) %}
+{%- set number = {'i': 1} %}
+{%- for region_name, region_parameter_dict in slapparameter_dict['region-dict'].items() %}
+{%-   set edgebot_name = "%s-%s" % (namebase, region_name) %}
+{%-   set request_section_title = 'request-%s' % (hashlib_module.md5(edgebot_name.encode('utf-8')).hexdigest(),) %}
 {%-   do part_list.append(request_section_title) %}
-{%-   do request_dict.__setitem__(request_section_title,
-                                  {
-                                  'config': {'monitor-httpd-port': monitor_base_port + i},
-                                  'name': edgebot_name,
-                                  'sla': {},
-                                  'state': 'started', 
-                                  }) %}
+{%-   do request_dict.__setitem__(
+        request_section_title,
+        {
+          'config': {
+            'monitor-httpd-port': monitor_base_port + number['i'],
+            'check-frontend-ip-list': region_parameter_dict.get('check-frontend-ip-list', []),
+            'nameserver-list': region_parameter_dict.get('nameserver-list', []),
+            'extra_slave_instance_list': authorized_slave_dict.get(region_name, [])
+          },
+          'name': edgebot_name,
+          'sla': {'computer_guid': region_parameter_dict['sla-computer_guid']},
+          'state': region_parameter_dict.get('state', 'started'),
+        }) %}
+{%-   do number.__setitem__('i', number['i'] + 1) %}
 {%- endfor %}
 
 [replicate]
@@ -59,33 +104,26 @@ return = monitor-base-url
 {%  for section, edgebot_request in request_dict.items() %}
 [{{section}}]
 <= replicate
-name = {{ edgebot_request.get('name') }}
-{%-   if edgebot_request.get('state') %}
-state = {{ edgebot_request.get('state') }}
-{%-   endif%}
-{%-   set slave_configuration_dict = slapparameter_dict %}
-{%-   do slave_configuration_dict.update(edgebot_request.get('config')) %}
-{%-   do slave_configuration_dict.__setitem__(slave_list_name, json_module.dumps(authorized_slave_list)) %}
-{%-   for config_key, config_value in slave_configuration_dict.items() %}
+name = {{ edgebot_request['name'] }}
+state = {{ edgebot_request['state'] }}
+{%-   set edgebot_configuration_dict = edgebot_request['config'] %}
+{%-   for config_key, config_value in edgebot_configuration_dict.items() %}
 config-{{ config_key }} = {{ dumps(config_value) }}
 {%    endfor -%}
-{%-   if edgebot_request.get('sla') %}
-{%-     for parameter, value in edgebot_request.get('sla').items() %}
+{%-   for parameter, value in edgebot_request['sla'].items() %}
 sla-{{ parameter }} = {{ value }}
-{%-     endfor %}
-{%-   else %}
-# As no SLA was provided, by default it is requested on the same computer
-sla-computer_guid = ${slap-connection:computer-id}
-{%    endif %}
+{%-   endfor %}
 {%-   do monitor_base_url_dict.__setitem__(section, '${' ~ section ~ ':connection-monitor-base-url}') -%}
 {%- endfor %}
-{%- set directory_list = [] -%}
-{%- for slave_instance in slave_instance_list -%}
-{%-   set publish_section_title = 'publish-%s' % slave_instance.get('slave_reference')  -%}
+# Publish information for each slave
+{%- for slave_instance in processed_slave_instance_dict_list -%}
+{%-   set publish_section_title = 'publish-%s' % slave_instance['reference']  -%}
 {%-   do part_list.append(publish_section_title) %}
 [{{ publish_section_title }}]
 recipe = slapos.cookbook:publish
--slave-reference = {{ slave_instance.get('slave_reference') }}
+available-region-list = {{ dumps(list(active_region_list)) }}
+assigned-region-dict = {{ dumps(slave_instance['assigned-region-dict']) }}
+-slave-reference = {{ slave_instance['reference'] }}
 {%  endfor %}
 
 [monitor-conf-parameters]
@@ -104,4 +142,9 @@ parts +=
 {%  for part in part_list %}
 {{ '  %s' % part }}
 {%- endfor %}
+
+[publish-connection-information]
+active-region-list = {{ dumps(list(active_region_list)) }}
+sla-computer_guid = {{ dumps(slap_configuration['computer']) }}
+sla-instance_guid = {{ dumps(slap_configuration['instance-guid']) }}
 {%- endif %} {#- if slap_software_type == software_type #}

software/monitor/instance.cfg

@@ -32,6 +32,7 @@ template = ${template-monitor-edgetest:target}
 rendered = $${buildout:directory}/template-monitor-base-edgetest.cfg
 extensions = jinja2.ext.do
 context = import json_module json
+          import hashlib_module hashlib
           key develop_eggs_directory buildout:develop-eggs-directory
           key eggs_directory buildout:eggs-directory
           key slapparameter_dict slap-configuration:configuration