Merge "Change the path of images from pre_config/ to images/"

[releng.git] / modules / opnfv / deployment / factory.py

diff --git a/modules/opnfv/deployment/factory.py b/modules/opnfv/deployment/factory.py
index e48a751..1fd8d44 100644 (file)
--- a/modules/opnfv/deployment/factory.py
+++ b/modules/opnfv/deployment/factory.py
@@ -9,7 +9,10 @@
 
 
 from opnfv.deployment.apex import adapter as apex_adapter
+from opnfv.deployment.compass import adapter_container as compass_adapter
 from opnfv.deployment.fuel import adapter as fuel_adapter
+from opnfv.deployment.osa import adapter as osa_adapter
+from opnfv.deployment.daisy import adapter as daisy_adapter
 from opnfv.utils import opnfv_logger as logger
 
 logger = logger.Logger(__name__).getLogger()
@@ -17,7 +20,7 @@ logger = logger.Logger(__name__).getLogger()
 
 class Factory(object):
 
-    INSTALLERS = ["fuel", "apex", "compass", "joid", "daisy"]
+    INSTALLERS = ["fuel", "apex", "compass", "joid", "daisy", "osa"]
 
     def __init__(self):
         pass
@@ -40,5 +43,19 @@ class Factory(object):
             return fuel_adapter.FuelAdapter(installer_ip=installer_ip,
                                             installer_user=installer_user,
                                             installer_pwd=installer_pwd)
+        elif installer.lower() == "compass":
+            return compass_adapter.ContainerizedCompassAdapter(
+                installer_ip=installer_ip,
+                installer_user=installer_user,
+                pkey_file=pkey_file)
+        elif installer.lower() == "osa":
+            return osa_adapter.OSAAdapter(installer_ip=installer_ip,
+                                          installer_user=installer_user,
+                                          pkey_file=pkey_file)
+        elif installer.lower() == "daisy":
+            return daisy_adapter.DaisyAdapter(installer_ip=installer_ip,
+                                              installer_user=installer_user,
+                                              installer_pwd=installer_pwd)
         else:
-            raise Exception("Installer adapter is not implemented.")
+            raise Exception("Installer adapter is not implemented for "
+                            "the given installer.")