Bump version to 0.9.32

This should be managed in ceph.conf with the `rbd default
features` configuration option instead, and thus can be tailored to the
underlying OS version.

.version

@@ -1 +1 @@
-0.9.29
+0.9.32

README.md

@@ -40,8 +40,39 @@ The core node and API daemons, as well as the CLI API client, are written in Pyt
 To get started with PVC, please see the [About](https://parallelvirtualcluster.readthedocs.io/en/latest/about/) page for general information about the project, and the [Getting Started](https://parallelvirtualcluster.readthedocs.io/en/latest/getting-started/) page for details on configuring your first cluster.
 
 
+## Screenshots
+
+While PVC's API and internals aren't very screenshot-worthy, here is some example output of the CLI tool.
+
+<p><img alt="Node listing" src="docs/images/pvc-nodes.png"/><br/><i>Listing the nodes in a cluster</i></p>
+
+<p><img alt="Network listing" src="docs/images/pvc-networks.png"/><br/><i>Listing the networks in a cluster, showing 3 bridged and 1 IPv4-only managed networks</i></p>
+
+<p><img alt="VM listing and migration" src="docs/images/pvc-migration.png"/><br/><i>Listing a limited set of VMs and migrating one with status updates</i></p>
+
+<p><img alt="Node logs" src="docs/images/pvc-nodelog.png"/><br/><i>Viewing the logs of a node (keepalives and VM [un]migration)</i></p>
+
+
 ## Changelog
 
+#### v0.9.32
+
+  * [CLI Client] Fixes some incorrect colours in network lists
+  * [Documentation] Adds documentation screenshots of CLI client
+  * [Node Daemon] Fixes a bug if VM stats gathering fails
+
+#### v0.9.31
+
+  * [Packages] Cleans up obsolete Suggests lines
+  * [Node Daemon] Adjusts log text of VM migrations to show the correct source node
+  * [API Daemon] Adjusts the OVA importer to support floppy RASD types for compatability
+  * [API Daemon] Ensures that volume resize commands without a suffix get B appended
+  * [API Daemon] Removes the explicit setting of image-features in PVC; defaulting to the limited set has been moved to the ceph.conf configuration on nodes via PVC Ansible
+
+#### v0.9.30
+
+  * [Node Daemon] Fixes bug with schema validation
+
 #### v0.9.29
 
   * [Node Daemon] Corrects numerous bugs with node logging framework

api-daemon/pvcapid/Daemon.py

@@ -25,7 +25,7 @@ import yaml
 from distutils.util import strtobool as dustrtobool
 
 # Daemon version
-version = '0.9.29'
+version = '0.9.32'
 
 # API version
 API_VERSION = 1.0

api-daemon/pvcapid/ova.py

@@ -414,6 +414,7 @@ class OVFParser(object):
         "5": "ide-controller",
         "6": "scsi-controller",
         "10": "ethernet-adapter",
+        "14": "floppy",
         "15": "cdrom",
         "17": "disk",
         "20": "other-storage-device",

client-cli/pvc/cli_lib/network.py

@@ -491,14 +491,10 @@ def net_sriov_vf_info(config, node, vf):
 # Output display functions
 #
 def getColour(value):
-    if value in ['True', "start"]:
-        return ansiprint.green()
-    elif value in ["restart", "shutdown"]:
-        return ansiprint.yellow()
-    elif value in ["stop", "fail"]:
-        return ansiprint.red()
-    else:
+    if value in ["False", "None"]:
         return ansiprint.blue()
+    else:
+        return ansiprint.green()
 
 
 def getOutputColours(network_information):

client-cli/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='pvc',
-    version='0.9.29',
+    version='0.9.32',
     packages=['pvc', 'pvc.cli_lib'],
     install_requires=[
         'Click',

daemon-common/ceph.py

@@ -491,7 +491,7 @@ def add_volume(zkhandler, pool, name, size):
         size = '{}B'.format(size)
 
     # 2. Create the volume
-    retcode, stdout, stderr = common.run_os_command('rbd create --size {} --image-feature layering,exclusive-lock {}/{}'.format(size, pool, name))
+    retcode, stdout, stderr = common.run_os_command('rbd create --size {} {}/{}'.format(size, pool, name))
     if retcode:
         return False, 'ERROR: Failed to create RBD volume "{}": {}'.format(name, stderr)
 
@@ -536,6 +536,10 @@ def resize_volume(zkhandler, pool, name, size):
     if not verifyVolume(zkhandler, pool, name):
         return False, 'ERROR: No volume with name "{}" is present in pool "{}".'.format(name, pool)
 
+    # Add 'B' if the volume is in bytes
+    if re.match(r'^[0-9]+$', size):
+        size = '{}B'.format(size)
+
     # 1. Resize the volume
     retcode, stdout, stderr = common.run_os_command('rbd resize --size {} {}/{}'.format(size, pool, name))
     if retcode:

daemon-common/zkhandler.py

@@ -777,7 +777,7 @@ class ZKSchema(object):
                         logger.out(f'Key not found: {self.path(kpath)}', state='w')
                     result = False
 
-        for elem in ['logs', 'node', 'domain', 'network', 'osd', 'pool']:
+        for elem in ['node', 'domain', 'network', 'osd', 'pool']:
             # First read all the subelements of the key class
             for child in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
                 # For each key in the schema for that particular elem
@@ -856,7 +856,7 @@ class ZKSchema(object):
                         data = ''
                     zkhandler.zk_conn.create(self.path(kpath), data.encode(zkhandler.encoding))
 
-        for elem in ['logs', 'node', 'domain', 'network', 'osd', 'pool']:
+        for elem in ['node', 'domain', 'network', 'osd', 'pool']:
             # First read all the subelements of the key class
             for child in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
                 # For each key in the schema for that particular elem

debian/changelog

@@ -1,3 +1,27 @@
+pvc (0.9.32-0) unstable; urgency=high
+
+  * [CLI Client] Fixes some incorrect colours in network lists
+  * [Documentation] Adds documentation screenshots of CLI client
+  * [Node Daemon] Fixes a bug if VM stats gathering fails
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Thu, 19 Aug 2021 12:37:58 -0400
+
+pvc (0.9.31-0) unstable; urgency=high
+
+  * [Packages] Cleans up obsolete Suggests lines
+  * [Node Daemon] Adjusts log text of VM migrations to show the correct source node
+  * [API Daemon] Adjusts the OVA importer to support floppy RASD types for compatability
+  * [API Daemon] Ensures that volume resize commands without a suffix get B appended
+  * [API Daemon] Removes the explicit setting of image-features in PVC; defaulting to the limited set has been moved to the ceph.conf configuration on nodes via PVC Ansible
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Fri, 30 Jul 2021 12:08:12 -0400
+
+pvc (0.9.30-0) unstable; urgency=high
+
+  * [Node Daemon] Fixes bug with schema validation
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Tue, 20 Jul 2021 00:01:45 -0400
+
 pvc (0.9.29-0) unstable; urgency=high
 
   * [Node Daemon] Corrects numerous bugs with node logging framework

debian/control

@@ -9,7 +9,6 @@ X-Python3-Version: >= 3.2
 Package: pvc-daemon-node
 Architecture: all
 Depends: systemd, pvc-daemon-common, python3-kazoo, python3-psutil, python3-apscheduler, python3-libvirt, python3-psycopg2, python3-dnspython, python3-yaml, python3-distutils, python3-rados, python3-gevent, ipmitool, libvirt-daemon-system, arping, vlan, bridge-utils, dnsmasq, nftables, pdns-server, pdns-backend-pgsql
-Suggests: pvc-client-api, pvc-client-cli
 Description: Parallel Virtual Cluster node daemon (Python 3)
  A KVM/Zookeeper/Ceph-based VM and private cloud manager
  .

docs/index.md

@@ -40,8 +40,39 @@ The core node and API daemons, as well as the CLI API client, are written in Pyt
 To get started with PVC, please see the [About](https://parallelvirtualcluster.readthedocs.io/en/latest/about/) page for general information about the project, and the [Getting Started](https://parallelvirtualcluster.readthedocs.io/en/latest/getting-started/) page for details on configuring your first cluster.
 
 
+## Screenshots
+
+While PVC's API and internals aren't very screenshot-worthy, here is some example output of the CLI tool.
+
+<p><img alt="Node listing" src="images/pvc-nodes.png"/><br/><i>Listing the nodes in a cluster</i></p>
+
+<p><img alt="Network listing" src="images/pvc-networks.png"/><br/><i>Listing the networks in a cluster, showing 3 bridged and 1 IPv4-only managed networks</i></p>
+
+<p><img alt="VM listing and migration" src="images/pvc-migration.png"/><br/><i>Listing a limited set of VMs and migrating one with status updates</i></p>
+
+<p><img alt="Node logs" src="images/pvc-nodelog.png"/><br/><i>Viewing the logs of a node (keepalives and VM [un]migration)</i></p>
+
+
 ## Changelog
 
+#### v0.9.32
+
+  * [CLI Client] Fixes some incorrect colours in network lists
+  * [Documentation] Adds documentation screenshots of CLI client
+  * [Node Daemon] Fixes a bug if VM stats gathering fails
+
+#### v0.9.31
+
+  * [Packages] Cleans up obsolete Suggests lines
+  * [Node Daemon] Adjusts log text of VM migrations to show the correct source node
+  * [API Daemon] Adjusts the OVA importer to support floppy RASD types for compatability
+  * [API Daemon] Ensures that volume resize commands without a suffix get B appended
+  * [API Daemon] Removes the explicit setting of image-features in PVC; defaulting to the limited set has been moved to the ceph.conf configuration on nodes via PVC Ansible
+
+#### v0.9.30
+
+  * [Node Daemon] Fixes bug with schema validation
+
 #### v0.9.29
 
   * [Node Daemon] Corrects numerous bugs with node logging framework

node-daemon/pvcnoded/Daemon.py

@@ -56,7 +56,7 @@ import pvcnoded.CephInstance as CephInstance
 import pvcnoded.MetadataAPIInstance as MetadataAPIInstance
 
 # Version string for startup output
-version = '0.9.29'
+version = '0.9.32'
 
 ###############################################################################
 # PVCD - node daemon startup program
@@ -1675,11 +1675,7 @@ def collect_vm_stats(queue):
             domain_memory_stats = domain.memoryStats()
             domain_cpu_stats = domain.getCPUStats(True)[0]
         except Exception as e:
-            if debug:
-                try:
-                    logger.out("Failed getting VM information for {}: {}".format(domain.name(), e), state='d', prefix='vm-thread')
-                except Exception:
-                    pass
+            logger.out("Failed getting VM information for {}: {}".format(domain.name(), e), state='w', prefix='vm-thread')
             continue
 
         # Ensure VM is present in the domain_list
@@ -1689,42 +1685,50 @@ def collect_vm_stats(queue):
         if debug:
             logger.out("Getting disk statistics for VM {}".format(domain_name), state='d', prefix='vm-thread')
         domain_disk_stats = []
-        for disk in tree.findall('devices/disk'):
-            disk_name = disk.find('source').get('name')
-            if not disk_name:
-                disk_name = disk.find('source').get('file')
-            disk_stats = domain.blockStats(disk.find('target').get('dev'))
-            domain_disk_stats.append({
-                "name": disk_name,
-                "rd_req": disk_stats[0],
-                "rd_bytes": disk_stats[1],
-                "wr_req": disk_stats[2],
-                "wr_bytes": disk_stats[3],
-                "err": disk_stats[4]
-            })
+        try:
+            for disk in tree.findall('devices/disk'):
+                disk_name = disk.find('source').get('name')
+                if not disk_name:
+                    disk_name = disk.find('source').get('file')
+                disk_stats = domain.blockStats(disk.find('target').get('dev'))
+                domain_disk_stats.append({
+                    "name": disk_name,
+                    "rd_req": disk_stats[0],
+                    "rd_bytes": disk_stats[1],
+                    "wr_req": disk_stats[2],
+                    "wr_bytes": disk_stats[3],
+                    "err": disk_stats[4]
+                })
+        except Exception as e:
+            logger.out("Failed to get disk stats for VM {}: {}".format(domain_name, e), state='w', prefix='vm-thread')
+            continue
 
         if debug:
             logger.out("Getting network statistics for VM {}".format(domain_name), state='d', prefix='vm-thread')
         domain_network_stats = []
-        for interface in tree.findall('devices/interface'):
-            interface_type = interface.get('type')
-            if interface_type not in ['bridge']:
-                continue
-            interface_name = interface.find('target').get('dev')
-            interface_bridge = interface.find('source').get('bridge')
-            interface_stats = domain.interfaceStats(interface_name)
-            domain_network_stats.append({
-                "name": interface_name,
-                "bridge": interface_bridge,
-                "rd_bytes": interface_stats[0],
-                "rd_packets": interface_stats[1],
-                "rd_errors": interface_stats[2],
-                "rd_drops": interface_stats[3],
-                "wr_bytes": interface_stats[4],
-                "wr_packets": interface_stats[5],
-                "wr_errors": interface_stats[6],
-                "wr_drops": interface_stats[7]
-            })
+        try:
+            for interface in tree.findall('devices/interface'):
+                interface_type = interface.get('type')
+                if interface_type not in ['bridge']:
+                    continue
+                interface_name = interface.find('target').get('dev')
+                interface_bridge = interface.find('source').get('bridge')
+                interface_stats = domain.interfaceStats(interface_name)
+                domain_network_stats.append({
+                    "name": interface_name,
+                    "bridge": interface_bridge,
+                    "rd_bytes": interface_stats[0],
+                    "rd_packets": interface_stats[1],
+                    "rd_errors": interface_stats[2],
+                    "rd_drops": interface_stats[3],
+                    "wr_bytes": interface_stats[4],
+                    "wr_packets": interface_stats[5],
+                    "wr_errors": interface_stats[6],
+                    "wr_drops": interface_stats[7]
+                })
+        except Exception as e:
+            logger.out("Failed to get network stats for VM {}: {}".format(domain_name, e), state='w', prefix='vm-thread')
+            continue
 
         # Create the final dictionary
         domain_stats = {

node-daemon/pvcnoded/VMInstance.py

@@ -635,7 +635,7 @@ class VMInstance(object):
 
         self.inreceive = True
 
-        self.logger.out('Receiving VM migration from node "{}"'.format(self.node), state='i', prefix='Domain {}'.format(self.domuuid))
+        self.logger.out('Receiving VM migration from node "{}"'.format(self.last_currentnode), state='i', prefix='Domain {}'.format(self.domuuid))
 
         # Short delay to ensure sender is in sync
         time.sleep(0.5)