Move installer adapters to the new modules directory

JIRA: RELENG-149
JIRA: RELENG-161

Now that we have a modules directory in place, let's
move all the shared python code to this location.
We need to create a setup.py to install these
modules in the system so that we don't have to
modify the pythonpath.

Change-Id: I7e608ce6e1e6b3d111405bc789cdb2ff7fcb49c3
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

diff --git a/modules/Readme.txt b/modules/README.rst
similarity index 76%
rename from modules/Readme.txt
rename to modules/README.rst
index 32becc2..7c91eca 100644 (file)
--- a/modules/Readme.txt
+++ b/modules/README.rst
@@ -3,8 +3,8 @@ This directory may be used to add new tools that might be useful for any
 project in OPNFV. This tools must be python based and shall be imported
 as follows:
 
-  from releng.modules.utils import SSHUtils
-  from releng.modules.utils import RelengLogger
+  from opnfv.utils import SSHUtils
+  from opnfv.utils import RelengLogger
   ...
 
 For further information about how to use this modules directory, contact:

diff --git a/utils/installer-adapter/__init__.py b/modules/opnfv/__init__.py
similarity index 100%
rename from utils/installer-adapter/__init__.py
rename to modules/opnfv/__init__.py

diff --git a/utils/installer-adapter/InstallerHandler.py b/modules/opnfv/installer_adapters/InstallerHandler.py
similarity index 100%
rename from utils/installer-adapter/InstallerHandler.py
rename to modules/opnfv/installer_adapters/InstallerHandler.py

diff --git a/modules/__init.py__ b/modules/opnfv/installer_adapters/__init__.py
similarity index 100%
rename from modules/__init.py__
rename to modules/opnfv/installer_adapters/__init__.py

diff --git a/utils/installer-adapter/ApexAdapter.py b/modules/opnfv/installer_adapters/apex/ApexAdapter.py
similarity index 100%
rename from utils/installer-adapter/ApexAdapter.py
rename to modules/opnfv/installer_adapters/apex/ApexAdapter.py

diff --git a/modules/installer_adapters/__init.py__ b/modules/opnfv/installer_adapters/apex/__init__.py
similarity index 100%
rename from modules/installer_adapters/__init.py__
rename to modules/opnfv/installer_adapters/apex/__init__.py

diff --git a/utils/installer-adapter/CompassAdapter.py b/modules/opnfv/installer_adapters/compass/CompassAdapter.py
similarity index 100%
rename from utils/installer-adapter/CompassAdapter.py
rename to modules/opnfv/installer_adapters/compass/CompassAdapter.py

diff --git a/modules/utils/__init.py__ b/modules/opnfv/installer_adapters/compass/__init__.py
similarity index 100%
rename from modules/utils/__init.py__
rename to modules/opnfv/installer_adapters/compass/__init__.py

diff --git a/utils/installer-adapter/FuelAdapter.py b/modules/opnfv/installer_adapters/fuel/FuelAdapter.py
similarity index 98%
rename from utils/installer-adapter/FuelAdapter.py
rename to modules/opnfv/installer_adapters/fuel/FuelAdapter.py
index 672fd51..95b2ab6 100644 (file)
--- a/utils/installer-adapter/FuelAdapter.py
+++ b/modules/opnfv/installer_adapters/fuel/FuelAdapter.py
@@ -8,8 +8,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-import SSHUtils as ssh_utils
-import RelengLogger as rl
+import opnfv.modules.utils.SSHUtils as ssh_utils
+import opnfv.modules.utils.OPNFVLogger as logger
 
 
 class FuelAdapter:
@@ -22,7 +22,7 @@ class FuelAdapter:
             installer_ip,
             self.installer_user,
             password=self.installer_password)
-        self.logger = rl.Logger("Handler").getLogger()
+        self.logger = logger.Logger("FuelHandler").getLogger()
 
     def runcmd_fuel_installer(self, cmd):
         _, stdout, stderr = (self

diff --git a/modules/opnfv/installer_adapters/fuel/__init__.py b/modules/opnfv/installer_adapters/fuel/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/utils/installer-adapter/example.py b/modules/opnfv/installer_adapters/fuel/example.py
similarity index 100%
rename from utils/installer-adapter/example.py
rename to modules/opnfv/installer_adapters/fuel/example.py

diff --git a/utils/installer-adapter/JoidAdapter.py b/modules/opnfv/installer_adapters/joid/JoidAdapter.py
similarity index 100%
rename from utils/installer-adapter/JoidAdapter.py
rename to modules/opnfv/installer_adapters/joid/JoidAdapter.py

diff --git a/modules/opnfv/installer_adapters/joid/__init__.py b/modules/opnfv/installer_adapters/joid/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/utils/installer-adapter/RelengLogger.py b/modules/opnfv/utils/OPNFVLogger.py
similarity index 100%
rename from utils/installer-adapter/RelengLogger.py
rename to modules/opnfv/utils/OPNFVLogger.py

diff --git a/utils/installer-adapter/SSHUtils.py b/modules/opnfv/utils/SSHUtils.py
similarity index 97%
rename from utils/installer-adapter/SSHUtils.py
rename to modules/opnfv/utils/SSHUtils.py
index c938886..2f48add 100644 (file)
--- a/utils/installer-adapter/SSHUtils.py
+++ b/modules/opnfv/utils/SSHUtils.py
@@ -10,10 +10,10 @@
 
 
 import paramiko
-import RelengLogger as rl
+import opnfv.modules.utils.OPNFVLogger as OPNFVLogger
 import os
 
-logger = rl.Logger('SSHUtils').getLogger()
+logger = OPNFVLogger.Logger('SSHUtils').getLogger()
 
 
 def get_ssh_client(hostname, username, password=None, jumphost=None):
@@ -66,6 +66,7 @@ class JumpHostHopClient(paramiko.SSHClient):
     '''
     Connect to a remote server using a jumphost hop
     '''
+
     def __init__(self, *args, **kwargs):
         self.logger = rl.Logger("JumpHostHopClient").getLogger()
         self.jumphost_ssh = None

diff --git a/modules/opnfv/utils/__init__.py b/modules/opnfv/utils/__init__.py
new file mode 100644 (file)
index 0000000..e69de29