Merge branch 'monitor'

Conflicts:
	setup.py

setup.py

@@ -46,6 +46,7 @@ setup(name=name,
         'passlib',
         'netifaces',
         'erp5.util'
+        'PyRSS2Gen',
       ] + additional_install_requires,
       extras_require = {
         'lampconfigure':  ["mysqlclient"], #needed for MySQL Database access
@@ -72,6 +73,12 @@ setup(name=name,
           'is-local-tcp-port-opened = slapos.promise.is_local_tcp_port_opened:main',
           'is-process-older-than-dependency-set = slapos.promise.is_process_older_than_dependency_set:main',
           'killpidfromfile = slapos.systool:killpidfromfile', # BBB
+          'monitor.bootstrap = slapos.monitor.monitor:main',
+          'monitor.collect = slapos.monitor.collect:main',
+          'monitor.runpromise = slapos.monitor.runpromise:main',
+          'monitor.genstatus = slapos.monitor.globalstate:main',
+          'monitor.genrss = slapos.monitor.status2rss:main',
+          'monitor.configwrite = slapos.monitor.monitor_config_write:main',
           'runResiliencyUnitTestTestNode = slapos.resiliencytest:runUnitTest',
           'runResiliencyScalabilityTestNode = slapos.resiliencytest:runResiliencyTest',
           'runStandaloneResiliencyTest = slapos.resiliencytest:runStandaloneResiliencyTest',

slapos/monitor/globalstate.py

+#!/usr/bin/env python
+
+import sys
+import os
+import glob
+import json
+import ConfigParser
+import time
+from datetime import datetime
+
+def softConfigGet(config, *args, **kwargs):
+  try:
+    return config.get(*args, **kwargs)
+  except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+    return ""
+
+def generateStatisticsData(stat_file_path, content):
+  # csv document for statictics
+  if not os.path.exists(stat_file_path):
+    with open(stat_file_path, 'w') as fstat:
+      data_dict = {
+        "date": time.time(),
+        "data": ["Date, Success, Error, Warning"]
+      }
+      fstat.write(json.dumps(data_dict))
+
+  current_state = ''
+  if content.has_key('state'):
+    current_state = '%s, %s, %s, %s' % (
+      content['date'],
+      content['state']['success'],
+      content['state']['error'],
+      content['state']['warning'])
+
+  # append to file
+  if current_state:
+    with open (stat_file_path, mode="r+") as fstat:
+      fstat.seek(0,2)
+      position = fstat.tell() -2
+      fstat.seek(position)
+      fstat.write('%s}' % ',"{}"]'.format(current_state))
+
+def run(args_list):
+  monitor_file, instance_file = args_list
+
+  monitor_config = ConfigParser.ConfigParser()
+  monitor_config.read(monitor_file)
+
+  base_folder = monitor_config.get('monitor', 'private-folder')
+  status_folder = monitor_config.get('monitor', 'public-folder')
+  base_url = monitor_config.get('monitor', 'base-url')
+  related_monitor_list = monitor_config.get("monitor", "monitor-url-list").split()
+  statistic_folder = os.path.join(base_folder, 'data', '.jio_documents')
+  parameter_file = os.path.join(base_folder, 'config', '.jio_documents', 'config.json')
+
+  report_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+
+  if not os.path.exists(statistic_folder):
+    try:
+      os.makedirs(statistic_folder)
+    except OSError, e:
+      if e.errno == os.errno.EEXIST and os.path.isdir(statistic_folder):
+        pass
+      else: raise
+
+  # search for all status files
+  file_list = filter(os.path.isfile,
+      glob.glob("%s/*.status.json" % status_folder)
+    )
+  error = warning = success = 0
+  status = 'OK'
+  promise_list = []
+  global_state_file = os.path.join(base_folder, 'monitor.global.json')
+  public_state_file = os.path.join(status_folder, 'monitor.global.json')
+  for file in file_list:
+    try:
+      with open(file, 'r') as temp_file:
+        tmp_json = json.loads(temp_file.read())
+    except ValueError:
+      # bad json file ?
+      continue
+    if tmp_json['status'] == 'ERROR':
+      error  += 1
+    elif tmp_json['status'] == 'OK':
+      success += 1
+    elif tmp_json['status'] == 'WARNING':
+      warning += 1
+    tmp_json['time'] = tmp_json['start-date'].split(' ')[1]
+    promise_list.append(tmp_json)
+
+  if error:
+    status = 'ERROR'
+  elif warning:
+    status = 'WARNING'
+
+  global_state_dict = dict(
+      status=status,
+      state={
+        'error': error,
+        'success': success,
+        'warning': warning,
+      },
+      type='global',
+      date=report_date,
+      _links={"rss_url": {"href": "%s/public/feed" % base_url},
+              "public_url": {"href": "%s/share/jio_public/" % base_url},
+              "private_url": {"href": "%s/share/jio_private/" % base_url}
+            },
+      data={'state': 'monitor_state.data',
+            'process_state': 'monitor_process_resource.status',
+            'process_resource': 'monitor_resource_process.data',
+            'memory_resource': 'monitor_resource_memory.data',
+            'io_resource': 'monitor_resource_io.data',
+            'monitor_process_state': 'monitor_resource.status'}
+    )
+
+  global_state_dict['_embedded'] = {'promises': promise_list}
+
+  if os.path.exists(instance_file):
+    config = ConfigParser.ConfigParser()
+    config.read(instance_file)
+    if 'instance' in config.sections():
+      instance_dict = {}
+      global_state_dict['title'] = config.get('instance', 'name')
+      global_state_dict['hosting-title'] = config.get('instance', 'root-name')
+      if not global_state_dict['title']:
+        global_state_dict['title'] = 'Instance Monitoring'
+      
+      instance_dict['computer'] = config.get('instance', 'computer')
+      instance_dict['ipv4'] = config.get('instance', 'ipv4')
+      instance_dict['ipv6'] = config.get('instance', 'ipv6')
+      instance_dict['software-release'] = config.get('instance', 'software-release')
+      instance_dict['software-type'] = config.get('instance', 'software-type')
+      instance_dict['partition'] = config.get('instance', 'partition')
+
+      global_state_dict['_embedded'].update({'instance' : instance_dict})
+
+  if related_monitor_list:
+    global_state_dict['_links']['related_monitor'] = [{'href': "%s/share/jio_public" % url}
+                          for url in related_monitor_list]
+
+  if os.path.exists(parameter_file):
+    with open(parameter_file) as cfile:
+      global_state_dict['parameters'] = json.loads(cfile.read())
+
+  # Public information with the link to private folder
+  public_state_dict = dict(
+    status=status,
+    date=report_date,
+    _links={'monitor': {'href': '%s/share/jio_private/' % base_url}},
+    title=global_state_dict.get('title', '')
+  )
+  public_state_dict['hosting-title'] = global_state_dict.get('hosting-title', '')
+  public_state_dict['_links']['related_monitor'] = global_state_dict['_links'].get('related_monitor', [])
+
+  with open(global_state_file, 'w') as fglobal:
+    fglobal.write(json.dumps(global_state_dict))
+
+  with open(public_state_file, 'w') as fpglobal:
+    fpglobal.write(json.dumps(public_state_dict))
+
+  generateStatisticsData(
+    os.path.join(statistic_folder, 'monitor_state.data.json'),
+    global_state_dict)
+
+  return 0
+
+def main():
+  if len(sys.argv) < 3:
+    print("Usage: %s <monitor_conf_path> <instance_conf_path>" % sys.argv[0])
+    sys.exit(2)
+  sys.exit(run(sys.argv[1:]))

slapos/monitor/monitor_config_write.py

+#!/usr/bin/env python
+
+import sys
+import os
+import re
+import json
+import argparse
+import subprocess
+from datetime import datetime
+import time
+
+
+def parseArguments():
+  """
+  Parse arguments for monitor instance.
+  """
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--config_folder',
+                      help='Path where json configuration/document will be read and write')
+  parser.add_argument('--htpasswd_bin',
+                      help='Path apache htpasswd binary. Needed to write htpasswd file.')
+  parser.add_argument('--output_cfg_file',
+                      help='Ouput parameters in cfg file.')
+
+  return parser.parse_args()
+
+class MonitorConfigWrite(object):
+
+  def __init__(self, config_json_file, htpasswd_bin, output_cfg_file=""):
+    self.config_json_file = config_json_file
+    self.output_cfg_file = output_cfg_file
+    self.htpasswd_bin = htpasswd_bin
+
+  def _fileWrite(self, file_path, content):
+    if os.path.exists(file_path):
+      try:
+        with open(file_path, 'w') as wf:
+          wf.write(content)
+          return True
+      except OSError, e:
+        print "ERROR while writing changes to %s.\n %s" % (file_path, str(e))
+    return False
+
+  def _htpasswdWrite(self, htpasswd_bin,  parameter_dict, value):
+    if not os.path.exists(parameter_dict['file']):
+      return False
+    command = [htpasswd_bin, '-cb', parameter_dict['htpasswd'], parameter_dict['user'], value]
+    process = subprocess.Popen(
+      command,
+      stdin=None,
+      stdout=subprocess.PIPE,
+      stderr=subprocess.PIPE
+    )
+    result = process.communicate()[0]
+    if process.returncode != 0:
+      print result
+      return False
+    with open(parameter_dict['file'], 'w') as pfile:
+      pfile.write(value)
+    return True
+
+  def _httpdCorsDomainWrite(self, httpd_cors_file, httpd_gracefull_bin, cors_domain):
+    cors_string = ""
+    cors_domain_list = cors_domain.split()
+    old_httpd_cors_file = os.path.join(
+      os.path.dirname(httpd_cors_file),
+      'prev_%s' % os.path.basename(httpd_cors_file)
+    )
+    if os.path.exists(old_httpd_cors_file) and os.path.isfile(old_httpd_cors_file):
+      try:
+        with open(old_httpd_cors_file, 'r') as cors_file:
+          if cors_file.read() == cors_domain:
+            if os.path.exists(httpd_cors_file) and (os.stat(httpd_cors_file).st_size > 0
+              or (cors_domain == "" and os.stat(httpd_cors_file).st_size == 0)):
+              # Skip if cors file is not empty
+              return True
+      except OSError, e:
+        print "Failed to open file at %s. \n%s" % (old_httpd_cors_file, str(e))
+    for domain in cors_domain_list:
+      if cors_string:
+        cors_string += '|'
+      cors_string += re.escape(domain)
+    try:
+      with open(httpd_cors_file, 'w') as file:
+        file.write('SetEnvIf Origin "^http(s)?://(.+\.)?(%s)$" origin_is=$0\n' % cors_string)
+        file.write('Header always set Access-Control-Allow-Origin %{origin_is}e env=origin_is')
+    except OSError, e:
+      print "ERROR while writing CORS changes to %s.\n %s" % (httpd_cors_file, str(e))
+      return False
+
+    # Save current cors domain list
+    try:
+      with open(old_httpd_cors_file, 'w') as cors_file:
+        cors_file.write(cors_domain)
+    except OSError, e:
+      print "Failed to open file at %s. \n%s" % (old_httpd_cors_file, str(e))
+      return False
+
+    # Restart httpd process
+    try:
+      subprocess.call(httpd_gracefull_bin)
+    except OSError, e:
+      print "Failed to execute command %s.\n %s" % (httpd_gracefull_bin, str(e))
+      return False
+    return True
+
+  def applyConfigChanges(self):
+    parameter_config_file = os.path.join(
+      os.path.dirname(self.config_json_file),
+      'config.parameters.json'
+    )
+    if not os.path.exists(self.config_json_file) or not os.path.isfile(self.config_json_file):
+      #print "ERROR: Config file doesn't exist... Exiting"
+      return {}
+
+    new_parameter_list = []
+    parameter_list = []
+    description_dict = {}
+    result_dict = {}
+
+    try:
+      with open(self.config_json_file) as tmpfile:
+        new_parameter_list = json.loads(tmpfile.read())
+    except ValueError:
+      print "Error: Couldn't parse json file %s" % self.config_json_file
+
+    with open(parameter_config_file) as tmpfile:
+      description_dict = json.loads(tmpfile.read())
+
+    for i in range(0, len(new_parameter_list)):
+      key = new_parameter_list[i]['key']
+      if key != '':
+        description_entry = description_dict[key]
+        if description_entry['type'] == 'file':
+          result_dict[key] = self._fileWrite(
+            description_entry['file'],
+            new_parameter_list[i]['value']
+          )
+        elif description_entry['type'] == 'htpasswd':
+          result_dict[key] = self._htpasswdWrite(
+            self.htpasswd_bin,
+            description_entry,
+            new_parameter_list[i]['value']
+          )
+        elif description_entry['type'] == 'httpdcors':
+          result_dict[key] = self._httpdCorsDomainWrite(
+            description_entry['cors_file'],
+            description_entry['gracefull_bin'],
+            new_parameter_list[i]['value']
+          )
+
+    if (self.output_cfg_file):
+      try:
+        with open(self.output_cfg_file, 'w') as pfile:
+          pfile.write('[public]\n')
+          for parameter in new_parameter_list:
+            if parameter['key']:
+              pfile.write('%s = %s\n' % (parameter['key'], parameter['value']))
+      except OSError, e:
+        print "Error failed to create file %s" % self.output_cfg_file
+        pass
+
+    return result_dict
+
+
+def main():
+  parser = parseArguments()
+  parameter_tmp_file = os.path.join(parser.config_folder, 'config.tmp.json')
+  config_file = os.path.join(parser.config_folder, 'config.json')
+
+  # Run 4 times with sleep
+  run_counter = 1
+  max_runn = 4
+  sleep_time = 15
+
+  instance = MonitorConfigWrite(
+    parameter_tmp_file,
+    parser.htpasswd_bin,
+    parser.output_cfg_file)
+
+  while True:
+    result_dict = instance.applyConfigChanges()
+    if result_dict != {}:
+      status = True
+      for key in result_dict:
+        if not result_dict[key]:
+          status = False
+    
+      if status and os.path.exists(parameter_tmp_file):
+        try:
+          os.unlink(config_file)
+        except OSError, e:
+          print "ERROR cannot remove file: %s" % parameter_tmp_file
+        else:
+          os.rename(parameter_tmp_file, config_file)
+    if run_counter == max_runn:
+      break
+    else:
+      run_counter += 1
+      time.sleep(sleep_time)

slapos/monitor/runpromise.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import subprocess
+import json
+import psutil
+import time
+from shutil import copyfile
+import glob
+import argparse
+import traceback
+
+def parseArguments():
+  """
+  Parse arguments for monitor collector instance.
+  """
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--pid_path',
+                      help='Path where the pid of this process will be writen.')
+  parser.add_argument('--output',
+                      help='The Path of file where Json result of this promise will be saved.')
+  parser.add_argument('--promise_script',
+                      help='Promise script to execute.')
+  parser.add_argument('--promise_name',
+                      help='Title to give to this promise.')
+  parser.add_argument('--promise_type',
+                      default='status',
+                      help='Type of promise to execute. [status, report].')
+  parser.add_argument('--monitor_url',
+                      help='Monitor Instance website URL.')
+  parser.add_argument('--history_folder',
+                      help='Path where old result file will be placed before generate a new json result file.')
+  parser.add_argument('--instance_name',
+                      default='UNKNOWN Software Instance',
+                      help='Software Instance name.')
+  parser.add_argument('--hosting_name',
+                      default='UNKNOWN Hosting Subscription',
+                      help='Hosting Subscription name.')
+
+  return parser
+
+def runpromise(parser):
+
+  if os.path.exists(parser.pid_path):
+    with open(parser.pid_path, "r") as pidfile:
+      try:
+        pid = int(pidfile.read(6))
+      except ValueError:
+        pid = None
+      if pid and os.path.exists("/proc/" + str(pid)):
+        print("A process is already running with pid " + str(pid))
+        return 1
+  start_date = ""
+  with open(parser.pid_path, "w") as pidfile:
+    process = executeCommand(parser.promise_script)
+    ps_process = psutil.Process(process.pid)
+    start_date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ps_process.create_time()))
+    pidfile.write(str(process.pid))
+
+  status_json = generateStatusJsonFromProcess(process, start_date=start_date)
+
+  status_json['_links'] = {"monitor": {"href": parser.monitor_url}}
+  status_json['title'] = parser.promise_name
+  status_json['instance'] = parser.instance_name
+  status_json['hosting_subscription'] = parser.hosting_name
+  status_json['type'] = parser.promise_type
+
+  # Save the lastest status change date (needed for rss)
+  status_json['change-time'] = ps_process.create_time()
+  if os.path.exists(parser.output):
+    with open(parser.output) as f:
+      try:
+        last_result = json.loads(f.read())
+        if status_json['status'] == last_result['status'] and last_result.has_key('change-time'):
+          status_json['change-time'] = last_result['change-time']
+      except ValueError:
+        pass
+
+  updateStatusHistoryFolder(
+    parser.promise_name,
+    parser.output,
+    parser.history_folder,
+    parser.promise_type
+  )
+  with open(parser.output, "w") as outputfile:
+    json.dump(status_json, outputfile)
+  os.remove(parser.pid_path)
+
+def updateStatusHistoryFolder(name, status_file, history_folder, promise_type):
+  history_path = os.path.join(history_folder)
+  if not os.path.exists(status_file):
+    return
+  if not os.path.exists(history_folder):
+    return
+  if not os.path.exists(history_path):
+    try:
+      os.makedirs(history_path)
+    except OSError, e:
+      if e.errno == os.errno.EEXIST and os.path.isdir(history_path):
+        pass
+      else: raise
+  with open(status_file, 'r') as sf:
+    try:
+      status_dict = json.loads(sf.read())
+    except ValueError:
+      traceback.print_exc()
+      return
+
+  if promise_type == 'status':
+    filename = '%s.history.json' % name
+    history_file = os.path.join(history_path, filename)
+    # Remove links from history (not needed)
+    status_dict.pop('_links', None)
+    if not os.path.exists(history_file):
+      with open(history_file, 'w') as f_history:
+        data_dict = {
+          "date": time.time(),
+          "data": [status_dict]
+        }
+        f_history.write(json.dumps(data_dict))
+    else:
+      # Remove useless informations
+      status_dict.pop('hosting_subscription', '')
+      status_dict.pop('title', '')
+      status_dict.pop('instance', '')
+      status_dict.pop('type', '')
+
+      with open (history_file, mode="r+") as f_history:
+        f_history.seek(0,2)
+        position = f_history.tell() -2
+        f_history.seek(position)
+        #f_history.write(',%s]}' % str(status_dict))
+        f_history.write('%s}' % ',{}]'.format(json.dumps(status_dict)))
+  elif promise_type == 'report':
+    # keep_item_amount = 3
+    filename = '%s.history.json' % (
+      name)
+
+    copyfile(status_file, os.path.join(history_path, filename))
+    """# Don't let history foler grow too much, keep xx files
+    file_list = filter(os.path.isfile,
+        glob.glob("%s/*.%s.history.json" % (history_path, promise_type))
+      )
+    file_count = len(file_list)
+    if file_count > keep_item_amount:
+      file_list.sort(key=lambda x: os.path.getmtime(x))
+      while file_count > keep_item_amount:
+        to_delete = file_list.pop(0)
+        try:
+          os.unlink(to_delete)
+          file_count -= 1
+        except OSError:
+          raise"""
+
+def generateStatusJsonFromProcess(process, start_date=None, title=None):
+  stdout, stderr = process.communicate()
+  status_json = {}
+  if process.returncode != 0:
+    status_json["status"] = "ERROR"
+  else:
+    status_json["status"] = "OK"
+  if stderr:
+    status_json["message"] = stderr
+  elif stdout:
+    status_json["message"] = stdout
+  if start_date:
+    status_json["start-date"] = start_date
+  if title:
+    status_json["title"] = title
+  return status_json
+
+
+def executeCommand(args):
+  return subprocess.Popen(
+    args,
+    #cwd=instance_path,
+    #env=None if sys.platform == 'cygwin' else {},
+    stdin=None,
+    stdout=subprocess.PIPE,
+    stderr=subprocess.PIPE
+  )
+
+def main():
+  arg_parser = parseArguments()
+  sys.exit(runpromise(arg_parser.parse_args()))

