seleniumserver: switch to switch-softwaretype

software/seleniumserver/buildout.hash.cfg

@@ -15,8 +15,8 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = c4ac5de141ae6a64848309af03e51d88
+md5sum = 0084214fae4ee1aad2c878aa393757af
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 973a43eb3cb4b663476987b7e64aae11
+md5sum = 884196ea35de35fa9159517912441ce6

software/seleniumserver/instance-selenium.cfg.in

@@ -61,7 +61,7 @@ command-line =
 
 # newSessionWaitTimeout: let clients wait in the queue when no node are available
 # maxSession: to accept enough clients
-hostname = $${instance-parameter:ipv4-random}
+hostname = $${slap-configuration:ipv4-random}
 port = 4444
 base-url = http://$${:hostname}:$${:port}
 url = $${:base-url}/wd/hub
@@ -94,7 +94,7 @@ environment =
   XORG_LOCK_DIR=$${directory:tmp}
   DISPLAY=$${xvfb-instance:display}
   FONTCONFIG_FILE=$${fontconfig-conf:rendered}
-hostname = $${instance-parameter:ipv4-random}
+hostname = $${slap-configuration:ipv4-random}
 
 
 [selenium-server-node-instance-firefox-52]
@@ -164,7 +164,7 @@ template = inline:
       $${:path-hub}
     }
   }
-ip = $${instance-parameter:ipv6-random}
+ip = $${slap-configuration:ipv6-random}
 hostname = [$${:ip}]
 port = 9443
 path-admin = /grid/console
@@ -192,7 +192,7 @@ recipe = slapos.cookbook:userinfo
 recipe = slapos.cookbook:free_port
 minimum = 22222
 maximum = 22231
-ip = $${slap-network-information:global-ipv6}
+ip = $${slap-configuration:ipv6-random}
 hostname = $${:ip}
 
 [ssh-keygen-base]
@@ -263,7 +263,7 @@ recipe = plone.recipe.command
 stop-on-error = true
 location = $${buildout:directory}/.ssh
 authorized-keys-file = $${:location}/authorized_keys
-command = mkdir -p $${:location} && echo '$${instance-parameter:configuration.ssh-authorized-key}' > $${:authorized-keys-file}
+command = mkdir -p $${:location} && echo '$${slap-configuration:configuration.ssh-authorized-key}' > $${:authorized-keys-file}
 
 
 [promises]
@@ -371,7 +371,7 @@ ssh-fingerprint = $${ssh-key-fingerprint:fingerprint}
 run-node-command = PORT=7999 bash -c 'trap '"'"'kill -TERM $SSHPID; wait $SSHPID '"'"' TERM INT; ssh -L 4444:$${selenium-server-hub-instance:hostname}:$${selenium-server-hub-instance:port} -R $PORT:127.0.0.1:$PORT -p $${sshd-service:port} $${sshd-service:username}@$${sshd-service:ip} & SSHPID=$!; java -jar selenium-server-standalone-3.14.0.jar -role node -host 127.0.0.1 -port $PORT ; wait "$SSHPID"'
 
 
-[instance-parameter]
+[slap-configuration]
 recipe = slapos.cookbook:slapconfiguration
 computer = $${slap-connection:computer-id}
 partition = $${slap-connection:partition-id}

software/seleniumserver/instance.cfg.in

@@ -6,15 +6,21 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+[dynamic-template-selenium]
+recipe = slapos.recipe.template:jinja2
+template = ${template-selenium:output}
+rendered = $${buildout:parts-directory}/$${:_buildout_section_name_}/$${:filename}
+filename = instance-selenium.cfg
+context =
+    key partition_ipv6 slap-configuration:ipv6-random
+
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${template-selenium:output}
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = $${:default}
+default = dynamic-template-selenium:rendered
 
-[slap-connection]
-# part to migrate to new - separated words
-computer-id = $${slap_connection:computer_id}
-partition-id = $${slap_connection:partition_id}
-server-url = $${slap_connection:server_url}
-software-release-url = $${slap_connection:software_release_url}
-key-file = $${slap_connection:key_file}
-cert-file = $${slap_connection:cert_file}
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}

software/seleniumserver/software.cfg

@@ -76,6 +76,3 @@ post-install =
 [firefox-78]
 post-install =
   ${symlink-extra-fonts-to-firefox-fonts-dir:install}
-
-[versions]
-plone.recipe.command = 1.1