[SlapOS Core] Improve configure-local command and add test for this command

MANIFEST.in

 include CHANGES.txt
 include slapos/proxy/schema.sql
+include slapos/slapos-client.cfg.example
+include slapos/slapos-proxy.cfg.example
+include slapos/slapos.cfg.example
 recursive-include slapos *.in *.txt *.xsd

setup.py

 from setuptools import setup, find_packages
+from shutil import copyfile
 import glob
 import os
 
 from slapos.version import version
-
 name = 'slapos.core'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -11,6 +11,12 @@ long_description = open("README.txt").read() + "\n" + \
 for f in sorted(glob.glob(os.path.join('slapos', 'README.*.txt'))):
   long_description += '\n' + open(f).read() + '\n'
 
+slapos_folder_path = os.path.dirname(__file__)
+for template_name in ('slapos-client.cfg.example',
+    'slapos-proxy.cfg.example', 'slapos.cfg.example'):
+  copyfile(os.path.join(slapos_folder_path, template_name),
+    os.path.join(slapos_folder_path, 'slapos', template_name))
+
 additional_install_requires = []
 # Even if argparse is available in python2.7, some python2.7 installations
 # do not have it, so checking python version is dangerous

slapos-proxy.cfg.example

 # This is an example configuration file for a standalone micro slapos master
 # a.k.a slapproxy
+[slapos]
+instance_root = /srv/slapgrid
+software_root = /opt/slapgrid
+computer_id = local_computer
+ 
 [slapproxy]
 host = 127.0.0.1
 port = 5000
@@ -8,7 +13,7 @@ database_uri = /opt/slapos/slapproxy.db
 # Below is the list of software maintained by slapos.org and contributors
 # It is used to simulate a proper configuration of a real slapos master.
 software_product_list =
-  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.143:/software/erp5/software.cfg
+  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.195:/software/erp5/software.cfg
   erp5_branch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5:/software/erp5/software.cfg
   kumofs http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.141:/software/kumofs/software.cfg
   kvm http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.193:/software/kvm/software.cfg

slapos/cli/command.py

@@ -5,10 +5,10 @@ import functools
 import os
 import sys
 