slapos/monitor/status2rss.py

+import sys
+import os
+import json
+from datetime import datetime
+import base64
+import hashlib
+import PyRSS2Gen
+import argparse
+
+def parseArguments():
+  """
+  Parse arguments for monitor Rss Generator.
+  """
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--items_folder',
+                      help='Path where to get *.status.json files which contain result of promises.')
+  parser.add_argument('--output',
+                      help='The Path of file where feed file will be saved.')
+  parser.add_argument('--feed_url',
+                      help='Url of this feed file.')
+  parser.add_argument('--public_url',
+                      help='Monitor Instance public URL.')
+  parser.add_argument('--private_url',
+                      help='Monitor Instance private URL.')
+  parser.add_argument('--instance_name',
+                      default='UNKNOW Software Instance',
+                      help='Software Instance name.')
+  parser.add_argument('--hosting_name',
+                      default='',
+                      help='Hosting Subscription name.')
+
+  return parser.parse_args()
+
+def getKey(item):
+  return item.pubDate
+
+def genrss():
+  parser = parseArguments()
+
+  rss_item_list = []
+  report_date = datetime.utcnow()
+  for filename in os.listdir(parser.items_folder):
+    if filename.endswith(".status.json"):
+      filepath = os.path.join(parser.items_folder, filename)
+      result_dict = None
+      try:
+        result_dict = json.load(open(filepath, "r"))
+      except ValueError:
+        print "Failed to load json file: %s" % filepath
+        continue
+      description = result_dict.get('message', '')
+      event_time = datetime.fromtimestamp(result_dict['change-time'])
+      rss_item = PyRSS2Gen.RSSItem(
+        categories = [result_dict['status']],
+        source = PyRSS2Gen.Source(result_dict['title'], parser.public_url),
+        title = '[%s] %s' % (result_dict['status'], result_dict['title']),
+        comments = description,
+        description = "%s: %s\n%s" % (event_time, result_dict['status'], description),
+        link = parser.private_url,
+        pubDate = event_time,
+        guid = PyRSS2Gen.Guid(base64.b64encode("%s, %s" % (parser.hosting_name, result_dict['title'])))
+      )
+      rss_item_list.append(rss_item)
+
+
+  ### Build the rss feed
+  sorted(rss_item_list, key=getKey)
+  rss_feed = PyRSS2Gen.RSS2 (
+    title = parser.instance_name,
+    link = parser.feed_url,
+    description = parser.hosting_name,
+    lastBuildDate = report_date,
+    items = rss_item_list
+    )
+
+  with open(parser.output, 'w') as frss:
+    frss.write(rss_feed.to_xml())
+
+def main():
+  exit(genrss())

