Package name changed to glustercli from gluster/cli

aravindavk · aravindavk · commit 096ae7bb053e · 2020-05-09T11:38:57.000+05:30
Signed-off-by: Aravinda Vishwanathapura &lt;aravinda@kadalu.io&gt;
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ pycscope.*
 build
 dist
 docs/_build
+.DS_Store
diff --git a/gluster/__init__.py b/gluster/__init__.py
diff --git a/gluster/cli/__init__.py b/gluster/cli/__init__.py
diff --git a/gluster/metrics/__init__.py b/gluster/metrics/__init__.py
diff --git a/glustercli/__init__.py b/glustercli/__init__.py
diff --git a/glustercli/cli/Makefile.am b/glustercli/cli/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST= __init__.py volume.py utils.py snapshot.py quota.py \
 	peer.py parsers.py georep.py bricks.py bitrot.py heal.py \
 	nfs_ganesha.py rebalance.py tier.py
 
-cliutilsdir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/cli
+cliutilsdir = @BUILD_PYTHON_SITE_PACKAGES@/glustercli
 
 cliutils_PYTHON = __init__.py volume.py utils.py snapshot.py quota.py \
 	peer.py parsers.py georep.py bricks.py bitrot.py heal.py \
diff --git a/glustercli/cli/__init__.py b/glustercli/cli/__init__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+from glustercli.cli import volume
+from glustercli.cli import bitrot
+from glustercli.cli import bricks
+from glustercli.cli import georep
+from glustercli.cli import peer
+from glustercli.cli import quota
+from glustercli.cli import snapshot
+from glustercli.cli import heal
+from glustercli.cli import nfs_ganesha
+from glustercli.cli import rebalance
+
+from glustercli.cli.utils import (set_gluster_path,
+                                  set_gluster_socket,
+                                  set_ssh_host,
+                                  set_ssh_pem_file,
+                                  ssh_connection,
+                                  GlusterCmdException)
+
+# Reexport
+__all__ = ["volume",
+           "bitrot",
+           "bricks",
+           "georep",
+           "peer",
+           "quota",
+           "snapshot",
+           "heal",
+           "nfs_ganesha",
+           "rebalance",
+           "set_gluster_path",
+           "set_gluster_socket",
+           "set_ssh_host",
+           "set_ssh_pem_file",
+           "ssh_connection",
+           "GlusterCmdException"]
diff --git a/glustercli/cli/bitrot.py b/glustercli/cli/bitrot.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .utils import bitrot_execute, bitrot_execute_xml, GlusterCmdException
-from .parsers import parse_bitrot_scrub_status
+from glustercli.cli.utils import bitrot_execute, bitrot_execute_xml, GlusterCmdException
+from glustercli.cli.parsers import parse_bitrot_scrub_status
 
 THROTTLE_TYPES = ["lazy", "normal", "aggressive"]
 FREQUENCY_TYPES = ["hourly", "daily", "weekly", "biweekly", "monthly"]
diff --git a/glustercli/cli/bricks.py b/glustercli/cli/bricks.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .utils import volume_execute, volume_execute_xml
-from .parsers import parse_remove_brick_status
+from glustercli.cli.utils import volume_execute, volume_execute_xml
+from glustercli.cli.parsers import parse_remove_brick_status
 
 
 def add(volname, bricks, stripe=None, replica=None, arbiter=None, force=False):
diff --git a/glustercli/cli/georep.py b/glustercli/cli/georep.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from .utils import georep_execute, georep_execute_xml, gluster_system_execute
-from .parsers import parse_georep_config, parse_georep_status
-from . import volume
+from glustercli.cli.utils import georep_execute, georep_execute_xml, gluster_system_execute
+from glustercli.cli.parsers import parse_georep_config, parse_georep_status
+from glustercli.cli import volume
 
 
 def gsec_create(ssh_key_prefix=True):
diff --git a/glustercli/cli/heal.py b/glustercli/cli/heal.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .utils import heal_execute, heal_execute_xml, GlusterCmdException
-from .parsers import parse_heal_statistics, parse_heal_info
+from glustercli.cli.utils import heal_execute, heal_execute_xml, GlusterCmdException
+from glustercli.cli.parsers import parse_heal_statistics, parse_heal_info
 
 
 HEAL_INFO_TYPES = ["healed", "heal-failed", "split-brain"]
diff --git a/glustercli/cli/nfs_ganesha.py b/glustercli/cli/nfs_ganesha.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from .utils import gluster_execute
+from glustercli.cli.utils import gluster_execute
 
 
 def enable():
diff --git a/glustercli/cli/parsers.py b/glustercli/cli/parsers.py
diff --git a/glustercli/cli/peer.py b/glustercli/cli/peer.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .utils import peer_execute, peer_execute_xml, gluster_execute_xml, GlusterCmdException
-from .parsers import parse_peer_status, parse_pool_list
+from glustercli.cli.utils import peer_execute, peer_execute_xml, gluster_execute_xml, GlusterCmdException
+from glustercli.cli.parsers import parse_peer_status, parse_pool_list
 
 
 def probe(host):
