kvm: NDB server instance is OK even if no image is uploaded

NBD server is not running until an image is uploaded. Make sure that the
promise doesn't fail until the image is there. Also display a WARNING in
the connection parameter to say that the NBD server is not running.

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 2cbfd6b08c65369c1d45cf3ba2ff335a
+md5sum = a236b719aaac61ac342ada0ce569151a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
@@ -46,8 +46,8 @@ filename = template/kvm-export.sh.jinja2
 md5sum = b617d64de73de1eed518185f310bbc82
 
 [template-nbd]
-filename = instance-nbd.cfg.in
-md5sum = c3667c9bbaa8627dad90f1abd62d2f16
+filename = instance-nbd.cfg.jinja2
+md5sum = 003112c44ef8d536861a46e3dfc67a37
 
 [template-ansible-promise]
 filename = template/ansible-promise.in

software/kvm/instance-nbd.cfg.in

-#############################
-#
-# Instanciate nbdserver
-#
-#############################
-[buildout]
-parts =
-  nbd-promise
-  onetimeupload-promise
-  publish-connection-information
-extends = ${monitor-template:output}
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-srv = $${buildout:directory}/srv
-log = $${buildout:directory}/log
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-watched-services = $${rootdirectory:etc}/service
-
-[nbd-instance]
-recipe = slapos.cookbook:nbdserver
-ip = $${slap-network-information:global-ipv6}
-port = 1024
-image-path = $${onetimeupload-instance:image-path}
-qemu-path = ${kvm:location}/bin/qemu-nbd
-shell-path = ${dash:location}/bin/dash
-# XXX TODO: Wait for the iso to be uploaded (execute_wait)
-path = $${basedirectory:services}/nbdserver
-
-[nbd-promise]
-<= monitor-promise-base
-module = check_port_listening
-name = nbd_promise.py
-config-hostname = $${nbd-instance:ip}
-config-port = $${nbd-instance:port}
-
-[gen-passwd]
-recipe = slapos.cookbook:generate.password
-storage-path = $${rootdirectory:srv}/passwd
-bytes = 24
-
-[onetimeupload-instance]
-recipe = slapos.cookbook:onetimeupload
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-image-path = $${rootdirectory:srv}/cdrom.iso
-log-path = $${rootdirectory:log}/onetimeupload.log
-shell-path = ${dash:location}/bin/dash
-onetimeupload-path = ${buildout:bin-directory}/onetimeupload
-path = $${basedirectory:watched-services}/onetimeupload
-key = $${gen-passwd:passwd}
-
-[onetimeupload-promise]
-<= monitor-promise-base
-module = check_port_listening
-name = onetimeupload_promise.py
-config-hostname = $${onetimeupload-instance:ip}
-config-port = $${onetimeupload-instance:port}
-
-[publish-connection-information]
-recipe = slapos.cookbook:publish
-nbd_url = nbd://[$${nbd-instance:ip}]:$${nbd-instance:port}
-upload_url = http://[$${onetimeupload-instance:ip}]:$${onetimeupload-instance:port}/
-upload_key = $${onetimeupload-instance:key}

software/kvm/instance-nbd.cfg.jinja2

+#############################
+#
+# Instanciate nbdserver
+#
+#############################
+[buildout]
+parts =
+  nbd-promise
+  onetimeupload-promise
+  publish-connection-information
+extends = {{ template_monitor }}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+bin = ${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+srv = ${buildout:directory}/srv
+log = ${buildout:directory}/log
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = ${rootdirectory:etc}/run
+watched-services = ${rootdirectory:etc}/service
+
+[nbd-instance]
+recipe = slapos.cookbook:nbdserver
+ip = ${slap-network-information:global-ipv6}
+port = 1024
+image-path = ${onetimeupload-instance:image-path}
+qemu-path =  {{ qemu_nbd_executable_location }}
+shell-path = {{ dash_executable_location }}
+# XXX TODO: Wait for the iso to be uploaded (execute_wait)
+path = ${basedirectory:services}/nbdserver
+
+[nbd-checker-bin]
+recipe = slapos.recipe.template:jinja2
+template = inline:#!/bin/sh
+  [ ! -f ${onetimeupload-instance:image-path} ] ||
+    ${buildout:executable} -c 'import socket ; socket.create_connection(("${nbd-instance:ip}","${nbd-instance:port}")).close()'
+rendered = ${rootdirectory:bin}/check-nbd-running.sh
+
+[nbd-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = nbd_promise.py
+config-command = ${nbd-checker-bin:rendered}
+
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = ${rootdirectory:srv}/passwd
+bytes = 24
+
+[onetimeupload-instance]
+recipe = slapos.cookbook:onetimeupload
+ip = ${slap-network-information:global-ipv6}
+port = {{ slapparameter_dict.get('otu-port', 8080) }}
+image-path = ${rootdirectory:srv}/cdrom.iso
+log-path = ${rootdirectory:log}/onetimeupload.log
+shell-path = {{ dash_executable_location }}
+onetimeupload-path = {{ onetimeupload_executable_location }}
+path = ${basedirectory:watched-services}/onetimeupload
+key = ${gen-passwd:passwd}
+
+[onetimeupload-promise]
+<= monitor-promise-base
+module = check_port_listening
+name = onetimeupload_promise.py
+config-hostname = ${onetimeupload-instance:ip}
+config-port = ${onetimeupload-instance:port}
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+nbd_hostname = ${nbd-instance:ip}
+nbd_port = ${nbd-instance:port}
+upload_url = http://[${onetimeupload-instance:ip}]:${onetimeupload-instance:port}
+upload_key = ${onetimeupload-instance:key}
+status_message = ${detect-if-cdrom-present:status}
+
+[detect-if-cdrom-present]
+recipe = collective.recipe.shelloutput
+commands =
+  status = [ -f ${onetimeupload-instance:image-path} ] && echo "image already uploaded, you can't upload it again" || echo "WARNING: no image yet, the NBD server doesn't work"

software/kvm/instance.cfg.in

@@ -12,7 +12,7 @@ recipe = slapos.cookbook:softwaretype
 default = $${:kvm}
 kvm-cluster = $${dynamic-template-kvm-cluster:rendered}
 kvm = $${dynamic-template-kvm:rendered}
-nbd = ${template-nbd:output}
+nbd = $${dynamic-template-nbd:rendered}
 
 kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
 kvm-import = $${dynamic-template-kvm-import:rendered}
@@ -149,3 +149,16 @@ context =
     raw gzip_binary ${gzip:location}/bin/gzip
 mode = 0644
 
+[dynamic-template-nbd]
+<= jinja2-template-base
+template = ${template-nbd:location}/instance-nbd.cfg.jinja2
+filename = template-nbd.cfg
+context =
+  section slap_configuration slap-configuration
+  key slapparameter_dict slap-configuration:configuration
+  key eggs_directory buildout:eggs-directory
+  key develop_eggs_directory buildout:develop-eggs-directory
+  raw qemu_nbd_executable_location ${kvm:location}/bin/qemu-nbd
+  raw dash_executable_location ${dash:location}/bin/dash
+  raw onetimeupload_executable_location ${buildout:bin-directory}/onetimeupload
+  raw template_monitor ${monitor2-template:rendered}

software/kvm/software.cfg

@@ -144,8 +144,8 @@ filename = kvm-export.sh.jinja2
 mode = 0755
 
 [template-nbd]
-<= template-file-base
-output = ${buildout:directory}/template-nbd.cfg
+<= download-file-base
+on-update = true
 
 [template-ansible-promise]
 <= download-template-base

software/kvm/test/test.py

@@ -308,3 +308,29 @@ class TestInstanceResilient(InstanceTestCase):
         'takeover-kvm-1-password',
         'takeover-kvm-1-url',
         'url']))
+
+class TestInstanceNbdServer(InstanceTestCase):
+  __partition_reference__ = 'ins'
+  instance_max_retry = 5
+
+  @classmethod
+  def getInstanceSoftwareType(cls):
+    return 'nbd'
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    # port 8080 is used by testnode, use another one
+    return {
+      'otu-port': '8090'
+    }
+
+  def test(self):
+    connection_parameter_dict = self.computer_partition\
+      .getConnectionParameterDict()
+    result = requests.get(connection_parameter_dict['upload_url'].strip(), verify=False)
+    self.assertEqual(
+      httplib.OK,
+      result.status_code
+    )
+    self.assertIn('<title>Upload new File</title>', result.text)
+    self.assertIn("WARNING", connection_parameter_dict['status_message'])