Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add a new adapter for containerized Compass installer"
[releng.git]
/
modules
/
opnfv
/
deployment
/
factory.py
diff --git
a/modules/opnfv/deployment/factory.py
b/modules/opnfv/deployment/factory.py
index
e14783f
..
1fd8d44
100644
(file)
--- a/
modules/opnfv/deployment/factory.py
+++ b/
modules/opnfv/deployment/factory.py
@@
-9,9
+9,10
@@
from opnfv.deployment.apex import adapter as apex_adapter
from opnfv.deployment.apex import adapter as apex_adapter
-from opnfv.deployment.compass import adapter as compass_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.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()
from opnfv.utils import opnfv_logger as logger
logger = logger.Logger(__name__).getLogger()
@@
-43,14
+44,18
@@
class Factory(object):
installer_user=installer_user,
installer_pwd=installer_pwd)
elif installer.lower() == "compass":
installer_user=installer_user,
installer_pwd=installer_pwd)
elif installer.lower() == "compass":
- return compass_adapter.CompassAdapter(
+ return compass_adapter.Co
ntainerizedCo
mpassAdapter(
installer_ip=installer_ip,
installer_user=installer_user,
installer_ip=installer_ip,
installer_user=installer_user,
-
installer_pwd=installer_pwd
)
+
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() == "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 for "
"the given installer.")
else:
raise Exception("Installer adapter is not implemented for "
"the given installer.")