software/erp5testnode: Use switch-softwaretype

Replace `softwaretype` recipe with `switch-softwaretype`

software/erp5testnode/buildout.hash.cfg

@@ -14,8 +14,8 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 307663d73ef3ef94b02567ecd322252e
+md5sum = d9c7c3acb975d44c6c66ca32c550ac58
 
 [template-default]
-filename = instance-default.cfg
-md5sum = 24cc143b1886d443a4c29dcb8147a01c
+filename = instance-default.cfg.jinja.in
+md5sum = f1b25694db5d446c3df03a85478ccdfb

software/erp5testnode/instance-default.cfg → software/erp5testnode/instance-default.cfg.jinja.in

-[buildout]
+{%- set slapparameter_dict = dict(default_parameter_dict, **slapparameter_dict) -%}
+
 
+[buildout]
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -35,20 +37,24 @@ slapos-directory = $${directory:slapos}
 working-directory = $${directory:testnode}
 test-suite-directory = $${directory:test-suite}
 shared-part-list = $${directory:shared}
-proxy-host = $${slap-network-information:local-ipv4}
+proxy-host = {{ partition_ipv4 }}
 proxy-port = 5000
 log-directory = $${directory:log}
 srv-directory = $${rootdirectory:srv}
 software-directory = $${directory:software}
 run-directory = $${directory:run}
-test-node-title = $${slap-parameter:test-node-title}
-node-quantity = $${slap-parameter:node-quantity}
-ipv4-address = $${slap-network-information:local-ipv4}
-ipv6-address = $${slap-network-information:global-ipv6}
-test-suite-master-url = $${slap-parameter:test-suite-master-url}
-instance-dict = $${slap-parameter:instance-dict}
-software-path-list = $${slap-parameter:software-path-list}
-keep-log-days = $${slap-parameter:keep-log-days}
+test-node-title = {{ slapparameter_dict['test-node-title'] }}
+node-quantity = {{ slapparameter_dict['node-quantity'] }}
+ipv4-address = {{ partition_ipv4 }}
+ipv6-address = {{ partition_ipv6 }}
+test-suite-master-url = {{ slapparameter_dict['test-suite-master-url'] }}
+instance-dict = {{ slapparameter_dict['instance-dict'] }}
+{%- if isinstance(slapparameter_dict['software-path-list'], str) %}
+software-path-list = {{ slapparameter_dict['software-path-list'] }}
+{%- else %}
+software-path-list = {{ json.dumps(slapparameter_dict['software-path-list']) }}
+{%- endif %}
+keep-log-days = {{ slapparameter_dict['keep-log-days'] }}
 git-binary = ${git:location}/bin/git
 slapos-binary = ${buildout:bin-directory}/slapos
 testnode = ${buildout:bin-directory}/testnode
@@ -59,7 +65,7 @@ httpd-conf-file = $${rootdirectory:etc}/httpd.conf
 httpd-wrapper = $${rootdirectory:bin}/httpd
 httpd-port = 9080
 httpd-software-access-port = 9081
-httpd-ip = $${slap-network-information:global-ipv6}
+httpd-ip = {{ partition_ipv6 }}
 httpd-log-directory = $${basedirectory:log}
 httpd-software-directory = $${directory:software}
 httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
@@ -117,7 +123,7 @@ template = inline:
       /
     }
   }
-ipv6 = $${slap-network-information:global-ipv6}
+ipv6 = {{ partition_ipv6 }}
 hostname = [$${:ipv6}]
 port = 8080
 username = testnode
@@ -253,10 +259,3 @@ config-port = $${shellinabox-frontend:port}
 module = check_url_available
 name = $${:_buildout_section_name_}.py
 config-url = $${testnode-log-frontend:connection-secure_access}
-
-[slap-parameter]
-node-quantity = 1
-test-suite-master-url =
-instance-dict =
-software-path-list = ["https://lab.nexedi.com/nexedi/slapos/raw/1.0.181/software/seleniumrunner/software.cfg"]
-keep-log-days = 15

software/erp5testnode/instance.cfg

@@ -6,6 +6,34 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+[slap-configuration]
+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}
+
 [switch_softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${template-default:output}
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = $${:default}
+default = instance-default:rendered
+
+[instance-default]
+recipe = slapos.recipe.template:jinja2
+template = ${template-default:output}
+rendered = $${buildout:directory}/instance-default.cfg
+context =
+  import json json
+  jsonkey default_parameter_dict :default-parameters
+  key slapparameter_dict slap-configuration:configuration
+  key partition_ipv6 slap-configuration:ipv6-random
+  key partition_ipv4 slap-configuration:ipv4-random
+default-parameters =
+  {
+    "node-quantity": 1,
+    "test-suite-master-url": "",
+    "instance-dict": "",
+    "software-path-list": ["https://lab.nexedi.com/nexedi/slapos/raw/1.0.181/software/seleniumrunner/software.cfg"],
+    "keep-log-days": 15
+  }

software/erp5testnode/software.cfg

@@ -31,14 +31,14 @@ eggs =
 
 [template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-default]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default.cfg
-output = ${buildout:directory}/template-default.cfg
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template-default.cfg.jinja
 mode = 0644
 
 [versions]