slapos/test/monitor/config_document.py

+# -*- coding: utf-8 -*-
+import os, time
+import sys
+import re
+import shutil
+import tempfile
+import unittest
+import json
+from slapos.monitor.monitor_config_write import MonitorConfigWrite
+
+class MonitorConfigDocument(unittest.TestCase):
+
+  def setUp(self):
+    self.base_dir = tempfile.mkdtemp()
+    self.config_dir = os.path.join(self.base_dir, 'config')
+    self.config_path = os.path.join(self.config_dir, 'config.json')
+    os.mkdir(self.config_dir)
+    self.httpd_passwd = "btouhjng"
+    self.file_content = "wjkqelod"
+    self.httpd_passwd_bin = os.path.join(self.base_dir, 'htpasswd')
+    self.httpd_passwd_script = """#!/bin/sh
+echo "htpasswd $@" > %s/monitor-htpasswd
+""" % self.base_dir
+    self.parameter_dict = {
+      "cors-domain": 
+        {
+          "gracefull_bin": ["/bin/echo", "restarted"],
+          "type": "httpdcors",
+          "cors_file": "%s/test-httpd-cors.cfg" % self.base_dir
+        },
+      "httpd-password":
+        {
+          "htpasswd": "%s/monitor-htpasswd" % self.base_dir,
+          "type": "htpasswd",
+          "user": "admin",
+          "file": "%s/.httpd_pwd_real" % self.base_dir
+        },
+      "from-file": 
+        {
+          "type": "file",
+          "file": "%s/content" % self.base_dir
+        }
+      }
+
+    self.config = [
+      {
+        "value": "raw content2",
+        "key": "",
+        "title": "raw-content2"
+      },
+      {
+        "value": "%s" % self.httpd_passwd,
+        "key": "httpd-password",
+        "title": "httpd-password"
+      },
+      {
+        "value": "%s" % self.file_content,
+        "key": "from-file",
+        "title": "from-file"
+      },
+      {
+        "value": "",
+        "key": "cors-domain",
+        "title": "cors-domain"
+      },
+      {
+        "value": "raw content",
+        "key": "",
+        "title": "raw-value"
+      }
+    ]
+    self.writeContent("%s/test-httpd-cors.cfg" % self.base_dir, "")
+    self.writeContent("%s/monitor-htpasswd" % self.base_dir, "")
+    self.writeContent("%s/content" % self.base_dir, self.file_content)
+    self.writeContent("%s/.httpd_pwd_real" % self.base_dir, self.httpd_passwd)
+    self.writeContent(self.httpd_passwd_bin, self.httpd_passwd_script)
+    os.chmod(self.httpd_passwd_bin, 0755)
+
+  def tearDown(self):
+    if os.path.exists(self.base_dir):
+      shutil.rmtree(self.base_dir)
+
+  def writeContent(self, file_path, config):
+    with open(file_path, 'w') as cfg:
+      cfg.write(config)
+
+  def generate_cors_string(self, cors_domain_list):
+    cors_string = ""
+    for domain in cors_domain_list:
+      if cors_string:
+        cors_string += '|'
+      cors_string += re.escape(domain)
+
+    cors_string = 'SetEnvIf Origin "^http(s)?://(.+\.)?(%s)$" origin_is=$0\n' % cors_string
+    cors_string += 'Header always set Access-Control-Allow-Origin %{origin_is}e env=origin_is'
+    return cors_string
+
+  def check_config(self):
+    config_parameter = os.path.join(self.config_dir, 'config.parameters.json')
+    config_parameter_json = json.load(open(config_parameter))
+    config_json = json.load(open(self.config_path))
+
+    for config in config_json:
+      if config["key"]:
+        self.assertTrue(config_parameter_json.has_key(config["key"]))
+        parameter = config_parameter_json[config["key"]]
+      else:
+        continue
+      if config["key"] == 'from-file':
+        self.assertTrue(os.path.exists(parameter['file']))
+        self.assertEqual(config["value"], open(parameter['file']).read())
+      elif config["key"] == 'httpd-password':
+        http_passwd = "%s/monitor-htpasswd" % self.base_dir
+        #XXX where \n bellow come from ?
+        command = 'htpasswd -cb %s admin %s%s' % (http_passwd, config["value"], '\n')
+        self.assertTrue(os.path.exists(parameter['file']))
+        self.assertTrue(os.path.exists(http_passwd))
+        self.assertEquals(config["value"], open(parameter['file']).read())
+        self.assertEquals(open(http_passwd).read(), command)
+      elif config["key"] == 'cors-domain':
+        cors_file = "%s/test-httpd-cors.cfg" % self.base_dir
+        self.assertTrue(os.path.exists(cors_file))
+        cors_string = self.generate_cors_string(config["value"].split())
+        self.assertEquals(cors_string, open(cors_file).read())
+
+  def check_cfg_config(self, config_list):
+    cfg_output = os.path.join(self.config_dir, 'config.cfg')
+    config_cfg = "[public]\n"
+    for config in config_list:
+      if config['key']:
+        config_cfg += '%s = %s\n' % (config['key'], config['value'])
+    with open(cfg_output) as cfg:
+      self.assertEqual(cfg.read(), config_cfg)
+
+  def test_write_config_default(self):
+    self.writeContent(self.config_path, json.dumps(self.config))
+    self.writeContent(os.path.join(self.config_dir, 'config.parameters.json'), json.dumps(self.parameter_dict))
+    cfg_output = os.path.join(self.config_dir, 'config.cfg')
+
+    instance = MonitorConfigWrite(
+      self.config_path,
+      self.httpd_passwd_bin,
+      cfg_output)
+
+    result = instance.applyConfigChanges()
+    self.assertTrue(os.path.exists(cfg_output))
+    # Check result of non raw parameter edition
+    self.assertEquals(result, {'cors-domain': True, 'from-file': True, 'httpd-password': True})
+    self.check_config()
+    self.check_cfg_config(self.config)
+
+  def test_write_config_parts(self):
+    # remove cors config
+    for element in self.config:
+      if element['key'] == "cors-domain":
+        element['key'] = ""
+    self.parameter_dict.pop("cors-domain")
+    self.writeContent(self.config_path, json.dumps(self.config))
+    self.writeContent(os.path.join(self.config_dir, 'config.parameters.json'), json.dumps(self.parameter_dict))
+    cfg_output = os.path.join(self.config_dir, 'config.cfg')
+
+    instance = MonitorConfigWrite(
+      self.config_path,
+      self.httpd_passwd_bin,
+      cfg_output)
+
+    result = instance.applyConfigChanges()
+    self.assertTrue(os.path.exists(cfg_output))
+    # Check result of non raw parameter edition
+    self.assertEquals(result, {'from-file': True, 'httpd-password': True})
+    self.check_config()
+    self.check_cfg_config(self.config)
+
+  def test_write_config_edit_values(self):
+    self.writeContent(self.config_path, json.dumps(self.config))
+    self.writeContent(os.path.join(self.config_dir, 'config.parameters.json'), json.dumps(self.parameter_dict))
+    cfg_output = os.path.join(self.config_dir, 'config.cfg')
+
+    instance = MonitorConfigWrite(
+      self.config_path,
+      self.httpd_passwd_bin,
+      cfg_output)
+
+    result = instance.applyConfigChanges()
+    self.assertTrue(os.path.exists(cfg_output))
+    self.assertEquals(result, {'cors-domain': True, 'from-file': True, 'httpd-password': True})
+    self.check_config()
+    self.check_cfg_config(self.config)
+
+    for config in self.config:
+      if config["key"] != "":
+        config["value"] = "changed.value"
+    self.writeContent(self.config_path, json.dumps(self.config))
+
+    result = instance.applyConfigChanges()
+    self.assertEquals(result, {'cors-domain': True, 'from-file': True, 'httpd-password': True})
+    self.check_config()
+    self.check_cfg_config(self.config)
+
+    # Add new domain in cors domain
+    for config in self.config:
+      if config["key"] != "cors-domain":
+        config["value"] = "changed.value new.domain.com"
+    self.writeContent(self.config_path, json.dumps(self.config))
+
+    result = instance.applyConfigChanges()
+    self.assertEquals(result, {'cors-domain': True, 'from-file': True, 'httpd-password': True})
+    self.check_config()
+    self.check_cfg_config(self.config)

