Merge pull request #12 from cloudify-incubator/for_review

Support for external vm and update ip on vm start

Author: 0lvin

CHANGELOG.txt

@@ -17,3 +17,12 @@ releases:
   v0.5.0:
     * Support for reuse external network
     * Support for kvm virtualization in embeded examples
+
+  v0.6.0:
+    * Support for dump full vm snapshot to fs on backup
+    * Update start action for fill in `network` in vm runtime properties
+    * Cluster Example: Automatically add libvirt host to trusted
+    * Support for reuse external vm
+    * move use_external_resource to top of instance properties
+    * add `update` action for sync vm size to values from runtime properties.
+    * rename `memory_size` to `memory_maxsize`

README.md

@@ -41,11 +41,29 @@ Description for VM
 **Supported properties:**
 * `libvirt_auth`: connection url, by default: `qemu:///system`
 * `backup_dir`: directory for save backups, by default: `./`
+* `use_external_resource`: (optional) Use external object. The default is
+  `false`.
+* `resource_id`: (optional) Used to identify the object when
+  `use_external_resource` is true.
+* `params`: params used for create object, useful for embeded template.
+  * `vcpu`: CPU count
+  * `memory_size`: VM memory size in KiB
+  * `memory_maxsize`: (optional) recomended VM memory size in KiB for
+        downgrade. The default is value from `memory_size` * 2.
+  * `nvram`: (optional) path to nvram (useful for arm)
+  * `disks`: list connected disks
+  * `networks`: list connected networks
+  * `full_dump`: make full dump for backups with memory snapshot to dump file.
+    On create/restore backup will be removed all snapshots in domain.
+  * `wait_for_ip`: (optional) wait until we have some private ip on interfaces
+    The default is `true`.
+  * `domain_type`: (optional) type of virtualization. The default is `qemu`
 
 **Inputs for actions:**
 * `configure`:
   * `params`: list of params for template, can be empty
-  * `domain_file`: Template for domain. Defaults is [domain.xml](cloudify_libvirt/templates/domain.xml)
+  * `domain_file`: Template for domain. Defaults is
+    [domain.xml](cloudify_libvirt/templates/domain.xml)
 
 **Runtime properties:**
 * `resource_id`: resource name.
@@ -57,17 +75,20 @@ Description for Network
 **Supported properties:**
 * `libvirt_auth`: connection url, by default: `qemu:///system`
 * `backup_dir`: directory for save backups, by default: `./`
+* `use_external_resource`: (optional) Use external object. The default is
+  `false`.
+* `resource_id`: (optional) Used to identify the object when
+  `use_external_resource` is true.
 * `params`: params used for create object.
-  * `use_external_resource`: (optional) Use external object. The default is `false`.
-  * `resource_id`: (optional) Used to identify the object when `use_external_resource` is true.
   * `dev`: Device name
   * `forwards`: settings for network `forwards`.
   * `ips`: settings for network `ips`.
 
 **Inputs for actions:**
 * `create`:
   * `params`: list of params for template, can be empty
-  * `network_file`: Template for network. Defaults is [network.xml](cloudify_libvirt/templates/network.xml)
+  * `network_file`: Template for network. Defaults is
+    [network.xml](cloudify_libvirt/templates/network.xml)
 
 **Runtime properties:**
 * `resource_id`: resource name.
@@ -167,3 +188,5 @@ You should to install [libvirt-devel](examples/bootstraps/centos.sh#L2) before c
 
 ## TODO:
 * Add more examples with different vm struct and archictures: mips, powerpc
+* Implement storage volume/pool
+* Implement firewall rules

cloudify_libvirt/common.py

@@ -31,6 +31,12 @@ def get_libvirt_params(**kwargs):
     template_params.update(ctx.instance.runtime_properties.get('params', {}))
     template_params.update(kwargs.get('params', {}))
     ctx.instance.runtime_properties['params'] = template_params
+
+    # update 'resource_id', 'use_external_resource' from kwargs
+    for field in ['resource_id', 'use_external_resource']:
+        if field in kwargs:
+            ctx.instance.runtime_properties[field] = kwargs[field]
+
     return libvirt_auth, template_params
 
 
@@ -70,3 +76,26 @@ def delete_node_state(backup_dir, object_name):
     if not os.path.isfile("{}/{}.xml".format(backup_dir, object_name)):
         return
     os.remove("{}/{}.xml".format(backup_dir, object_name))
+
+
+def get_binary_place(backup_dir, object_name):
+    # return path to binary/directory place
+    return "{}/{}_raw".format(backup_dir, object_name)
+
+
+def check_binary_place(backup_dir, object_name):
+    # check binary/directory place exists
+    return os.path.isfile(get_binary_place(backup_dir, object_name))
+
+
+def create_binary_place(backup_dir):
+    # create binary/directory place
+    if not os.path.isdir(backup_dir):
+        os.makedirs(backup_dir)
+
+
+def delete_binary_place(backup_dir, object_name):
+    # create binary/directory place
+    full_path = get_binary_place(backup_dir, object_name)
+    if os.path.isfile(full_path):
+        os.remove(full_path)