software/[theia, slaprunner]: Enable hateoas support

See merge request !977

software/slaprunner/buildout.hash.cfg

@@ -50,7 +50,7 @@ md5sum = 7a2f5e25a818cb29964666ada7852a5c
 
 [template-slapos-cfg]
 filename = template/slapos.cfg.in
-md5sum = 3b228b26a170f3c07c50a0f2ae056daf
+md5sum = 03322b8a0f42ea579d35981211359190
 
 [template-slapformat-definition.cfg]
 filename = template/slapformat-definition.cfg.in

software/slaprunner/template/slapos.cfg.in

@@ -13,6 +13,7 @@ shared_part_list =
   {%- endfor %}
   {{ slaprunner['shared_root'] }}
 master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
+master_rest_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}/hateoas
 computer_id = slaprunner
 maximal_delay = 0
 root_check = {{ slaprunner['root_check'] }}

software/slaprunner/test/test.py

@@ -53,10 +53,6 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
         os.path.join(os.path.dirname(__file__), '..',
                      'software%s.cfg' % ("-py3" if six.PY3 else ""))))
 
-class SlaprunnerTestCase(SlapOSInstanceTestCase):
-  # Slaprunner uses unix sockets, so it needs short paths.
-  __partition_reference__ = 's'
-
 class SlaprunnerTestCase(SlapOSInstanceTestCase):
   # Slaprunner uses unix sockets, so it needs short paths.
   __partition_reference__ = 's'
@@ -423,14 +419,14 @@ class TestSlapOS(SlaprunnerTestCase):
   def test_slapos_command(self):
     # in ~/bin/slapos there is a wrapper setting configuration to use slapos from
     # the web runner.
-    proxy_show_output = subprocess.check_output(
-        (
-            os.path.join(self.computer_partition_root_path, 'bin', 'slapos'),
-            'proxy',
-            'show',
-        ),
-        env={})
+    slapos = os.path.join(self.computer_partition_root_path, 'bin', 'slapos')
+    # ensure the node is formatted
+    subprocess.check_call((slapos, 'node', 'format', '--now'), env={})
+    proxy_show_output = subprocess.check_output((slapos, 'proxy', 'show'), env={})
     self.assertIn(b'slaprunner', proxy_show_output)
+    # check hateoas cli support
+    computer_list_output = subprocess.check_output((slapos, 'computer', 'list'), env={})
+    self.assertIn(b'slaprunner', computer_list_output)
 
   def test_shared_part_list(self):
     # this slapos used shared_part_list

software/theia/software.cfg

@@ -97,6 +97,7 @@ initialization =
       software_root="%s/software" % args.base_directory,
       instance_root="%s/instance" % args.base_directory,
       partition_forward_configuration=partition_forward_configuration,
+      slapos_bin="${buildout:bin-directory}/slapos",
   )
   standalone.start()
   partition_count = 20

software/theia/test/test.py

@@ -187,6 +187,13 @@ class TestTheia(TheiaTestCase):
     )
     self.assertTrue(os.path.exists(script_path))
 
+  def test_slapos_cli(self):
+    slapos = self._getSlapos()
+    proxy_show_output = subprocess.check_output((slapos, 'proxy', 'show'))
+    self.assertIn('slaprunner', proxy_show_output)
+    computer_list_output = subprocess.check_output((slapos, 'computer', 'list'))
+    self.assertIn('slaprunner', computer_list_output)
+
 
 class TestTheiaEmbeddedSlapOSShutdown(TheiaTestCase):
   def test_stopping_instance_stops_embedded_slapos(self):

stack/slapos.cfg

@@ -208,7 +208,7 @@ setuptools-dso = 1.7
 rubygemsrecipe  = 0.3.0
 six = 1.12.0
 slapos.cookbook = 1.0.184
-slapos.core = 1.6.9
+slapos.core = 1.6.12
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20