From 4685ba1ec44a124e7e87c3630b017d6151550d20 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 1 May 2023 13:43:54 -0400
Subject: [PATCH] Move cli_lib to lib directory

---
 client-cli/pvc/{cli_lib => lib}/__init__.py    |  0
 client-cli/pvc/{cli_lib => lib}/ansiprint.py   |  0
 client-cli/pvc/{cli_lib => lib}/ceph.py        |  0
 client-cli/pvc/{cli_lib => lib}/cluster.py     |  0
 client-cli/pvc/{cli_lib => lib}/common.py      |  0
 client-cli/pvc/{cli_lib => lib}/network.py     |  0
 client-cli/pvc/{cli_lib => lib}/node.py        |  0
 client-cli/pvc/{cli_lib => lib}/provisioner.py |  0
 client-cli/pvc/{cli_lib => lib}/vm.py          |  0
 client-cli/pvc/{cli_lib => lib}/zkhandler.py   |  0
 client-cli/pvc/pvc.py                          | 14 +++++++-------
 client-cli/setup.py                            |  2 +-
 12 files changed, 8 insertions(+), 8 deletions(-)
 rename client-cli/pvc/{cli_lib => lib}/__init__.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/ansiprint.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/ceph.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/cluster.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/common.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/network.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/node.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/provisioner.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/vm.py (100%)
 rename client-cli/pvc/{cli_lib => lib}/zkhandler.py (100%)

diff --git a/client-cli/pvc/cli_lib/__init__.py b/client-cli/pvc/lib/__init__.py
similarity index 100%
rename from client-cli/pvc/cli_lib/__init__.py
rename to client-cli/pvc/lib/__init__.py
diff --git a/client-cli/pvc/cli_lib/ansiprint.py b/client-cli/pvc/lib/ansiprint.py
similarity index 100%
rename from client-cli/pvc/cli_lib/ansiprint.py
rename to client-cli/pvc/lib/ansiprint.py
diff --git a/client-cli/pvc/cli_lib/ceph.py b/client-cli/pvc/lib/ceph.py
similarity index 100%
rename from client-cli/pvc/cli_lib/ceph.py
rename to client-cli/pvc/lib/ceph.py
diff --git a/client-cli/pvc/cli_lib/cluster.py b/client-cli/pvc/lib/cluster.py
similarity index 100%
rename from client-cli/pvc/cli_lib/cluster.py
rename to client-cli/pvc/lib/cluster.py
diff --git a/client-cli/pvc/cli_lib/common.py b/client-cli/pvc/lib/common.py
similarity index 100%
rename from client-cli/pvc/cli_lib/common.py
rename to client-cli/pvc/lib/common.py
diff --git a/client-cli/pvc/cli_lib/network.py b/client-cli/pvc/lib/network.py
similarity index 100%
rename from client-cli/pvc/cli_lib/network.py
rename to client-cli/pvc/lib/network.py
diff --git a/client-cli/pvc/cli_lib/node.py b/client-cli/pvc/lib/node.py
similarity index 100%
rename from client-cli/pvc/cli_lib/node.py
rename to client-cli/pvc/lib/node.py
diff --git a/client-cli/pvc/cli_lib/provisioner.py b/client-cli/pvc/lib/provisioner.py
similarity index 100%
rename from client-cli/pvc/cli_lib/provisioner.py
rename to client-cli/pvc/lib/provisioner.py
diff --git a/client-cli/pvc/cli_lib/vm.py b/client-cli/pvc/lib/vm.py
similarity index 100%
rename from client-cli/pvc/cli_lib/vm.py
rename to client-cli/pvc/lib/vm.py
diff --git a/client-cli/pvc/cli_lib/zkhandler.py b/client-cli/pvc/lib/zkhandler.py
similarity index 100%
rename from client-cli/pvc/cli_lib/zkhandler.py
rename to client-cli/pvc/lib/zkhandler.py
diff --git a/client-cli/pvc/pvc.py b/client-cli/pvc/pvc.py
index 14bde094..c4fbcb1d 100755
--- a/client-cli/pvc/pvc.py
+++ b/client-cli/pvc/pvc.py
@@ -37,13 +37,13 @@ from distutils.util import strtobool
 
 from functools import wraps
 
-import pvc.cli_lib.ansiprint as ansiprint
-import pvc.cli_lib.cluster as pvc_cluster
-import pvc.cli_lib.node as pvc_node
-import pvc.cli_lib.vm as pvc_vm
-import pvc.cli_lib.network as pvc_network
-import pvc.cli_lib.ceph as pvc_ceph
-import pvc.cli_lib.provisioner as pvc_provisioner
+import pvc.lib.ansiprint as ansiprint
+import pvc.lib.cluster as pvc_cluster
+import pvc.lib.node as pvc_node
+import pvc.lib.vm as pvc_vm
+import pvc.lib.network as pvc_network
+import pvc.lib.ceph as pvc_ceph
+import pvc.lib.provisioner as pvc_provisioner
 
 
 myhostname = socket.gethostname().split(".")[0]
diff --git a/client-cli/setup.py b/client-cli/setup.py
index 88792b97..b0af6b58 100644
--- a/client-cli/setup.py
+++ b/client-cli/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 setup(
     name="pvc",
     version="0.9.63",
-    packages=["pvc", "pvc.cli_lib"],
+    packages=["pvc", "pvc.lib"],
     install_requires=[
         "Click",
         "PyYAML",