-import cliff
+from cliff import command
 
 
-class Command(cliff.command.Command):
+class Command(command.Command):
 
     def get_parser(self, prog_name):
         parser = argparse.ArgumentParser(

slapos/cli/configure_local/template/slapos-proxy.cfg.in

-# This is an example configuration file for a standalone micro slapos master
-# a.k.a slapproxy
-[slapproxy]
-host = %(host)s
-port = %(port)s
-database_uri = /opt/slapos/slapproxy.db
-
-# Below is the list of software maintained by slapos.org and contributors
-# It is used to simulate a proper configuration of a real slapos master.
-software_product_list =
-  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.143:/software/erp5/software.cfg
-  erp5_branch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5:/software/erp5/software.cfg
-  kumofs http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.141:/software/kumofs/software.cfg
-  kvm http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.193:/software/kvm/software.cfg
-  maarch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.159:/software/maarch/software.cfg
-  mariadb http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.152:/software/mariadb/software.cfg
-  memcached http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.82:/software/memcached/software.cfg
-  slaposwebrunner http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.160:/software/slaprunner/software.cfg
-  wordpress http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.163:/software/wordpress/software.cfg
-  zabbixagent http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.162:/software/zabbix-agent/software.cfg

slapos/cli/configure_local/template/slapos.cfg.in

-[slapos]
-# Replace computer_id by the unique identifier of your computer on your SlapOS,
-# Master, usually starting by COMP-
-computer_id = %(computer_id)s
-master_url = %(master_url)s
-software_root = /opt/slapgrid
-instance_root = /srv/slapgrid
-
-[slapformat]
-# Replace by your network interface providing IPv6 if you don't use re6st
-interface_name = %(interface_name)s
-# Change "create_tap" into "true" if you need to host KVM services
-create_tap = false
-partition_amount = %(partition_amount)s
-computer_xml = /opt/slapos/slapos.xml
-log_file = /opt/slapos/log/slapos-node-format.log
-partition_base_name = slappart
-user_base_name = slappart
-# You can choose any other local network which does not conflict with your
-# current machine configuration
-ipv4_local_network = %(ipv4_local_network)
-# Change to true if you want slapos to use local-only IPv6
-use_unique_local_address = True
-
-[networkcache]
-# Define options for binary cache, used to download already compiled software.
-download-binary-cache-url = http://www.shacache.org/shacache
-download-cache-url = https://www.shacache.org/shacache
-download-binary-dir-url = http://www.shacache.org/shadir
-
-# Configuration to Upload Configuration for Binary cache
-#upload-binary-dir-url = https://www.shacache.org/shadir
-#upload-binary-cache-url = https://www.shacache.org/shacache
-#signature_private_key_file = /etc/opt/slapos/shacache/signature.key
-#signature_certificate_file = /etc/opt/slapos/shacache/signature.cert
-#upload-cache-url = https://www.shacache.org/shacache
-#shacache-cert-file = /etc/opt/slapos/shacache/shacache.cert
-#shacache-key-file = /etc/opt/slapos/shacache/shacache.key
-#upload-binary-dir-url = https://www.shacache.org/shadir
-#upload-binary-cache-url = https://www.shacache.org/shacache
-#upload-dir-url = https://www.shacache.org/shadir
-#shadir-cert-file = /etc/opt/slapos/shacache/shacache.cert
-#shadir-key-file = /etc/opt/slapos/shacache/shacache.key
-
-# List of signatures of uploaders we trust:
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Lukasz Nowak
-#   Marco Mariani
-#   Test Agent Signature
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAL9FOtBJZBqAMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtOTIyMCAXDTEyMDkyNjE2MDkwM1oYDzIxMTIwOTAyMTYwOTAzWjAT
-  MREwDwYDVQQDDAhDT01QLTkyMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wlGVd6qOsc2xrtAQ5/rpflzS14/84SE/joaujMw2GGk6EFVSOcqKLq1TnHxkcCkv
-  nv1NYRPK/hpQOIKcGC1f+DvXXpMJI29R/rt2b2/y1oolxXonSVigBtCQlSyDoOFN
-  6LBX84CI5aYMvy3mqJCvfGEFBaPqze/PVugq9IpgZg0CAwEAAaNQME4wHQYDVR0O
-  BBYEFJ7HWyzVKkeSYnSK4FIwcdyng/tRMB8GA1UdIwQYMBaAFJ7HWyzVKkeSYnSK
-  4FIwcdyng/tRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAZQWob2ki
-  ie6h90FgSctozXrotb8NIis2MtLIj+WonE0wSqYefxwBmAGjB9cfWz/sNamhM4rn
-  BP1A2ojVhF6hOE1qvTP5YxcGXOoYTrEQSuDF1hn12WlA4vqIAz1f+4CiMJNlXPwh
-  7N+X2kvRpHdXAHkBOxX3j34AeCZrSpu/yDQ=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-# List of URL(s) which shouldn't be downloaded from binary cache.
-# Any URL beginning by a blacklisted URL will be blacklisted as well.
-download-from-binary-cache-url-blacklist =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads
-  /
-# List of URL(s) which shouldn't be uploaded into binary cache.
-# Any URL beginning by a blacklisted URL will be blacklisted as well.
-upload-to-binary-cache-url-blacklist =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads
-  /

slapos/grid/slapgrid.py

@@ -65,6 +65,7 @@ COMPUTER_PARTITION_STOPPED_STATE = 'stopped'
 SLAPGRID_SUCCESS = 0
 SLAPGRID_FAIL = 1
 SLAPGRID_PROMISE_FAIL = 2
+PROMISE_TIMEOUT = 3
 
 # XXX hardcoded watchdog_path
 WATCHDOG_PATH = '/opt/slapos/bin/slapos-watchdog'
@@ -214,7 +215,7 @@ def create_slapgrid_object(options, logger):
                   upload_dir_url=op.get('upload-dir-url'),
                   master_ca_file=op.get('master_ca_file'),
                   certificate_repository_path=op.get('certificate_repository_path'),
-                  promise_timeout=op['promise_timeout'],
+                  promise_timeout=op.get('promise_timeout', PROMISE_TIMEOUT),
                   shacache_cert_file=op.get('shacache-cert-file'),
                   shacache_key_file=op.get('shacache-key-file'),
                   shadir_cert_file=op.get('shadir-cert-file'),

slapos/proxy/__init__.py

@@ -69,8 +69,6 @@ class ProxyConfig(object):
   def setConfig(self):
     if not self.database_uri:
       raise ValueError('database-uri is required.')
-      self.software_product_list = _generateSoftwareProductListFromString(
-          getattr(self, 'software_product_list', ''))
 
 
 def do_proxy(conf):
@@ -80,5 +78,7 @@ def do_proxy(conf):
   app.logger.setLevel(logging.INFO)
   app.config['computer_id'] = conf.computer_id
   app.config['DATABASE_URI'] = conf.database_uri
-  app.config['software_product_list'] = conf.software_product_list
+  app.config['software_product_list'] = \
+    _generateSoftwareProductListFromString(
+      getattr(conf, 'software_product_list', ""))
   app.run(host=conf.host, port=int(conf.port))

slapos/tests/configure_local.py

+##############################################################################
+#
+# Copyright (c) 2014 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import unittest
+import shutil
+import tempfile
+import slapos.slap
+import slapos.cli.configure_local
+from slapos.cli.configure_local import ConfigureLocalCommand, _createConfigurationDirectory 
+from slapos.cli.entry import SlapOSApp
+from argparse import Namespace
+from ConfigParser import ConfigParser
+
+# Disable any command to launch slapformat and supervisor
+slapos.cli.configure_local._runFormat = lambda x: "Do nothing"
+slapos.cli.configure_local.launchSupervisord = lambda socket, \
+  configuration_file, logger: "Do nothing"
+
+class TestConfigureLocal(unittest.TestCase):
+
+    def setUp(self):
+        self.slap = slapos.slap.slap()
+        self.app = SlapOSApp()
+        self.temp_dir = tempfile.mkdtemp()
+        os.environ["HOME"] = self.temp_dir
+        self.instance_root = tempfile.mkdtemp()
+        self.software_root = tempfile.mkdtemp()
+        if os.path.exists(self.temp_dir):
+          shutil.rmtree(self.temp_dir)
+
+    def tearDown(self):
+        for temp_path in (self.temp_dir, \
+          self.instance_root, self.software_root):
+            if os.path.exists(temp_path):
+                shutil.rmtree(temp_path)
+
+    def test_configure_local_environment_with_default_value(self):
+        config = ConfigureLocalCommand(self.app, Namespace())
+        config.__dict__.update({i.dest: i.default \
+          for i in config.get_parser(None)._option_string_actions.values()})
+        config.slapos_configuration_directory = self.temp_dir
+        config.slapos_buildout_directory = self.temp_dir
+        config.slapos_instance_root = self.instance_root
+        slapos.cli.configure_local.do_configure(
+            config, config.fetch_config, self.app.log)
+        expected_software_root = "/opt/slapgrid"
+        self.assertTrue(
+            os.path.exists("%s/.slapos/slapos-client.cfg" % self.temp_dir))
+        with open(self.temp_dir + '/slapos-proxy.cfg') as fout:
+            proxy_config = ConfigParser()
+            proxy_config.readfp(fout)
+            self.assertEquals(proxy_config.get('slapos', 'instance_root'),
+                self.instance_root)
+            self.assertEquals(proxy_config.get('slapos', 'software_root'),
+                expected_software_root)
+        with open(self.temp_dir + '/slapos.cfg') as fout:
+            proxy_config = ConfigParser()
+            proxy_config.readfp(fout)
+            self.assertEquals(proxy_config.get('slapos', 'instance_root'),
+                self.instance_root)
+            self.assertEquals(proxy_config.get('slapos', 'software_root'),
+                expected_software_root)
+
+    def test_configure_local_environment(self):
+        config = ConfigureLocalCommand(self.app, Namespace())
+        config.__dict__.update({i.dest: i.default \
+          for i in config.get_parser(None)._option_string_actions.values()})
+        config.slapos_configuration_directory = self.temp_dir
+        config.slapos_buildout_directory = self.temp_dir
+        config.slapos_instance_root = self.instance_root
+        config.slapos_software_root = self.software_root
+        slapos.cli.configure_local.do_configure(
+            config, config.fetch_config, self.app.log)
+        log_folder = os.path.join(config.slapos_buildout_directory, 'log')
+        self.assertTrue(os.path.exists(log_folder), "%s not exists" % log_folder)
+        self.assertTrue(
+            os.path.exists("%s/.slapos/slapos-client.cfg" % self.temp_dir))
+        with open(self.temp_dir + '/slapos-proxy.cfg') as fout:
+            proxy_config = ConfigParser()
+            proxy_config.readfp(fout)
+            self.assertEquals(proxy_config.get('slapos', 'instance_root'),
+                self.instance_root)
+            self.assertEquals(proxy_config.get('slapos', 'software_root'),
+                self.software_root)
+        with open(self.temp_dir + '/slapos.cfg') as fout:
+            proxy_config = ConfigParser()
+            proxy_config.readfp(fout)
+            self.assertEquals(proxy_config.get('slapos', 'instance_root'),
+                self.instance_root)
+            self.assertEquals(proxy_config.get('slapos', 'software_root'),
+                self.software_root)
+            log_file = proxy_config.get('slapformat', 'log_file')
+            self.assertTrue(log_file.startswith(log_folder),
+                "%s don't starts with %s" % (log_file, log_folder))