From a22e99decc1d589bca0d66429e2b9bbd174af15b Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Wed, 14 Mar 2018 19:16:29 +0800 Subject: Add a new adapter for containerized Compass installer JIRA: - Compass installer has been containerized since OPNFV 5.0. To enable SFC test cases in Functest for Compass installer, a new adapter is needed to be compatible with both containerized Compass installer and SFC test cases. Change-Id: I4e1a9e5fcbec016a0c3fde77ace9c2cc677e3e4c Signed-off-by: Yifei Xue --- modules/opnfv/deployment/factory.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/opnfv/deployment/factory.py') diff --git a/modules/opnfv/deployment/factory.py b/modules/opnfv/deployment/factory.py index 2788e5eaa..1fd8d447b 100644 --- a/modules/opnfv/deployment/factory.py +++ b/modules/opnfv/deployment/factory.py @@ -9,7 +9,7 @@ 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.daisy import adapter as daisy_adapter @@ -44,10 +44,10 @@ class Factory(object): installer_user=installer_user, installer_pwd=installer_pwd) elif installer.lower() == "compass": - return compass_adapter.CompassAdapter( + return compass_adapter.ContainerizedCompassAdapter( 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, -- cgit 1.2.3-korg