Update examples for volume and arm

Author: 0lvin

examples/scripts/copy_disk_arm.sh

@@ -77,5 +77,5 @@
     <model fallback='allow'>cortex-a57</model>
   </cpu>
   <clock offset="utc"/>
-  <name>{{ resource_id }}</name>
+  <name>{{ name }}</name>
 </domain>

examples/scripts/remove_disk_arm.sh

@@ -2,14 +2,17 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-utilities-plugin/1.9.5/plugin.yaml
-  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-libvirt-plugin/0.7.0/plugin.yaml
+  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-utilities-plugin/1.12.3/plugin.yaml
+  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-libvirt-plugin/0.8.0/plugin.yaml
 
 inputs:
 
   agent_password:
     default: passw0rd
 
+  agent_user:
+    default: ubuntu
+
 node_templates:
 
   common_network:
@@ -49,6 +52,62 @@ node_templates:
            expire: False
         ssh_pwauth: True
 
+  common_pool:
+    type: cloudify.libvirt.pool
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          inputs:
+            params:
+              capacity: 80
+
+  cloudinit_volume:
+    type: cloudify.libvirt.volume
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          inputs:
+            params:
+              pool: { get_attribute: [common_pool, resource_id]}
+              capacity: 1
+              allocation: 1
+    relationships:
+    - target: common_pool
+      type: cloudify.relationships.depends_on
+
+  flash_volume:
+    type: cloudify.libvirt.volume
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          inputs:
+            params:
+              pool: { get_attribute: [common_pool, resource_id]}
+              capacity: 64
+              allocation: 64
+    relationships:
+    - target: common_pool
+      type: cloudify.relationships.depends_on
+
+  cloud_init_image:
+    type: cloudify.libvirt.ISO9660
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          inputs:
+            params:
+              pool: { get_attribute: [common_pool, resource_id]}
+              volume: { get_attribute: [cloudinit_volume, resource_id]}
+              files:
+                meta-data: >
+                    instance-id: localhost
+                user-data: { get_attribute: [cloud_init, cloud_config ] }
+    relationships:
+    - target: cloud_init
+      type: cloudify.relationships.depends_on
+    - target: cloudinit_volume
+      type: cloudify.relationships.depends_on
+
   disk_clone:
     type: cloudify.nodes.ApplicationServer
     interfaces:
@@ -62,12 +121,6 @@ node_templates:
         configure:
           implementation: scripts/copy_disk.py
           executor: central_deployment_agent
-        start:
-          implementation: scripts/copy_disk_arm.sh
-          executor: central_deployment_agent
-        stop:
-          implementation: scripts/remove_disk_arm.sh
-          executor: central_deployment_agent
         delete:
           implementation: scripts/remove_disk.sh
           executor: central_deployment_agent
@@ -88,16 +141,16 @@ node_templates:
           inputs:
             params:
               memory_size: 524288
-              nvram: { get_attribute: [disk_clone, bios_flash] }
+              nvram: { get_attribute: [flash_volume, params, path] }
               disks:
                 - bus: scsi
                   dev: sda
                   file: { get_attribute: [disk_clone, vm_image] }
                   type: qcow2
                 - bus: scsi
                   dev: sdb
-                  file: { get_attribute: [disk_clone, vm_cloudinit] }
-                  type: qcow2
+                  file: { get_attribute: [cloudinit_volume, params, path] }
+                  type: raw
               networks:
                 - network: { get_attribute: [common_network, resource_id] }
                   dev: macvtap0
@@ -110,6 +163,10 @@ node_templates:
         type: cloudify.libvirt.relationships.connected_to
       - target: disk_clone
         type: cloudify.relationships.contained_in
+      - target: cloud_init_image
+        type: cloudify.relationships.depends_on
+      - target: flash_volume
+        type: cloudify.relationships.depends_on
 
   example_node:
     type: cloudify.nodes.WebServer

examples/templates/domain-arm.xml

@@ -2,8 +2,8 @@ plugins:
   libvirt:
     executor: central_deployment_agent
     package_name: cloudify-libvirt-plugin
