software/kvm: Drop obsoleted nbd functionality

software/kvm/README.rst

@@ -4,7 +4,7 @@ kvm
 Introduction
 ------------
 
-This software release is used to deploy KVM and NBD instances.
+This software release is used to deploy KVM.
 
 For extensive parameters definition, please look at parameter-input-schema.json.
 
@@ -24,7 +24,6 @@ to be accessible from IPv4::
       software_release=kvm,
       partition_reference="My awesome KVM",
       partition_parameter_kw={
-          "nbd-host":"ubuntu-1204.nbd.vifib.net",
       }
   )
 
@@ -38,10 +37,6 @@ KVM instance parameters:
 - frontend-instance-guid
 - frontend-addtional-instance-guid
 - frontend-instance-name (default: VNC Frontend)
-- nbd-port (default: 1024)
-- nbd-host
-- nbd2-port (default: 1024)
-- nbd2-host
 
 - ram-size (default: 4096)
 - disk-size = (default: 40)

software/kvm/buildout.hash.cfg

@@ -15,15 +15,15 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = ee1fe10d8db4d3c39e3a3f1b53d12883
+md5sum = 07d0e2445a858a8cfe6821ac9f83ed3e
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 9916c160b1c9711145d7e10506a9fca8
+md5sum = fd774f38347abde5dfd677e16762af2b
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 6e6f6748ec466eb49a4f872aec7563fa
+md5sum = 8ce14c5ae114dcfa6e9aff0511b218d4
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
@@ -45,10 +45,6 @@ md5sum = 34d1b7cc8ca62bfdfce759a1dfbbaccd
 filename = template/kvm-export.sh.jinja2
 md5sum = 64aa1ce8785f6b94aabd787fa3443082
 
-[template-nbd]
-filename = instance-nbd.cfg.jinja2
-md5sum = e041e8011ad2ec7f104be173ef76f5e9
-
 [template-nginx]
 filename = template/nginx_conf.in
 md5sum = 9ca886120a99befe25ca761ddc54753c
@@ -59,7 +55,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b
 
 [template-kvm-run]
 filename = template/template-kvm-run.in
-md5sum = f0190843e3979742fe9e29b8a607539f
+md5sum = 497f5b78a360b994ab2ab607339003e0
 
 [template-kvm-controller]
 filename = template/kvm-controller-run.in

software/kvm/instance-kvm-cluster-input-schema.json

@@ -354,20 +354,6 @@
                 "vmxnet3"
               ]
             },
