summaryrefslogtreecommitdiffstats
path: root/modules/opnfv/installer_adapters
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-11-17 11:35:39 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2016-11-17 14:06:09 +0100
commit6feca8823b63573d0ba5e67a3098c7745a068649 (patch)
treeece6e663c91e5b82e1b2ae25d84af4772a8c4ab7 /modules/opnfv/installer_adapters
parent387600a6d881bfdc046772b2a3cfbfb59fd2469c (diff)
Transform fetch_os_creds.sh into python Class
JIRA: RELENG-168 Change-Id: Id5b1fca430c37917b554a54dd0678d9d7497dc11 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'modules/opnfv/installer_adapters')
-rw-r--r--modules/opnfv/installer_adapters/InstallerHandler.py8
-rw-r--r--modules/opnfv/installer_adapters/fuel/FuelAdapter.py4
-rw-r--r--modules/opnfv/installer_adapters/fuel/example.py10
3 files changed, 11 insertions, 11 deletions
diff --git a/modules/opnfv/installer_adapters/InstallerHandler.py b/modules/opnfv/installer_adapters/InstallerHandler.py
index b81b806ca..e353ef3f4 100644
--- a/modules/opnfv/installer_adapters/InstallerHandler.py
+++ b/modules/opnfv/installer_adapters/InstallerHandler.py
@@ -7,10 +7,10 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-from FuelAdapter import FuelAdapter
-from ApexAdapter import ApexAdapter
-from CompassAdapter import CompassAdapter
-from JoidAdapter import JoidAdapter
+from opnfv.installer_adapters.fuel.FuelAdapter import FuelAdapter
+from opnfv.installer_adapters.apex.ApexAdapter import ApexAdapter
+from opnfv.installer_adapters.compass.CompassAdapter import CompassAdapter
+from opnfv.installer_adapters.joid.JoidAdapter import JoidAdapter
INSTALLERS = ["fuel", "apex", "compass", "joid"]
diff --git a/modules/opnfv/installer_adapters/fuel/FuelAdapter.py b/modules/opnfv/installer_adapters/fuel/FuelAdapter.py
index 95b2ab673..6f079404c 100644
--- a/modules/opnfv/installer_adapters/fuel/FuelAdapter.py
+++ b/modules/opnfv/installer_adapters/fuel/FuelAdapter.py
@@ -8,8 +8,8 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import opnfv.modules.utils.SSHUtils as ssh_utils
-import opnfv.modules.utils.OPNFVLogger as logger
+import opnfv.utils.SSHUtils as ssh_utils
+import opnfv.utils.OPNFVLogger as logger
class FuelAdapter:
diff --git a/modules/opnfv/installer_adapters/fuel/example.py b/modules/opnfv/installer_adapters/fuel/example.py
index 804d79c3d..7fea4dfd7 100644
--- a/modules/opnfv/installer_adapters/fuel/example.py
+++ b/modules/opnfv/installer_adapters/fuel/example.py
@@ -1,12 +1,12 @@
# This is an example of usage of this Tool
# Author: Jose Lausuch (jose.lausuch@ericsson.com)
-from InstallerHandler import InstallerHandler
+import opnfv.installer_adapters.InstallerHandler as ins_handler
-fuel_handler = InstallerHandler(installer='fuel',
- installer_ip='10.20.0.2',
- installer_user='root',
- installer_pwd='r00tme')
+fuel_handler = ins_handler.InstallerHandler(installer='fuel',
+ installer_ip='10.20.0.2',
+ installer_user='root',
+ installer_pwd='r00tme')
print("Nodes in cluster 1:\n%s\n" %
fuel_handler.get_nodes(options={'cluster': '1'}))
print("Nodes in cluster 2:\n%s\n" %