-    package_version: '0.7.0'
-    source: https://github.com/cloudify-incubator/cloudify-libvirt-plugin/archive/0.7.0.zip
+    package_version: '0.8.0'
+    source: https://github.com/cloudify-incubator/cloudify-libvirt-plugin/archive/0.8.0.zip
 
 data_types:
 
@@ -25,6 +25,58 @@ data_types:
         description: >
           Storage size in GiB
 
+  volume_params:
+    properties:
+      name:
+        required: false
+        default: ""
+        description: >
+          Volume name
+      path:
+        required: false
+        default: ""
+        description: >
+          Volume path
+      pool:
+        required: false
+        type: string
+        description: >
+          Parent pool
+      capacity:
+        required: false
+        type: integer
+        description: >
+          Volume size in GiB
+      allocation:
+        required: false
+        default: 0
+        type: integer
+        description: >
+          Volume allocation size in MiB
+      zero_wipe:
+        required: false
+        default: false
+        type: boolean
+        description: >
+          Volume allocation zero wipe
+
+  iso9660_params:
+    properties:
+      volume:
+        required: false
+        default: ""
+        description: >
+          Volume name
+      pool:
+        required: false
+        type: string
+        description: >
+          Parent pool
+      files:
+        required: false
+        description: >
+          File list with content. (Key:value)
+
   network_params:
     properties:
       name:
@@ -275,6 +327,88 @@ node_types:
           implementation: libvirt.cloudify_libvirt.pool_tasks.snapshot_delete
           inputs: {}
 
+  cloudify.libvirt.volume:
+    derived_from: cloudify.nodes.Tier
+    properties:
+      use_external_resource:
+        required: false
+        default: false
+        description: >
+          Use external object. The default is `false`.
+      resource_id:
+        required: false
+        default: ""
+        description: >
+          Used to identify the object when `use_external_resource` is true.
+      backup_dir:
+        default: './'
+      libvirt_auth:
+        default: 'qemu:///system'
+      params:
+        type: volume_params
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.create
+          inputs:
+            params:
+              default: {}
+            template_resource:
+              default: ''
+            template_content:
+              default: ''
+        start:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.start
+          inputs: {}
+        stop:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.stop
+          inputs: {}
+        delete:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.delete
+          inputs: {}
+      # backups related section
+      cloudify.interfaces.snapshot:
+        create:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.snapshot_create
+          inputs: {}
+        apply:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.snapshot_apply
+          inputs: {}
+        delete:
+          implementation: libvirt.cloudify_libvirt.volume_tasks.snapshot_delete
+          inputs: {}
+
+  cloudify.libvirt.ISO9660:
+    derived_from: cloudify.nodes.Tier
+    properties:
+      use_external_resource:
+        required: false
+        default: false
+        description: >
+          Use external object. The default is `false`.
+      resource_id:
+        required: false
+        default: ""
+        description: >
+          Used to identify the object when `use_external_resource` is true.
+      backup_dir:
+        default: './'
+      libvirt_auth:
+        default: 'qemu:///system'
+      params:
+        type: iso9660_params
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          implementation: libvirt.cloudify_libvirt.iso9660_tasks.create
+          inputs:
+            params:
+              default: {}
+            template_resource:
+              default: ''
+            template_content:
+              default: ''
+
 relationships:
 
   cloudify.libvirt.relationships.connected_to:

examples/vm_ssh.arm64.yaml

@@ -15,7 +15,7 @@
 
 setup(
     name='cloudify-libvirt-plugin',
-    version='0.7.0',
+    version='0.8.0',
     description='support libvirt',
     author='Cloudify',
     author_email='[email protected]',
@@ -27,11 +27,13 @@
             'templates/network.xml',
             'templates/snapshot.xml',
             'templates/pool.xml',
+            'templates/volume.xml',
         ]
     },
     install_requires=[
         'cloudify-plugins-common>=3.3',
         'libvirt-python',
+        'pycdlib',
         "Jinja2>=2.7.2",  # for template support
     ],
 )