CXMAN-221: Rename "cxmanage" python package to "cxmanage_api.cli"

Groups up all the cxmanage functionality under one package. Yay

15 files changed, 29 insertions, 25 deletions

diff --git a/cxmanage/__init__.py b/cxmanage_api/cli/__init__.py
index 438d568..438d568 100644
--- a/cxmanage/__init__.py
+++ b/cxmanage_api/cli/__init__.py
diff --git a/cxmanage/commands/__init__.py b/cxmanage_api/cli/commands/__init__.py
index 571a3c5..571a3c5 100644
--- a/cxmanage/commands/__init__.py
+++ b/cxmanage_api/cli/commands/__init__.py
diff --git a/cxmanage/commands/config.py b/cxmanage_api/cli/commands/config.py
index bbe5256..bde21ca 100644
--- a/cxmanage/commands/config.py
+++ b/cxmanage_api/cli/commands/config.py
@@ -32,7 +32,7 @@
 # DAMAGE.
 
 
-from cxmanage import get_tftp, get_nodes, get_node_strings, run_command
+from cxmanage_api.cli import get_tftp, get_nodes, get_node_strings, run_command
 
 from cxmanage_api.ubootenv import validate_boot_args, \
         validate_pxe_interface
diff --git a/cxmanage/commands/fabric.py b/cxmanage_api/cli/commands/fabric.py
index 8bc3f65..9a410c1 100644
--- a/cxmanage/commands/fabric.py
+++ b/cxmanage_api/cli/commands/fabric.py
@@ -31,7 +31,7 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 # DAMAGE.
 
-from cxmanage import get_tftp, get_nodes, run_command
+from cxmanage_api.cli import get_tftp, get_nodes, run_command
 
 
 def ipinfo_command(args):
diff --git a/cxmanage/commands/fru_version.py b/cxmanage_api/cli/commands/fru_version.py
index 1dd318c..65d0418 100644
--- a/cxmanage/commands/fru_version.py
+++ b/cxmanage_api/cli/commands/fru_version.py
@@ -32,7 +32,7 @@
 # DAMAGE.
 
 
-from cxmanage import get_tftp, get_nodes, get_node_strings, run_command
+from cxmanage_api.cli import get_tftp, get_nodes, get_node_strings, run_command
 
 
 def node_fru_version_command(args):
diff --git a/cxmanage/commands/fw.py b/cxmanage_api/cli/commands/fw.py
index 611315e..b131bf9 100644
--- a/cxmanage/commands/fw.py
+++ b/cxmanage_api/cli/commands/fw.py
@@ -33,8 +33,8 @@
 
 from pkg_resources import parse_version
 
-from cxmanage import get_tftp, get_nodes, get_node_strings, run_command, \
-        prompt_yes
+from cxmanage_api.cli import get_tftp, get_nodes, get_node_strings, \
+        run_command, prompt_yes
 
 from cxmanage_api.image import Image
 from cxmanage_api.firmware_package import FirmwarePackage
diff --git a/cxmanage/commands/info.py b/cxmanage_api/cli/commands/info.py
index b15d2c6..0f0b2ca 100644
--- a/cxmanage/commands/info.py
+++ b/cxmanage_api/cli/commands/info.py
@@ -32,8 +32,8 @@
 # DAMAGE.
 
 
-from cxmanage import get_tftp, get_nodes, get_node_strings, run_command
-from cxmanage import COMPONENTS
+from cxmanage_api.cli import get_tftp, get_nodes, get_node_strings, \
+        run_command, COMPONENTS
 
 
 def info_command(args):
diff --git a/cxmanage/commands/ipdiscover.py b/cxmanage_api/cli/commands/ipdiscover.py
index bd09413..c6c3dee 100644
--- a/cxmanage/commands/ipdiscover.py
+++ b/cxmanage_api/cli/commands/ipdiscover.py
@@ -31,7 +31,7 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 # DAMAGE.
 
-from cxmanage import get_tftp, get_nodes, get_node_strings, run_command
+from cxmanage_api.cli import get_tftp, get_nodes, get_node_strings, run_command
 
 
 def ipdiscover_command(args):
diff --git a/cxmanage/commands/ipmitool.py b/cxmanage_api/cli/commands/ipmitool.py
index ac21e00..2c54b37 100644
--- a/cxmanage/commands/ipmitool.py
+++ b/cxmanage_api/cli/commands/ipmitool.py
@@ -32,8 +32,7 @@
 # DAMAGE.
 
 
