From 7371a58aba5f9833bbf6778a4508f2ad25d71c88 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jbjohnso@us.ibm.com>
Date: Wed, 7 Aug 2013 10:01:16 -0400
Subject: [PATCH] Rename to pyghmi

It has been expressed as a concern that 'ipmi' is too generic a name.
Additionally, it is also the case that non-ipmi capability is likely
to be incorporated as it goes along (e.g. Enclosure management and
virtual media are frequently not IPMI based).

Move existing content under the 'pyghmi' namespace.  pyghmi stands for
'python general hardware management infrastructure' and is pronounced
'pygmy'

Change-Id: Ib549a9f5b7dd549c7dc5ddbab251a2e06c572e41
---
 ipmictl.py                                 | 2 +-
 {ipmi => pyghmi}/__init__.py               | 0
 {ipmi/private => pyghmi/ipmi}/__init__.py  | 0
 {ipmi => pyghmi/ipmi}/command.py           | 2 +-
 {ipmi => pyghmi/ipmi}/console.py           | 4 ++--
 pyghmi/ipmi/private/__init__.py            | 0
 {ipmi => pyghmi/ipmi}/private/constants.py | 0
 {ipmi => pyghmi/ipmi}/private/session.py   | 2 +-
 setup.cfg                                  | 2 +-
 solconnect.py                              | 2 +-
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename {ipmi => pyghmi}/__init__.py (100%)
 rename {ipmi/private => pyghmi/ipmi}/__init__.py (100%)
 rename {ipmi => pyghmi/ipmi}/command.py (99%)
 rename {ipmi => pyghmi/ipmi}/console.py (99%)
 create mode 100644 pyghmi/ipmi/private/__init__.py
 rename {ipmi => pyghmi/ipmi}/private/constants.py (100%)
 rename {ipmi => pyghmi/ipmi}/private/session.py (99%)

diff --git a/ipmictl.py b/ipmictl.py
index d952815f..1e7103ab 100755
--- a/ipmictl.py
+++ b/ipmictl.py
@@ -24,7 +24,7 @@ import os
 import string
 import sys
 
-from ipmi import command
+from pyghmi.ipmi import command
 password = os.environ['IPMIPASSWORD']
 os.environ['IPMIPASSWORD'] = ""
 if (len(sys.argv) < 3):
diff --git a/ipmi/__init__.py b/pyghmi/__init__.py
similarity index 100%
rename from ipmi/__init__.py
rename to pyghmi/__init__.py
diff --git a/ipmi/private/__init__.py b/pyghmi/ipmi/__init__.py
similarity index 100%
rename from ipmi/private/__init__.py
rename to pyghmi/ipmi/__init__.py
diff --git a/ipmi/command.py b/pyghmi/ipmi/command.py
similarity index 99%
rename from ipmi/command.py
rename to pyghmi/ipmi/command.py
index 7bd4d939..95192e1d 100644
--- a/ipmi/command.py
+++ b/pyghmi/ipmi/command.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 # This represents the low layer message framing portion of IPMI
 
-from ipmi.private import session
+from pyghmi.ipmi.private import session
 
 
 boot_devices = {
diff --git a/ipmi/console.py b/pyghmi/ipmi/console.py
similarity index 99%
rename from ipmi/console.py
rename to pyghmi/ipmi/console.py
index e0073eb2..3f76ed25 100644
--- a/ipmi/console.py
+++ b/pyghmi/ipmi/console.py
@@ -21,8 +21,8 @@ import os
 import struct
 import types
 
-from ipmi.private import constants
-from ipmi.private import session
+from pyghmi.ipmi.private import constants
+from pyghmi.ipmi.private import session
 
 
 class Console(object):
diff --git a/pyghmi/ipmi/private/__init__.py b/pyghmi/ipmi/private/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/ipmi/private/constants.py b/pyghmi/ipmi/private/constants.py
similarity index 100%
rename from ipmi/private/constants.py
rename to pyghmi/ipmi/private/constants.py
diff --git a/ipmi/private/session.py b/pyghmi/ipmi/private/session.py
similarity index 99%
rename from ipmi/private/session.py
rename to pyghmi/ipmi/private/session.py
index a688d076..e765472d 100644
--- a/ipmi/private/session.py
+++ b/pyghmi/ipmi/private/session.py
@@ -29,7 +29,7 @@ from Crypto.Cipher import AES
 from Crypto.Hash import HMAC
 from Crypto.Hash import SHA
 
-from ipmi.private import constants
+from pyghmi.ipmi.private import constants
 
 
 initialtimeout = 0.5  # minimum timeout for first packet to retry in any given
diff --git a/setup.cfg b/setup.cfg
index 56b0bee7..32ce7559 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,7 @@ classifier =
 
 [files]
 packages =
-    ipmi
+    pyghmi
 
 [global]
 setup-hooks =
diff --git a/solconnect.py b/solconnect.py
index 71022351..3b74d620 100644
--- a/solconnect.py
+++ b/solconnect.py
@@ -23,7 +23,7 @@ import sys
 import termios
 import tty
 
-from ipmi import console
+from pyghmi.ipmi import console
 
 tcattr = termios.tcgetattr(sys.stdin)
 newtcattr = tcattr