-            "nbd-host": {
-              "title": "NBD hostname or IP",
-              "description": "hostname (or IP) of the NBD server containing the boot image.",
-              "type": "string",
-              "format": "internet-address"
-            },
-            "nbd-port": {
-              "title": "NBD port",
-              "description": "Port of the NBD server containing the boot image.",
-              "type": "integer",
-              "default": 1024,
-              "minimum": 1,
-              "maximum": 65535
-            },
             "virtual-hard-drive-url": {
               "title": "Existing disk image URL",
               "description": "If specified, will download an existing disk image (qcow2, raw, ...), and will use it as main virtual hard drive. Can be used to download and use an already installed and customized virtual hard drive.",

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -75,8 +75,6 @@ config-name = {{ instance_name }}
 {% if slapparameter_dict.get('authorized-keys', []) -%}
 config-authorized-key = {{ dumps(slapparameter_dict.get('authorized-keys') | join('\n')) }}
 {% endif -%}
-config-nbd-port = {{ dumps(kvm_parameter_dict.get('nbd-port', 1024)) }}
-config-nbd2-port = {{ dumps(kvm_parameter_dict.get('nbd-port2', 1024)) }}
 config-ram-size = {{ dumps(kvm_parameter_dict.get('ram-size', 4096)) }}
 config-ram-max-size = {{ dumps(kvm_parameter_dict.get('ram-max-size', int(kvm_parameter_dict.get('ram-size', 4096)) + 512)) }}
 config-enable-device-hotplug = {{ dumps(kvm_parameter_dict.get('enable-device-hotplug', False)) }}
@@ -89,7 +87,6 @@ config-cpu-max-count = {{ dumps(kvm_parameter_dict.get('cpu-max-count', int(kvm_
 config-network-adapter = {{ dumps(kvm_parameter_dict.get('network-adapter', 'virtio-net-pci')) }}
 {{ setconfig('numa', kvm_parameter_dict.get('numa', '')) }}
 {{ setconfig('machine-options', kvm_parameter_dict.get('machine-options', '')) }}
-{{ setconfig('nbd-host', kvm_parameter_dict.get('nbd-host', '')) }}
 {{ setconfig('host2', kvm_parameter_dict.get('host2', '')) }}
 
 config-auto-ballooning = {{ dumps(kvm_parameter_dict.get('auto-ballooning', True)) }}

software/kvm/instance-kvm-input-schema.json

@@ -145,33 +145,6 @@
             "vmxnet3"
           ]
         },
-        "nbd-host": {
-          "title": "NBD hostname",
-          "description": "hostname (or IP) of the NBD server containing the boot image.",
-          "type": "string",
-          "format": "internet-address"
-        },
-        "nbd-port": {
-          "title": "NBD port",
-          "description": "Port of the NBD server containing the boot image.",
-          "type": "integer",
-          "default": 1024,
-          "minimum": 1,
-          "maximum": 65535
-        },
-        "nbd2-host": {
-          "title": "Second NBD hostname",
-          "description": "hostname (or IP) of the second NBD server (containing drivers for example).",
-          "type": "string",
-          "format": "internet-address"
-        },
-        "nbd2-port": {
-          "title": "Second NBD port",
-          "description": "Port of the second NBD server containing the boot image.",
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 65535
-        },
         "virtual-hard-drive-url": {
           "title": "Existing disk image URL",
           "description": "If specified, will download an existing disk image (qcow2, raw, ...), and will use it as main virtual hard drive. Can be used to download and use an already installed and customized virtual hard drive.",

software/kvm/instance-kvm-nbd-server-input-schema.json

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Input Parameters For NDB Server",
-  "properties": {}
-}

software/kvm/instance-kvm-nbd-server-output-schema.json

-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "name": "Output Parameters",
-  "properties": {
-    "nbd_url": {
-      "title": "NBD server URL",
-      "description": "URL to be used to boot another VM. Requires IPv6. IPv6 should be used as \"NBD hostname\" and port as \"NBD port\"",
-      "type": "string",
-      "format": "uri"
-    },
-    "upload_url": {
-      "title": "Upload URL",
-      "description": "URL used to upload your VM image.",
-      "type": "string",
-      "format": "uri"
-    },
-    "upload_key": {
-      "title": "Upload key",
-      "description": "Key used to upload your VM image.",
-      "type": "string",
-      "format": "uri"
-    }
-  }
-}

software/kvm/instance-kvm.cfg.jinja2

@@ -415,10 +415,6 @@ boot-image-url-select-json-config = ${boot-image-url-select-json-config:output}
 {% else %}
 boot-image-url-select-json-config =
 {% endif %}
-nbd-host = ${slap-parameter:nbd-host}
-nbd-port = ${slap-parameter:nbd-port}
-nbd2-host = ${slap-parameter:nbd2-host}
-nbd2-port = ${slap-parameter:nbd2-port}
 
 tap-interface = {{ slap_configuration.get('tap-name', '') }}
 tap-ipv6-addr = {{ slap_configuration.get('tap-ipv6-addr', '') }}
@@ -1085,10 +1081,6 @@ frontend-additional-software-type = default
 frontend-additional-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 frontend-additional-instance-guid =
 frontend-additional-instance-name = VNC Real Frontend Additional
-nbd-port = 1024
-nbd-host =
-nbd2-port = 1024
-nbd2-host =
 boot-image-url-list =
 
 enable-device-hotplug = False

software/kvm/instance-nbd.cfg.jinja2

-#############################
-#
-# Instanciate nbdserver
-#
-#############################
-[buildout]
-parts =
-  nbd-promise
-  onetimeupload-promise
-  publish-connection-information
-extends = {{ template_monitor }}
-
-{% set ipv6 = slap_configuration['ipv6-random'] -%}
-
-[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 = {{ 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
-inline =
-  #!/bin/sh
-  [ ! -f ${onetimeupload-instance:image-path} ] ||
-    ${buildout:executable} -c 'import socket ; socket.create_connection(("${nbd-instance:ip}","${nbd-instance:port}")).close()'
-output = ${rootdirectory:bin}/check-nbd-running.sh
-
-[nbd-promise]
-<= monitor-promise-base
-promise = check_command_execute
-name = nbd_promise.py
-config-command = ${nbd-checker-bin:output}
-
-[gen-passwd]
-recipe = slapos.cookbook:generate.password
-storage-path = ${rootdirectory:srv}/passwd
-bytes = 24
-
-[onetimeupload-instance]
-recipe = slapos.cookbook:onetimeupload
-ip = {{ 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
-promise = check_socket_listening
-name = onetimeupload_promise.py
-config-host = ${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 = slapos.recipe.build
-init =
-  import os
-  options['status'] = (
-    "image already uploaded, you can't upload it again"
-    if os.path.isfile("${onetimeupload-instance:image-path}")
-    else "WARNING: no image yet, the NBD server doesn't work")

software/kvm/instance.cfg.in

@@ -12,7 +12,6 @@ recipe = slapos.cookbook:switch-softwaretype
 default = $${:kvm}
 kvm-cluster = dynamic-template-kvm-cluster:output
 kvm = dynamic-template-kvm:output
-nbd = dynamic-template-nbd:output
 
 kvm-resilient = dynamic-template-kvm-resilient:output
 kvm-import = dynamic-template-kvm-import:output
@@ -151,17 +150,3 @@ context =
     key slapparameter_dict slap-configuration:configuration
     raw zcat_binary ${gzip:location}/bin/zcat
     raw gzip_binary ${gzip:location}/bin/gzip
-
-[dynamic-template-nbd]
-<= jinja2-template-base
-url = ${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 ${qemu: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:output}

software/kvm/software.cfg

@@ -85,9 +85,6 @@ output = ${buildout:directory}/template.cfg
 [template-kvm-export-script]
 <= download-base
 
-[template-nbd]
-<= download-base
-
 [template-nginx]
 <= download-base
 

software/kvm/software.cfg.json

@@ -25,13 +25,6 @@
       "request": "instance-kvm-cluster-input-schema.json",
       "response": "instance-kvm-output-schema.json",
       "index": 2
-    },
-    "nbd": {
-      "title": "NBD Server",
-      "description": "Simple NBD server where you can upload one image. This is a one-time server. Create another server if you want to change the image.",
-      "request": "instance-kvm-nbd-server-input-schema.json",
-      "response": "instance-kvm-nbd-server-output-schema.json",
-      "index": 4
     }
   }
 }

software/kvm/template/template-kvm-run.in

@@ -23,10 +23,6 @@ disk_type = {{ repr(parameter_dict["disk-type"]) }}
 network_adapter = {{ repr(parameter_dict["network-adapter"]) }}
 
 socket_path = '{{ parameter_dict.get("socket-path") }}'
-nbd_list = (('{{ parameter_dict.get("nbd-host") }}',
-              {{ parameter_dict.get("nbd-port") }}),
-            ('{{ parameter_dict.get("nbd2-host") }}',
-              {{ parameter_dict.get("nbd2-port") }}))
 default_cdrom_iso = '{{ parameter_dict.get("default-cdrom-iso") }}'
 
 nat_rules = '{{ parameter_dict.get("nat-rules") }}'.strip()
@@ -389,35 +385,18 @@ def handle_image(config, name):
   else:
     raise ValueError('%s not ready yet' % (name,))
 
-# Try to connect to NBD server (and second nbd if defined).
-# If not available, don't even specify it in qemu command line parameters.
-# Reason: if qemu starts with unavailable NBD drive, it will just crash.
-for nbd_ip, nbd_port in nbd_list:
-  if nbd_ip and nbd_port:
-    s = getSocketStatus(nbd_ip, nbd_port)
-    if s is None:
-      # NBD is not available : launch kvm without it
-      print('Warning : Nbd is not available.')
-    else:
-      # NBD is available
-      # We close the NBD socket else qemu won't be able to use it apparently
-      s.close()
-      kvm_argument_list.extend([
-          '-drive',
-          'file=nbd:[%s]:%s,media=cdrom' % (nbd_ip, nbd_port)])
-else:
-  # Note: Do not get tempted to use virtio-scsi-pci, as it does not work with
-  #       Debian installation CDs, rendering it uninstallable
-  if boot_image_url_select_json_config:
+# Note: Do not get tempted to use virtio-scsi-pci, as it does not work with
+#       Debian installation CDs, rendering it uninstallable
+if boot_image_url_select_json_config:
   # Support boot-image-url-select
   handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
-  if boot_image_url_list_json_config:
+if boot_image_url_list_json_config:
   # Support boot-image-url-list
   handle_image(boot_image_url_list_json_config, 'boot-image-url-list')
-  # Always add by default the default image
-  kvm_argument_list.extend([
+# Always add by default the default image
+kvm_argument_list.extend([
     '-drive', 'file=%s,media=cdrom' % default_cdrom_iso
-  ])
+])
 
 
 print('Starting KVM: \n %s' % ' '.join(kvm_argument_list))

software/kvm/test/test.py

@@ -130,8 +130,6 @@ class KVMTestCase(InstanceTestCase):
       if q.startswith('location') and '/qemu/' in q]
     assert (len(qemu_location) == 1)
     qemu_location = qemu_location[0].split('=')[1].strip()
-    cls.qemu_nbd = os.path.join(qemu_location, 'bin', 'qemu-nbd')
-    assert (os.path.exists(cls.qemu_nbd))
     cls.qemu_img = os.path.join(qemu_location, 'bin', 'qemu-img')
     assert (os.path.exists(cls.qemu_img))
 
@@ -878,40 +876,6 @@ class TestAccessResilientAdditionalJson(
   pass
 
 
-class TestInstanceNbdServer(KVMTestCase):
-  __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'])
-
-
-@skipUnlessKvm
-class TestInstanceNbdServerJson(
-  KvmMixinJson, TestInstanceNbdServer):
-  pass
-
-
 class HttpHandler(http.server.SimpleHTTPRequestHandler):
   def log_message(self, *args):
     if os.environ.get('SLAPOS_TEST_DEBUG'):
@@ -1014,196 +978,6 @@ class FakeImageServerMixin(KvmMixin):
     shutil.rmtree(cls.image_source_directory)
 
 
-@skipUnlessKvm
-class TestInstanceNbd(KVMTestCase):
-  __partition_reference__ = 'in'
-  kvm_instance_partition_reference = 'in0'
-
-  @classmethod
-  def startNbdServer(cls):
-    cls.nbd_directory = tempfile.mkdtemp()
-    img_1 = os.path.join(cls.nbd_directory, 'one.qcow')
-    img_2 = os.path.join(cls.nbd_directory, 'two.qcow')
-    subprocess.check_call([cls.qemu_img, "create", "-f", "qcow", img_1, "1M"])
-    subprocess.check_call([cls.qemu_img, "create", "-f", "qcow", img_2, "1M"])
-
-    nbd_list = [cls.qemu_nbd, '-r', '-t', '-e', '32767']
-    cls.nbd_1_port = findFreeTCPPort(cls.ipv6_address_pure)
-    cls.nbd_1 = subprocess.Popen(
-      nbd_list + [
-        '-b', cls.ipv6_address_pure, '-p', str(cls.nbd_1_port), img_1])
-    cls.nbd_1_uri = '[%s]:%s' % (cls.ipv6_address_pure, cls.nbd_1_port)
-    cls.nbd_2_port = findFreeTCPPort(cls.ipv6_address_pure)
-    cls.nbd_2 = subprocess.Popen(
-      nbd_list + [
-        '-b', cls.ipv6_address_pure, '-p', str(cls.nbd_2_port), img_2])
-    cls.nbd_2_uri = '[%s]:%s' % (cls.ipv6_address_pure, cls.nbd_2_port)
-
-  @classmethod
-  def stopNbdServer(cls):
-    cls.nbd_1.terminate()
-    cls.nbd_2.terminate()
-    shutil.rmtree(cls.nbd_directory)
-
-  @classmethod
-  def setUpClass(cls):
-    # we need qemu-nbd binary location
-    # it's to hard to put qemu in software/slapos-sr-testing
-    # so let's find it here
-    # let's find our software .installed.cfg
-    cls.ipv6_address_pure = cls._ipv6_address.split('/')[0]
-    cls.findQemuTools()
-    cls.startNbdServer()
-    super().setUpClass()
-
-  @classmethod
-  def tearDownClass(cls):
-    super().tearDownClass()
-    cls.stopNbdServer()
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    return {
-      "nbd-host": cls.ipv6_address_pure,
-      "nbd-port": cls.nbd_1_port
-    }
-
-  def test(self):
-    kvm_partition = os.path.join(
-      self.slap.instance_directory, self.kvm_instance_partition_reference)
-    self.assertEqual(
-      [f'nbd:{self.nbd_1_uri}', '${shared}/debian-${ver}-amd64-netinst.iso'],
-      self.getRunningImageList(kvm_partition)
-    )
-
-
-@skipUnlessKvm
-class TestInstanceNbdWithVirtualHardDriveUrl(
-  FakeImageServerMixin, TestInstanceNbd):
-  __partition_reference__ = 'inbvhdu'
-  kvm_instance_partition_reference = 'inbvhdu0'
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    return {
-      "nbd-host": cls.ipv6_address_pure,
-      "nbd-port": cls.nbd_1_port,
-      "virtual-hard-drive-url": cls.real_image,
-      "virtual-hard-drive-md5sum": cls.real_image_md5sum
-    }
-
-  def test(self):
-    kvm_partition = os.path.join(
-      self.slap.instance_directory, self.kvm_instance_partition_reference)
-    self.assertEqual(
-      [f'nbd:{self.nbd_1_uri}', '${shared}/debian-${ver}-amd64-netinst.iso'],
-      self.getRunningImageList(kvm_partition)
-    )
-    image_repository = os.path.join(
-      kvm_partition,
-      'srv', 'virtual-hard-drive-url-repository')
-    self.assertEqual(
-      [self.getInstanceParameterDict()['virtual-hard-drive-md5sum']],
-      os.listdir(image_repository)
-    )
-    destination_image = os.path.join(kvm_partition, 'srv', 'virtual.qcow2')
-    # compare result of qemu-img info of repository and the one
-    qemu_img_list = [self.qemu_img, 'info', '-U', '--output', 'json']
-    source_image_info_json = json.loads(subprocess.check_output(
-      qemu_img_list + [
-        os.path.join(self.image_source_directory, self.real_image_md5sum)]))
-    destination_image_info_json = json.loads(subprocess.check_output(
-      qemu_img_list + [destination_image]))
-    source_image_info_json.pop('filename')
-    destination_image_info_json.pop('filename')
-    # the best possible way to assure that provided image is used is by
-    # comparing the result of qemu-img info for both
-    self.assertEqual(
-      source_image_info_json,
-      destination_image_info_json
-    )
-
-
-@skipUnlessKvm
-class TestInstanceNbdWithBootImageUrlList(
-  FakeImageServerMixin, TestInstanceNbd):
-  __partition_reference__ = 'inbiul'
-  kvm_instance_partition_reference = 'inbiul0'
-  image_directory = 'boot-image-url-list-repository'
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    return {
-      "nbd-host": cls.ipv6_address_pure,
-      "nbd-port": cls.nbd_1_port,
-      "boot-image-url-list": f"{cls.fake_image}#{cls.fake_image_md5sum}"
-    }
-
-  def test(self):
-    kvm_partition = os.path.join(
-      self.slap.instance_directory, self.kvm_instance_partition_reference)
-    self.assertEqual(
-      [
-        f'nbd:{self.nbd_1_uri}',
-        f'${{inst}}/srv/{self.image_directory}/{self.fake_image_md5sum}',
-        '${shared}/debian-${ver}-amd64-netinst.iso',
-      ],
-      self.getRunningImageList(kvm_partition)
-    )
-
-
-@skipUnlessKvm
-class TestInstanceNbdWithBootImageUrlSelect(
-  FakeImageServerMixin, TestInstanceNbd):
-  __partition_reference__ = 'inbius'
-  kvm_instance_partition_reference = 'inbius0'
-  image_directory = 'boot-image-url-select-repository'
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    return {
-      "nbd-host": cls.ipv6_address_pure,
-      "nbd-port": cls.nbd_1_port,
-      "boot-image-url-select": f'["{cls.fake_image}#{cls.fake_image_md5sum}"]'
-    }
-
-  def test(self):
-    kvm_partition = os.path.join(
-      self.slap.instance_directory, self.kvm_instance_partition_reference)
-    self.assertEqual(
-      [
-        f'nbd:{self.nbd_1_uri}',
-        f'${{inst}}/srv/{self.image_directory}/{self.fake_image_md5sum}',
-        '${shared}/debian-${ver}-amd64-netinst.iso',
-      ],
-      self.getRunningImageList(kvm_partition)
-    )
-
-
-@skipUnlessKvm
-class TestInstanceNbdBoth(TestInstanceNbd):
-  __partition_reference__ = 'inb'
-  kvm_instance_partition_reference = 'inb0'
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    return {
-      "nbd-host": cls.ipv6_address_pure,
-      "nbd-port": cls.nbd_1_port,
-      "nbd2-host": cls.ipv6_address_pure,
-      "nbd2-port": cls.nbd_2_port
-    }
-
-  def test(self):
-    kvm_partition = os.path.join(
-      self.slap.instance_directory, self.kvm_instance_partition_reference)
-    self.assertEqual(
-      [f'nbd:{self.nbd_1_uri}', f'nbd:{self.nbd_2_uri}',
-       '${shared}/debian-${ver}-amd64-netinst.iso'],
-      self.getRunningImageList(kvm_partition)
-    )
-
-
 @skipUnlessKvm
 class TestVirtualHardDriveUrl(FakeImageServerMixin, KVMTestCase):
   __partition_reference__ = 'vhdu'