-from cxmanage import get_tftp, get_nodes, get_node_strings, run_command
-
+from cxmanage_api.cli import get_tftp, get_nodes, get_node_strings, run_command
 
 def ipmitool_command(args):
     """run arbitrary ipmitool command"""
diff --git a/cxmanage/commands/mc.py b/cxmanage_api/cli/commands/mc.py
index 6c42615..ac258ab 100644
--- a/cxmanage/commands/mc.py
+++ b/cxmanage_api/cli/commands/mc.py
@@ -32,7 +32,7 @@
 # DAMAGE.
 
 
-from cxmanage import get_tftp, get_nodes, run_command
+from cxmanage_api.cli import get_tftp, get_nodes, run_command
 
 
 def mcreset_command(args):
diff --git a/cxmanage/commands/power.py b/cxmanage_api/cli/commands/power.py
index 623c38d..623c38d 100644
--- a/cxmanage/commands/power.py
+++ b/cxmanage_api/cli/commands/power.py
diff --git a/cxmanage/commands/sensor.py b/cxmanage_api/cli/commands/sensor.py
index 3a27143..3a27143 100644
--- a/cxmanage/commands/sensor.py
+++ b/cxmanage_api/cli/commands/sensor.py
diff --git a/cxmanage/commands/tspackage.py b/cxmanage_api/cli/commands/tspackage.py
index d6ee198..d6ee198 100644
--- a/cxmanage/commands/tspackage.py
+++ b/cxmanage_api/cli/commands/tspackage.py
diff --git a/scripts/cxmanage b/scripts/cxmanage
index a3edb37..ce7748c 100755
--- a/scripts/cxmanage
+++ b/scripts/cxmanage
@@ -36,19 +36,19 @@ import pkg_resources
 import subprocess
 import sys
 
-from cxmanage.commands.power import power_command, power_status_command, \
-        power_policy_command, power_policy_status_command
-from cxmanage.commands.mc import mcreset_command
-from cxmanage.commands.fw import fwupdate_command, fwinfo_command
-from cxmanage.commands.sensor import sensor_command
-from cxmanage.commands.fabric import ipinfo_command, macaddrs_command
-from cxmanage.commands.config import config_reset_command, config_boot_command, \
-        config_pxe_command
-from cxmanage.commands.info import info_command
-from cxmanage.commands.ipmitool import ipmitool_command
-from cxmanage.commands.ipdiscover import ipdiscover_command
-from cxmanage.commands.tspackage import tspackage_command
-from cxmanage.commands.fru_version import node_fru_version_command, \
+from cxmanage_api.cli.commands.power import power_command, \
+        power_status_command, power_policy_command, power_policy_status_command
+from cxmanage_api.cli.commands.mc import mcreset_command
+from cxmanage_api.cli.commands.fw import fwupdate_command, fwinfo_command
+from cxmanage_api.cli.commands.sensor import sensor_command
+from cxmanage_api.cli.commands.fabric import ipinfo_command, macaddrs_command
+from cxmanage_api.cli.commands.config import config_reset_command, \
+        config_boot_command, config_pxe_command
+from cxmanage_api.cli.commands.info import info_command
+from cxmanage_api.cli.commands.ipmitool import ipmitool_command
+from cxmanage_api.cli.commands.ipdiscover import ipdiscover_command
+from cxmanage_api.cli.commands.tspackage import tspackage_command
+from cxmanage_api.cli.commands.fru_version import node_fru_version_command, \
     slot_fru_version_command
 
 
diff --git a/setup.py b/setup.py
index c2b5bb5..daba960 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,12 @@ from setuptools import setup
 setup(
     name='cxmanage',
     version='0.9.0',
-    packages=['cxmanage', 'cxmanage.commands', 'cxmanage_api', 'cxmanage_test'],
+    packages=[
+        'cxmanage_api',
+        'cxmanage_api.cli',
+        'cxmanage_api.cli.commands',
+        'cxmanage_test'
+    ],
     scripts=['scripts/cxmanage', 'scripts/sol_tabs'],
     description='Calxeda Management Utility',
     # NOTE: As of right now, the pyipmi version requirement needs to be updated