slapos/test/monitor/runpromise.py

+# -*- coding: utf-8 -*-
+import os, time
+import sys
+import shutil
+import tempfile
+import unittest
+import json
+from datetime import datetime
+from slapos.monitor.runpromise import *
+
+class MonitorPromiseTest(unittest.TestCase):
+
+  def setUp(self):
+    self.base_dir = tempfile.mkdtemp()
+    self.promise_dir = os.path.join(self.base_dir, 'promise')
+    self.report_dir = os.path.join(self.base_dir, 'report')
+    self.public_dir = os.path.join(self.base_dir, 'public')
+    self.private_dir = os.path.join(self.base_dir, 'private')
+    self.run_dir = os.path.join(self.base_dir, 'run')
+    os.mkdir(self.promise_dir)
+    os.mkdir(self.public_dir)
+    os.mkdir(self.private_dir)
+    os.mkdir(self.report_dir)
+    os.mkdir(self.run_dir)
+
+
+  def tearDown(self):
+    if os.path.exists(self.base_dir):
+      shutil.rmtree(self.base_dir)
+
+  def writePromiseOK(self, name):
+    content = """#!/bin/sh
+
+echo "success"
+exit 0
+"""
+    promise_path = os.path.join(self.promise_dir, name)
+    self.writeContent(promise_path, content)
+    os.chmod(promise_path, 0755)
+    return promise_path
+
+  def writePromiseNOK(self, name):
+    content = """#!/bin/sh
+
+echo "failed"
+exit 2
+"""
+    promise_path = os.path.join(self.promise_dir, name)
+    self.writeContent(promise_path, content)
+    os.chmod(promise_path, 0755)
+    return promise_path
+
+  def writeContent(self, file_path, config):
+    with open(file_path, 'w') as cfg:
+      cfg.write(config)
+
+  def getPromiseParser(self, name, promise_path, promise_type):
+    pid_path = os.path.join(self.run_dir, '%s.pid' % name)
+    if promise_type == "report":
+      output_path = os.path.join(self.private_dir, '%s.report.json' % name)
+    else:
+      output_path = os.path.join(self.public_dir, '%s.status.json' % name)
+    promise_cmd = [
+      '--pid_path',
+      '%s' % pid_path, '--output', output_path,
+      '--promise_script', promise_path,
+      '--promise_name', name, '--promise_type', promise_type,
+      '--monitor_url', 'https://monitor.test.com/share/jio_private/',
+      '--history_folder', self.public_dir,
+      '--instance_name', 'Monitor', '--hosting_name', 'Monitor ROOT']
+    arg_parser = parseArguments()
+    return arg_parser.parse_args(promise_cmd)
+
+  def test_promise_OK(self):
+    
+    promise = self.writePromiseOK('promise_1')
+    parser = self.getPromiseParser('promise_1', promise, 'status')
+    runpromise(parser)
+
+    result_file = os.path.join(self.public_dir, 'promise_1.status.json')
+    self.assertTrue(os.path.exists(result_file))
+    result1 = json.loads(open(result_file).read())
+    change_time = result1.pop('change-time', 0)
+    change_date = datetime.fromtimestamp(change_time)
+    start_date = result1.pop('start-date')
+    
+    expected_result = {'status': 'OK', 'hosting_subscription': 'Monitor ROOT',
+      'title': u'promise_1', 'instance': 'Monitor',
+      '_links': 
+        {'monitor': {'href': 'https://monitor.test.com/share/jio_private/'}},
+        'message': 'success\n', 'type': 'status'}
+    self.assertEquals(expected_result, result1)
+
+    # second run
+    runpromise(parser)
+    result2 = json.loads(open(result_file).read())
+    change_time2 = result2.pop('change-time', 0)
+    result2.pop('start-date', '2016-08-05 00:00:00')
+    change_date2 = datetime.fromtimestamp(change_time2)
+    self.assertEquals(expected_result, result2)
+    self.assertEquals(change_date.strftime('%Y-%m-%d %H:%M:%S'),
+      change_date2.strftime('%Y-%m-%d %H:%M:%S'))
+
+    history_file = os.path.join(self.public_dir, 'promise_1.history.json')
+    self.assertTrue(os.path.exists(history_file))
+    history = json.load(open(history_file))
+    self.assertTrue(history['date'] > change_time)
+    self.assertTrue(len(history['data']) == 1)
+
+    result1['change-time'] = change_time
+    result1['start-date'] = start_date
+    result1.pop('_links')
+    self.assertEquals(history['data'][0], result1)
+    
+  def test_promise_NOK(self):
+    
+    promise = self.writePromiseNOK('promise_1')
+    parser = self.getPromiseParser('promise_1', promise, 'status')
+    runpromise(parser)
+
+    result_file = os.path.join(self.public_dir, 'promise_1.status.json')
+    self.assertTrue(os.path.exists(result_file))
+    result1 = json.loads(open(result_file).read())
+    change_time = result1.pop('change-time', 0)
+    change_date = datetime.fromtimestamp(change_time)
+    start_date = result1.pop('start-date')
+    
+    expected_result = {'status': 'ERROR', 'hosting_subscription': 'Monitor ROOT',
+      'title': u'promise_1', 'instance': 'Monitor',
+      '_links': 
+        {'monitor': {'href': 'https://monitor.test.com/share/jio_private/'}},
+        'message': 'failed\n', 'type': 'status'}
+    self.assertEquals(expected_result, result1)
+
+    # second run
+    runpromise(parser)
+    result2 = json.loads(open(result_file).read())
+    change_time2 = result2.pop('change-time', 0)
+    result2.pop('start-date', '2016-08-05 00:00:00')
+    change_date2 = datetime.fromtimestamp(change_time2)
+    self.assertEquals(expected_result, result2)
+    self.assertEquals(change_date.strftime('%Y-%m-%d %H:%M:%S'),
+      change_date2.strftime('%Y-%m-%d %H:%M:%S'))
+
+  def test_promise_mixed(self):
+    
+    promise = self.writePromiseOK('promise_1')
+    parser = self.getPromiseParser('promise_1', promise, 'status')
+    runpromise(parser)
+
+    result_file = os.path.join(self.public_dir, 'promise_1.status.json')
+    self.assertTrue(os.path.exists(result_file))
+    result1 = json.loads(open(result_file).read())
+    change_time = result1.pop('change-time')
+    change_date = datetime.fromtimestamp(change_time)
+    start_date = result1.pop('start-date')
+    
+    expected_result = {'status': 'OK', 'hosting_subscription': 'Monitor ROOT',
+      'title': u'promise_1', 'instance': 'Monitor',
+      '_links': 
+        {'monitor': {'href': 'https://monitor.test.com/share/jio_private/'}},
+        'message': 'success\n', 'type': 'status'}
+    self.assertEquals(expected_result, result1)
+
+    # second run with failure
+    time.sleep(2)
+    promise = self.writePromiseNOK('promise_1')
+    parser = self.getPromiseParser('promise_1', promise, 'status')
+    expected_result['message'] = 'failed\n'
+    expected_result['status'] = 'ERROR'
+    runpromise(parser)
+
+    result2 = json.loads(open(result_file).read())
+    change_time2 = result2.pop('change-time')
+    result2.pop('start-date')
+    change_date2 = datetime.fromtimestamp(change_time2)
+    self.assertEquals(expected_result, result2)
+    self.assertNotEquals(change_date.strftime('%Y-%m-%d %H:%M:%S'),
+      change_date2.strftime('%Y-%m-%d %H:%M:%S'))
+
+  def test_report_OK(self):
+    
+    promise = self.writePromiseOK('sample_report')
+    parser = self.getPromiseParser('sample_report', promise, 'report')
+    runpromise(parser)
+
+    result_file = os.path.join(self.private_dir, 'sample_report.report.json')
+    self.assertTrue(os.path.exists(result_file))
+    result1 = json.loads(open(result_file).read())
+    change_time = result1.pop('change-time', 0)
+    change_date = datetime.fromtimestamp(change_time)
+    start_date = result1.pop('start-date')
+    
+    expected_result = {'status': 'OK', 'hosting_subscription': 'Monitor ROOT',
+      'title': 'sample_report', 'instance': 'Monitor',
+      '_links': 
+        {'monitor': {'href': 'https://monitor.test.com/share/jio_private/'}},
+        'message': 'success\n', 'type': 'report'}
+    self.assertEquals(expected_result, result1)
+
+    # second run
+    runpromise(parser)
+    result2 = json.loads(open(result_file).read())
+    change_time2 = result2.pop('change-time', 0)
+    result2.pop('start-date', '2016-08-05 00:00:00')
+    change_date2 = datetime.fromtimestamp(change_time2)
+    self.assertEquals(expected_result, result2)
+    self.assertEquals(change_date.strftime('%Y-%m-%d %H:%M:%S'),
+      change_date2.strftime('%Y-%m-%d %H:%M:%S'))
+
+    history_file = os.path.join(self.public_dir, 'sample_report.history.json')
+    self.assertTrue(os.path.exists(history_file))
+    history = json.load(open(history_file))
+
+
+    result1['change-time'] = change_time
+    result1['start-date'] = start_date
+    #result1.pop('_links')
+    self.assertEquals(history, result1)
+
+  def test_report_mixed(self):
+    
+    promise = self.writePromiseOK('sample_report')
+    parser = self.getPromiseParser('sample_report', promise, 'report')
+    runpromise(parser)
+
+    result_file = os.path.join(self.private_dir, 'sample_report.report.json')
+    self.assertTrue(os.path.exists(result_file))
+    result1 = json.loads(open(result_file).read())
+    change_time = result1.pop('change-time', 0)
+    change_date = datetime.fromtimestamp(change_time)
+    start_date = result1.pop('start-date')
+    
+    expected_result = {'status': 'OK', 'hosting_subscription': 'Monitor ROOT',
+      'title': 'sample_report', 'instance': 'Monitor',
+      '_links': 
+        {'monitor': {'href': 'https://monitor.test.com/share/jio_private/'}},
+        'message': 'success\n', 'type': 'report'}
+    self.assertEquals(expected_result, result1)
+
+    # second run with failure
+    time.sleep(2)
+    promise = self.writePromiseNOK('sample_report')
+    parser = self.getPromiseParser('sample_report', promise, 'report')
+    expected_result['message'] = 'failed\n'
+    expected_result['status'] = 'ERROR'
+    runpromise(parser)
+
+    result2 = json.loads(open(result_file).read())
+    change_time2 = result2.pop('change-time')
+    result2.pop('start-date')
+    change_date2 = datetime.fromtimestamp(change_time2)
+    self.assertEquals(expected_result, result2)
+    self.assertNotEquals(change_date.strftime('%Y-%m-%d %H:%M:%S'),
+      change_date2.strftime('%Y-%m-%d %H:%M:%S'))
+
+