From f29ba2f458ed1ab337dc9aa025e21984acc65194 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 12 Sep 2018 11:59:23 -0400 Subject: [PATCH] Rename the virtualization daemon to `pvcvd`. --- debian/control | 2 +- debian/pvc-virtdaemon.install | 4 ---- debian/pvc-virtualization-daemon.install | 4 ++++ ...nst => pvc-virtualization-daemon.postinst} | 0 ....prerm => pvc-virtualization-daemon.prerm} | 0 .../{pvcd.conf.sample => pvcvd.conf.sample} | 0 virtualization-daemon/{pvcd.py => pvcvd.py} | 0 .../{pvcd.service => pvcvd.service} | 0 .../{pvcd => pvcvd}/Daemon.py | 22 +++++++++---------- .../{pvcd => pvcvd}/NodeInstance.py | 6 ++--- .../{pvcd => pvcvd}/VMInstance.py | 6 ++--- .../{pvcd => pvcvd}/__init__.py | 0 .../{pvcd => pvcvd}/ansiiprint.py | 0 .../{pvcd => pvcvd}/zkhandler.py | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 debian/pvc-virtdaemon.install create mode 100644 debian/pvc-virtualization-daemon.install rename debian/{pvc-virtdaemon.postinst => pvc-virtualization-daemon.postinst} (100%) rename debian/{pvc-virtdaemon.prerm => pvc-virtualization-daemon.prerm} (100%) rename virtualization-daemon/{pvcd.conf.sample => pvcvd.conf.sample} (100%) rename virtualization-daemon/{pvcd.py => pvcvd.py} (100%) rename virtualization-daemon/{pvcd.service => pvcvd.service} (100%) rename virtualization-daemon/{pvcd => pvcvd}/Daemon.py (94%) rename virtualization-daemon/{pvcd => pvcvd}/NodeInstance.py (99%) rename virtualization-daemon/{pvcd => pvcvd}/VMInstance.py (99%) rename virtualization-daemon/{pvcd => pvcvd}/__init__.py (100%) rename virtualization-daemon/{pvcd => pvcvd}/ansiiprint.py (100%) rename virtualization-daemon/{pvcd => pvcvd}/zkhandler.py (98%) diff --git a/debian/control b/debian/control index 80ec1203..b4bf8273 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.8 Homepage: https://www.boniface.me X-Python3-Version: >= 3.2 -Package: pvc-virtdaemon +Package: pvc-virtualization-daemon Architecture: all Depends: python3-kazoo, python3-libvirt, python3-psutil, python3-apscheduler, ipmitool, libvirt-daemon-system Suggests: pvc-client diff --git a/debian/pvc-virtdaemon.install b/debian/pvc-virtdaemon.install deleted file mode 100644 index 52175abe..00000000 --- a/debian/pvc-virtdaemon.install +++ /dev/null @@ -1,4 +0,0 @@ -virtualization-daemon/pvcd.py usr/share/pvc -virtualization-daemon/pvcd.service lib/systemd/system -virtualization-daemon/pvcd.conf.sample etc/pvc -virtualization-daemon/pvcd usr/share/pvc diff --git a/debian/pvc-virtualization-daemon.install b/debian/pvc-virtualization-daemon.install new file mode 100644 index 00000000..c4b8dd02 --- /dev/null +++ b/debian/pvc-virtualization-daemon.install @@ -0,0 +1,4 @@ +virtualization-daemon/pvcvd.py usr/share/pvc +virtualization-daemon/pvcvd.service lib/systemd/system +virtualization-daemon/pvcvd.conf.sample etc/pvc +virtualization-daemon/pvcvd usr/share/pvc diff --git a/debian/pvc-virtdaemon.postinst b/debian/pvc-virtualization-daemon.postinst similarity index 100% rename from debian/pvc-virtdaemon.postinst rename to debian/pvc-virtualization-daemon.postinst diff --git a/debian/pvc-virtdaemon.prerm b/debian/pvc-virtualization-daemon.prerm similarity index 100% rename from debian/pvc-virtdaemon.prerm rename to debian/pvc-virtualization-daemon.prerm diff --git a/virtualization-daemon/pvcd.conf.sample b/virtualization-daemon/pvcvd.conf.sample similarity index 100% rename from virtualization-daemon/pvcd.conf.sample rename to virtualization-daemon/pvcvd.conf.sample diff --git a/virtualization-daemon/pvcd.py b/virtualization-daemon/pvcvd.py similarity index 100% rename from virtualization-daemon/pvcd.py rename to virtualization-daemon/pvcvd.py diff --git a/virtualization-daemon/pvcd.service b/virtualization-daemon/pvcvd.service similarity index 100% rename from virtualization-daemon/pvcd.service rename to virtualization-daemon/pvcvd.service diff --git a/virtualization-daemon/pvcd/Daemon.py b/virtualization-daemon/pvcvd/Daemon.py similarity index 94% rename from virtualization-daemon/pvcd/Daemon.py rename to virtualization-daemon/pvcvd/Daemon.py index 5a339157..fc191258 100644 --- a/virtualization-daemon/pvcd/Daemon.py +++ b/virtualization-daemon/pvcvd/Daemon.py @@ -33,18 +33,18 @@ import time import configparser import apscheduler.schedulers.background -import pvcd.ansiiprint as ansiiprint -import pvcd.zkhandler as zkhandler -import pvcd.VMInstance as VMInstance -import pvcd.NodeInstance as NodeInstance +import pvcvd.ansiiprint as ansiiprint +import pvcvd.zkhandler as zkhandler +import pvcvd.VMInstance as VMInstance +import pvcvd.NodeInstance as NodeInstance -print(ansiiprint.bold() + "pvcd - Parallel Virtual Cluster management daemon" + ansiiprint.end()) +print(ansiiprint.bold() + "pvcvd - Parallel Virtual Cluster management daemon" + ansiiprint.end()) # Get the config file variable from the environment try: - pvcd_config_file = os.environ['PVCD_CONFIG_FILE'] + pvcvd_config_file = os.environ['PVCD_CONFIG_FILE'] except: - print('ERROR: The "PVCD_CONFIG_FILE" environment variable must be set before starting pvcd.') + print('ERROR: The "PVCD_CONFIG_FILE" environment variable must be set before starting pvcvd.') exit(1) myhostname = socket.gethostname() @@ -64,11 +64,11 @@ config_values = [ 'ipmi_username', 'ipmi_password' ] -def readConfig(pvcd_config_file, myhostname): - print('Loading configuration from file {}'.format(pvcd_config_file)) +def readConfig(pvcvd_config_file, myhostname): + print('Loading configuration from file {}'.format(pvcvd_config_file)) o_config = configparser.ConfigParser() - o_config.read(pvcd_config_file) + o_config.read(pvcvd_config_file) config = {} try: @@ -97,7 +97,7 @@ def readConfig(pvcd_config_file, myhostname): return config # Get config -config = readConfig(pvcd_config_file, myhostname) +config = readConfig(pvcvd_config_file, myhostname) # Check that libvirtd is listening TCP libvirt_check_name = "qemu+tcp://127.0.0.1:16509/system" diff --git a/virtualization-daemon/pvcd/NodeInstance.py b/virtualization-daemon/pvcvd/NodeInstance.py similarity index 99% rename from virtualization-daemon/pvcd/NodeInstance.py rename to virtualization-daemon/pvcvd/NodeInstance.py index a6cea9fe..926c8263 100644 --- a/virtualization-daemon/pvcd/NodeInstance.py +++ b/virtualization-daemon/pvcvd/NodeInstance.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# NodeInstance.py - Class implementing a PVC node and run by pvcd +# NodeInstance.py - Class implementing a PVC node and run by pvcvd # Part of the Parallel Virtual Cluster (PVC) system # # Copyright (C) 2018 Joshua M. Boniface @@ -21,8 +21,8 @@ ############################################################################### import os, sys, psutil, socket, time, libvirt, kazoo.client, threading, subprocess -import pvcd.ansiiprint as ansiiprint -import pvcd.zkhandler as zkhandler +import pvcvd.ansiiprint as ansiiprint +import pvcvd.zkhandler as zkhandler class NodeInstance(): # Initialization function diff --git a/virtualization-daemon/pvcd/VMInstance.py b/virtualization-daemon/pvcvd/VMInstance.py similarity index 99% rename from virtualization-daemon/pvcd/VMInstance.py rename to virtualization-daemon/pvcvd/VMInstance.py index 394d9ffd..f6b03c52 100644 --- a/virtualization-daemon/pvcd/VMInstance.py +++ b/virtualization-daemon/pvcvd/VMInstance.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# VMInstance.py - Class implementing a PVC virtual machine and run by pvcd +# VMInstance.py - Class implementing a PVC virtual machine and run by pvcvd # Part of the Parallel Virtual Cluster (PVC) system # # Copyright (C) 2018 Joshua M. Boniface @@ -21,8 +21,8 @@ ############################################################################### import os, sys, uuid, socket, time, threading, libvirt, kazoo.client -import pvcd.ansiiprint as ansiiprint -import pvcd.zkhandler as zkhandler +import pvcvd.ansiiprint as ansiiprint +import pvcvd.zkhandler as zkhandler class VMInstance: # Initialization function diff --git a/virtualization-daemon/pvcd/__init__.py b/virtualization-daemon/pvcvd/__init__.py similarity index 100% rename from virtualization-daemon/pvcd/__init__.py rename to virtualization-daemon/pvcvd/__init__.py diff --git a/virtualization-daemon/pvcd/ansiiprint.py b/virtualization-daemon/pvcvd/ansiiprint.py similarity index 100% rename from virtualization-daemon/pvcd/ansiiprint.py rename to virtualization-daemon/pvcvd/ansiiprint.py diff --git a/virtualization-daemon/pvcd/zkhandler.py b/virtualization-daemon/pvcvd/zkhandler.py similarity index 98% rename from virtualization-daemon/pvcd/zkhandler.py rename to virtualization-daemon/pvcvd/zkhandler.py index fb522757..54bfc07f 100644 --- a/virtualization-daemon/pvcd/zkhandler.py +++ b/virtualization-daemon/pvcvd/zkhandler.py @@ -21,7 +21,7 @@ ############################################################################### import kazoo.client -import pvcd.ansiiprint as ansiiprint +import pvcvd.ansiiprint as ansiiprint # Child list function def listchildren(zk_conn, key):