Merge pull request #37 from cloudify-incubator/0.9.4-build

0.9.4 build

Author: EarthmanT

.circleci/config.yml

@@ -1,10 +1,10 @@
 version: 2.1
 
 orbs:
-  node: cloudify/public-unittest-orb@1 #orb version
-  wagonorb: cloudify/wagon-bulder-orb@2.4.0 #orb version
-  releaseorb: cloudify/release-orb@1.4.0 #orb version
-  managerorb: cloudify/manager-orb@1
+  node: cloudify/public-unittest-orb@volatile
+  wagonorb: cloudify/wagon-bulder-orb@volatile
+  releaseorb: cloudify/release-orb@volatile
+  managerorb: cloudify/manager-orb@volatile
 
 checkout:
   post:
@@ -60,14 +60,6 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|master|main)/
-      - wagonorb/build_bundle:
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|master|main)/
-          requires:
-            - wagonorb/wagon
-            - wagonorb/arch64_wagon
-            - wagonorb/rhel_wagon
       - releaseorb/release:
           filters:
             branches:
@@ -76,7 +68,6 @@ workflows:
             - wagonorb/wagon
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
-            - wagonorb/build_bundle
             - node/validate_version_job
             - node/validate_documentation_job
       - releaseorb/merge_docs_job:

CHANGELOG.txt

@@ -32,4 +32,5 @@
  - Port source code to python3
 0.9.1.1: Testing webhook for Marketplace scraping
 0.9.2: Rerelease for build system.
-0.9.3: Rerelease with rhel8.
+0.9.3: Rerelease with rhel8.
+0.9.4: Add Passthrough Devices support.

cloudify_libvirt/__version__.py

@@ -0,0 +1 @@
+version = '0.9.4'

cloudify_libvirt/common.py

@@ -50,6 +50,47 @@ def get_libvirt_params(**kwargs):
     return libvirt_auth, template_params
 
 
+def handle_device_type(d_type, device):
+    handled_device = {}
+    serial_values = ['source_path', 'target_port']
+    usb_values = ['vendor_id', 'product_id']
+    pci_values = ['bus', 'slot', 'function']
+    tpm_values = ['path']
+    valid_values = None
+    if d_type == 'serial':
+        valid_values = serial_values
+    elif d_type == 'usb':
+        valid_values = usb_values
+    elif d_type == 'pci':
+        valid_values = pci_values
+    elif d_type == 'tpm':
+        valid_values = tpm_values
+    if valid_values:
+        for k in device:
+            if k in valid_values:
+                handled_device[k] = device.get(k)
+    return handled_device
+
+
+def handle_devices(devices):
+    serial_devices = []
+    usb_devices = []
+    pci_devices = []
+    tpm_devices = []
+    for device in devices:
+        to_append = handle_device_type(device.get('type'), device)
+        if to_append:
+            if device.get('type') == 'serial':
+                serial_devices.append(to_append)
+            elif device.get('type') == 'usb':
+                usb_devices.append(to_append)
+            elif device.get('type') == 'pci':
+                pci_devices.append(to_append)
+            elif device.get('type') == 'tpm':
+                tpm_devices.append(to_append)
+    return serial_devices, usb_devices, pci_devices, tpm_devices
+
+
 def gen_xml_template(kwargs, template_params, default_template):
     # templates
     template_resource = kwargs.get('template_resource')
@@ -70,6 +111,21 @@ def gen_xml_template(kwargs, template_params, default_template):
     params = {"ctx": ctx}
     if template_params:
         params.update(template_params)
+    # let's handle devices properly
+    passthrough_devices = params.pop('devices', None)
+    if passthrough_devices:
+        serial_devices, usb_devices, pci_devices, tpm_devices = \
+            handle_devices(passthrough_devices)
+        if serial_devices:
+            params.update({'serial_devices': serial_devices})
+        if usb_devices:
+            params.update({'usb_devices': usb_devices})
+        if pci_devices:
+            params.update({'pci_devices': pci_devices})
+        if tpm_devices:
+            params.update({'tpm_devices': tpm_devices})
+    if not isinstance(template_content, str):
+        template_content = template_content.decode("utf-8")
     xmlconfig = filters.render_template(template_content, params)
     ctx.logger.debug(repr(xmlconfig))
     return xmlconfig

cloudify_libvirt/templates/domain.xml

@@ -48,6 +48,34 @@
         <driver type="{{ disk.type }}"/>
       </disk>
     {% endfor %}
+    {% for serial_device in serial_devices %}
+      <serial type='pty'>
+        <source path='{{ serial_device.source_path }}'/>
+        <target port='{{ serial_device.target_port }}'/>
+    </serial>
+    {% endfor %}
+    {% for usb_device in usb_devices %}
+      <hostdev mode='subsystem' type='usb' managed='yes'>
+          <source>
+              <vendor id='{{ usb_device.vendor_id }}'/>
+              <product id='{{ usb_device.product_id }}'/>
+          </source>
+      </hostdev>
+    {% endfor %}
+    {% for pci_device in pci_devices %}
+      <hostdev mode='subsystem' type='pci' managed='yes'>
+          <source>
+              <address domain='0x0000' bus='{{ pci_device.bus }}' slot='{{ pci_device.slot }}' function='{{ pci_device.function }}'/>
+          </source>
+      </hostdev>
+    {% endfor %}
+    {% for tpm_device in tpm_devices %}
+      <tpm model='tpm-tis'>
+        <backend type='passthrough'>
+          <device path='{{ tpm_device.path }}'/>
+        </backend>
+      </tpm>
+    {% endfor %}
   </devices>
   <on_crash>restart</on_crash>
   <on_reboot>restart</on_reboot>

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   libvirt:
     executor: central_deployment_agent
     package_name: cloudify-libvirt-plugin
-    package_version: '0.9.3'
+    package_version: '0.9.4'
 
 data_types:
 
@@ -155,6 +155,23 @@ data_types:
         description: >
           Type of virtualization
         default: qemu
+      devices:
+        description: >
+          List of devices to passthrough to guest as a dict in this format:
+          for example:
+          - type: serial
+            source_path: /dev/ttyS1
+            target_port: 1
+          - type: usb
+            vendor_id: 0x1d6b
+            product_id: 0x0002
+          - type: pci
+            bus: 0x01
+            slot: 0x00
+            function: 0x1
+          - type: tpm
+            path: /dev/tpm0
+        default: []
 
 node_types:
 
@@ -357,7 +374,7 @@ node_types:
           implementation: libvirt.cloudify_libvirt.volume_tasks.create
           inputs:
             params:
-              type: cloudify.datatypes.volume
+              default: {}
             template_resource:
               default: ''
             template_content: