KVM SR: add resiliency test structure.

software/kvm/common.cfg

@@ -42,6 +42,7 @@ eggs =
   websockify
   slapos.cookbook
   slapos.toolbox
+  erp5.util
 
 [http-proxy]
 # https://github.com/nodejitsu/node-http-proxy
@@ -78,7 +79,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 0e84223169661462f439c164d62c2a6a
+#md5sum = 461187060d12a6bea4d5b9699687c0e9
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -91,9 +92,17 @@ mode = 0644
 
 [template-kvm-resilient]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja
+url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = aa4b5a8f6da151ae02cc1350ba40c23e
+#md5sum = 1faf3662b38d78a46b760107cb2c8a5d
+download-only = true
+
+[template-kvm-resilient-test]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.in
+#md5sum = 7b36d6c61154b7ec3113a1bfaa25a904
+output = ${buildout:directory}/template-kvm-resilient-test.cfg
+mode = 0644
 
 [template-kvm-import]
 recipe = slapos.recipe.template
@@ -138,3 +147,4 @@ url = ${:_profile_base_location_}/instance-frontend.cfg.in
 md5sum = cdb690495e9eb007d2b7d2f8e12f5c59
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644
+

software/kvm/development.cfg

@@ -6,11 +6,13 @@ extends =
 parts +=
   slapos.cookbook-repository
   slapos.toolbox-repository
+  erp5.util-repository
   check-recipe
 
 develop =
   ${:parts-directory}/slapos.cookbook-repository
   ${:parts-directory}/slapos.toolbox-repository
+  ${:parts-directory}/erp5.util-repository
 
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
@@ -24,13 +26,18 @@ repository = http://git.erp5.org/repos/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
 
+[erp5.util-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/erp5.git
+branch = scalability-master2
+git-executable = ${git:location}/bin/git
+
 [check-recipe]
 recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
 command =
   grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
 
-[versions]
-websockify = 0.3.0
\ No newline at end of file

software/kvm/instance-kvm-resilient-test.cfg.in

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  deploy-resiliency-test
+  request-resilient-kvm
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+services = $${:etc}/service/
+scripts = $${:etc}/run/
+
+[deploy-resiliency-test]
+recipe = slapos.cookbook:wrapper
+#log-path = {directory:log}
+wrapper-path = $${directory:bin}/runKVMResiliencyTestSuite
+#output = $${binary-wrap-launcher:binary-path}
+#site-id = "{site_id}"
+# Suppose that there is a user zope family in the configuration
+#erp5-url = $${erp5-cluster:connection-family-user}{:site-id}
+#parameters-extra = $*
+command-line = ${buildout:bin-directory}/runKVMResiliencyTestSuite --server-url=$${slap-connection:server-url} --key-file=$${slap-connection:key-file} --cert-file=$${slap-connection:cert-file} --computer-id=$${slap-connection:computer-id} --partition-id=$${slap-connection:partition-id} --software=$${slap-connection:software-release-url} --namebase=kvm --kvm-rootinstance-name='$${request-resilient-kvm:name}'
+#return = url
+
+[request-resilient-kvm]
+<= slap-connection
+recipe = slapos.cookbook:request
+software-url = $${slap-connection:software-release-url}
+software-type = kvm-resilient
+name = Resilient KVM (Root Instance)
+config = virtual-hard-drive-url virtual-hard-drive-md5sum
+config-virtual-hard-drive-url = $${slap-parameter:virtual-hard-drive-url}
+config-virtual-hard-drive-md5sum = $${slap-parameter:virtual-hard-drive-md5sum}
+# We don't use url parameter, but we want it to be there to make sure root instance is ready.
+return = url
+# XXX What to do?
+#sla = instance_guid
+#sla-instance_guid = $${slap-parameter:frontend-instance-guid}
+
+[slap-parameter]
+virtual-hard-drive-url = https://softinst43236.host.vifib.net/data/public/8e2138.php?dl=true
+virtual-hard-drive-md5sum = de0f10c7c6538e9928879332afd9be7a
+# XXX: what to do about pbs-kvm1-computer-guid and kvm1-computer-guid ?
+

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -22,7 +22,7 @@ return =
 # Resilient related parameters
   url ssh-public-key ssh-url notification-id ip
 # KVM related parameters
-  backend-url url
+  backend-url url ipv6
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish

software/kvm/instance.cfg.in

@@ -16,6 +16,9 @@ kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
 kvm-import = ${template-kvm-import:output}
 kvm-export = ${template-kvm-export:output}
 
+# Used for the test of resiliency. The system wants a "test" software_type.
+test = ${template-kvm-resilient-test:output}
+
 frozen = ${instance-frozen:output}
 pull-backup = ${template-pull-backup:output}
 
@@ -29,8 +32,7 @@ cert = $${slap-connection:cert-file}
 
 [dynamic-template-kvm-resilient]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
-md5sum = 1b7a2fcc884649b4d08f238e828899c1
+template = ${template-kvm-resilient:location}/instance-kvm-resilient.cfg.jinja2
 rendered = $${buildout:directory}/template-kvm-resilient.cfg
 context = key buildout buildout:bin-directory
           key develop_eggs_directory buildout:develop-eggs-directory