Repair installation of software/dream

See merge request !724

component/rpy2/buildout.cfg

@@ -27,6 +27,7 @@ rpath =
   ${readline:location}/lib
   ${xz-utils:location}/lib
   ${r-language:location}/lib/R/lib
+  ${r-language:location}/lib64/R/lib
 library-dirs =
   ${pcre:location}/lib
   ${readline:location}/lib

software/dream/buildout.hash.cfg

+[instance]
+filename = instance.cfg
+md5sum = 94e1cd21bbdf7cabb5834223859407e0
\ No newline at end of file

software/dream/instance.cfg

@@ -6,22 +6,26 @@ parts =
   dream_interpreter
   grunt_watch
   publish-connection-parameter
+  dream-platform-url-available
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
+extends = ${monitor-template:rendered}
 
 # parameters
 [instance-parameter]
 recipe = slapos.cookbook:slapconfiguration
-computer = $${slap_connection:computer_id}
-partition = $${slap_connection:partition_id}
-url = $${slap_connection:server_url}
-key = $${slap_connection:key_file}
-cert = $${slap_connection:cert_file}
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
+
 [dream_platform_parameter]
-port = 8080
+port = 18080
 host = $${instance-parameter:ipv6-random}
+url = http://[$${:host}]:$${:port}
 
 # interpreter
 [dream_interpreter]
@@ -35,6 +39,13 @@ recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/dream_platform --debug --host $${dream_platform_parameter:host} --port $${dream_platform_parameter:port} --log $${directory:log}/dream_platform.log
 wrapper-path = $${directory:service}/dream_platform
 
+[dream-platform-url-available]
+<= monitor-promise-base
+module = check_url_available
+name = $${:_buildout_section_name_}.py
+config-url=  $${dream_platform_parameter:url}
+
+
 [grunt_watch]
 recipe = slapos.cookbook:wrapper
 command-line = bash -c 'cd ${dream-repository.git:location}; PATH=${nodejs:location}/bin/:$PATH ${dream-repository.git:location}/node_modules/grunt-cli/bin/grunt watch -f > $${directory:log}/grunt.log'
@@ -63,5 +74,5 @@ log = $${:var}/log
 
 [publish-connection-parameter]
 recipe = slapos.cookbook:publishurl
-url = http://[$${dream_platform_parameter:host}]:$${dream_platform_parameter:port}
+url = $${dream_platform_parameter:url}
 

software/dream/software.cfg

@@ -4,17 +4,18 @@ extends =
   ../../stack/slapos.cfg
   ../../stack/nodejs.cfg
   ../../component/manpy/buildout.cfg
+  ../../stack/monitor/buildout.cfg
+  ./buildout.hash.cfg
 parts =
   slapos-cookbook
   manpy
   dream_testrunner
-  dream_interpreter
   npm_install
   instance
 
 [instance]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/instance.cfg
 
 [dream_testrunner]
@@ -24,17 +25,10 @@ script = dream_testrunner
 initialization =
   ${manpy:initialization}
 
-[dream_interpreter]
-recipe = zc.recipe.egg
-eggs = ${manpy:eggs}
-interpreter = dream_interpreter
-initialization =
-  ${manpy:initialization}
-
 [npm_install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${dream-repository.git:location} && PATH=${git:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+command = cd ${dream-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
 update_command = ${:command}
 
 [versions]
@@ -42,7 +36,6 @@ rpy2 = 2.4.0
 pydot = 1.0.28
 xlrd = 0.9.3
 xlwt = 0.7.5
-pyparsing = 2.0.3
 numpy = 1.16.4
 scipy = 0.13.3
 simpy = 3.0.5

software/dream/test/README.md

+Tests for DREAM software release

software/dream/test/setup.py

+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA 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.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.dream'
+with open("README.md") as f:
+  long_description = f.read()
+
+setup(name=name,
+      version=version,
+      description="Test for SlapOS' DREAM",
+      long_description=long_description,
+      long_description_content_type='text/markdown',
+      maintainer="Nexedi",
+      maintainer_email="info@nexedi.com",
+      url="https://lab.nexedi.com/nexedi/slapos",
+      packages=find_packages(),
+      install_requires=[
+        'slapos.core',
+        'slapos.cookbook',
+        'slapos.libnetworkcache',
+        'requests'
+        ],
+      zip_safe=True,
+      test_suite='test',
+    )

software/dream/test/test.py

+##############################################################################
+# coding: utf-8
+#
+# Copyright (c) 2018 Nexedi SA 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 requests
+
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+
+
+setUpModule, DREAMTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
+
+
+class TestHTTPAccess(DREAMTestCase):
+  def setUp(self):
+    self.url = self.computer_partition.getConnectionParameterDict()["url"]
+
+  def test(self):
+    self.assertEqual(
+        requests.codes.ok,
+        requests.get(self.url, verify=False).status_code
+    )

software/slapos-sr-testing/software.cfg

@@ -138,6 +138,11 @@ setup = ${slapos-repository:location}/software/gitlab/test/
 egg = slapos.test.cloudooo
 setup = ${slapos-repository:location}/software/cloudooo/test/
 
+[slapos.test.dream-setup]
+<= setup-develop-egg
+egg = slapos.test.dream
+setup = ${slapos-repository:location}/software/dream/test/
+
 [slapos.core-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/slapos.core.git
@@ -180,6 +185,7 @@ eggs =
   ${slapos.test.nextcloud-setup:egg}
   ${slapos.test.turnserver-setup:egg}
   ${slapos.test.cloudooo-setup:egg}
+  ${slapos.test.dream-setup:egg}
   ${backports.lzma:egg}
 entry-points =
   runTestSuite=erp5.util.testsuite:runTestSuite
@@ -239,6 +245,7 @@ extra =
   ${slapos.test.grafana-setup:setup}
   ${slapos.test.gitlab-setup:setup}
   ${slapos.test.cloudooo-setup:setup}
+  ${slapos.test.dream-setup:setup}
 
 [versions]
 # slapos.core is used from the clone always