diff --git a/glustercli/cli/quota.py b/glustercli/cli/quota.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .utils import quota_execute, quota_execute_xml, volume_execute
-from .parsers import parse_quota_list_paths, parse_quota_list_objects
+from glustercli.cli.utils import quota_execute, quota_execute_xml, volume_execute
+from glustercli.cli.parsers import parse_quota_list_paths, parse_quota_list_objects
 
 
 def inode_quota_enable(volname):
diff --git a/glustercli/cli/rebalance.py b/glustercli/cli/rebalance.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .utils import volume_execute, volume_execute_xml
-from .parsers import parse_rebalance_status
+from glustercli.cli.utils import volume_execute, volume_execute_xml
+from glustercli.cli.parsers import parse_rebalance_status
 
 
 def fix_layout_start(volname):
diff --git a/glustercli/cli/snapshot.py b/glustercli/cli/snapshot.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from .utils import snapshot_execute, snapshot_execute_xml
-from .parsers import (parse_snapshot_status,
-                      parse_snapshot_info,
-                      parse_snapshot_list)
+from glustercli.cli.utils import snapshot_execute, snapshot_execute_xml
+from glustercli.cli.parsers import (parse_snapshot_status,
+                                    parse_snapshot_info,
+                                    parse_snapshot_list)
 
 
 def activate(snapname, force=False):
diff --git a/glustercli/cli/utils.py b/glustercli/cli/utils.py
@@ -48,7 +48,9 @@ def execute(cmd):
         rc = stdout.channel.recv_exit_status()
         return (rc, stdout.read().strip(), stderr.read().strip())
     else:
-        p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p = subprocess.Popen(c, stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE,
+                             universal_newlines=True)
         out, err = p.communicate()
         return (p.returncode, out, err)
 
diff --git a/glustercli/cli/volume.py b/glustercli/cli/volume.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 
-from .utils import volume_execute, volume_execute_xml, GlusterCmdException
-from .parsers import (parse_volume_info,
-                      parse_volume_status,
-                      parse_volume_options,
-                      parse_volume_list,
-                      parse_volume_profile_info)
+from glustercli.cli.utils import volume_execute, volume_execute_xml, \
+    GlusterCmdException
+from glustercli.cli.parsers import (parse_volume_info,
+                                    parse_volume_status,
+                                    parse_volume_options,
+                                    parse_volume_list,
+                                    parse_volume_profile_info)
 
 # Following import are not used in this file, but imported to make
 # it available via volume.(noqa to ignore in pep8 check)
-from . import bitrot     # noqa
-from . import bricks     # noqa
-from . import heal       # noqa
-from . import quota      # noqa
-from . import rebalance  # noqa
-from . import tier       # noqa
+from glustercli.cli import bitrot     # noqa
+from glustercli.cli import bricks     # noqa
+from glustercli.cli import heal       # noqa
+from glustercli.cli import quota      # noqa
+from glustercli.cli import rebalance  # noqa
 
 
 LOCK_KINDS = ["blocked", "granted", "all"]
diff --git a/glustercli/metrics/__init__.py b/glustercli/metrics/__init__.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+from glustercli.metrics.process import local_processes
+from glustercli.metrics.utilization import local_utilization
+from glustercli.metrics.diskstats import local_diskstats
+
+# Reexport
+__all__ = [
+    "local_processes",
+    "local_utilization",
+    "local_diskstats"
+]
diff --git a/glustercli/metrics/cmdlineparser.py b/glustercli/metrics/cmdlineparser.py
diff --git a/glustercli/metrics/diskstats.py b/glustercli/metrics/diskstats.py
@@ -1,7 +1,7 @@
 import os
 import subprocess
 
-from utils import get_local_bricks
+from glustercli.metrics.utils import get_local_bricks
 
 
 default_diskstat = {
diff --git a/glustercli/metrics/process.py b/glustercli/metrics/process.py
@@ -1,6 +1,6 @@
 import subprocess
 
-import cmdlineparser
+glustercli.metrics import cmdlineparser
 
 GLUSTER_PROCS = [
     "glusterd",
diff --git a/glustercli/metrics/utilization.py b/glustercli/metrics/utilization.py
@@ -1,6 +1,6 @@
 import os
 
-from utils import get_local_bricks
+from glustercli.metrics.utils import get_local_bricks
 
 
 def local_utilization(volname=None):
diff --git a/glustercli/metrics/utils.py b/glustercli/metrics/utils.py
@@ -1,4 +1,4 @@
-from gluster.cli import volume
+from glustercli.cli import volume
 
 UUID_FILE = "/var/lib/glusterd/glusterd.info"
 
diff --git a/setup.py b/setup.py
@@ -1,8 +1,8 @@
 import os
 import re
-from setuptools import setup, find_packages
+from setuptools import setup
 
-VERSION = 0.6
+VERSION = "0.7.1"
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -17,7 +17,7 @@ def read(fname):
     author='Aravinda Vishwanathapura',
     author_email='aravinda@kadalu.io',
     url='https://github.com/gluster/glustercli-python',
-    packages=find_packages(),
+    packages=["glustercli", "glustercli.cli", "glustercli.metrics"],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from gluster.cli import volume`
	`1`	`+from glustercli.cli import volume`
`2`	`2`
`3`	`3`	`UUID_FILE = "/var/lib/glusterd/glusterd.info"`
`4`	`4`