diff options
| author |   George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-02-14 13:44:42 +0200 |
|---|---|---|
| committer | George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-02-15 12:28:11 +0200 |
| commit | f9a6e37b970ff3974ad9e3f0027354d04bbf3ce7 (patch) | |
| tree | db1af81b1c7c40e5535159a30e821ef254d78a7f /sfc/lib/config.py | |
| parent | 306daf5219a2ba7975c2cc22096e41fd39f91918 (diff) | |
Refactor utils using installer adapters
JIRA: SFC-65
JIRA: SFC-71
Use the new library in releng to talk to fuel.
This allows for correct configuration of the compute hosts to resolve
SFC-71
Also since https://gerrit.opnfv.org/gerrit/#/c/28281/ was merged it
allows to run in multienv deployments so it resolves SFC-65
Change-Id: I5e6beb90d9c5108c21acb8d898f07cd2f4ae34f3
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
Diffstat (limited to 'sfc/lib/config.py')
| -rw-r--r-- | sfc/lib/config.py | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/sfc/lib/config.py b/sfc/lib/config.py index e9fcd582..f5a07013 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -34,22 +34,31 @@ class CommonConfig(object): self.functest_results_dir = os.path.join( CONST.dir_results, "odl-sfc") self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") - self.fuel_master_ip = ft_utils.get_parameter_from_yaml( - "defaults.fuel_master_ip", self.config_file) - self.fuel_master_uname = ft_utils.get_parameter_from_yaml( - "defaults.fuel_master_uname", self.config_file) - self.fuel_master_passwd = ft_utils.get_parameter_from_yaml( - "defaults.fuel_master_passwd", self.config_file) - self.fuel_proxy = { - 'ip': self.fuel_master_ip, - 'username': self.fuel_master_uname, - 'password': self.fuel_master_passwd - } + self.installer_type = ft_utils.get_parameter_from_yaml( + "defaults.installer.type", self.config_file) + self.installer_ip = ft_utils.get_parameter_from_yaml( + "defaults.installer.ip", self.config_file) + self.installer_user = ft_utils.get_parameter_from_yaml( + "defaults.installer.user", self.config_file) + + try: + self.installer_password = ft_utils.get_parameter_from_yaml( + "defaults.installer.password", self.config_file) + except: + self.installer_password = None + try: - self.fuel_environment = ft_utils.get_parameter_from_yaml( - "defaults.fuel_environment", self.config_file) + self.installer_key_file = ft_utils.get_parameter_from_yaml( + "defaults.installer.key_file", self.config_file) except: - self.fuel_environment = None + self.installer_key_file = None + + try: + self.installer_cluster = ft_utils.get_parameter_from_yaml( + "defaults.installer.cluster", self.config_file) + except: + self.installer_cluster = None + self.flavor = ft_utils.get_parameter_from_yaml( "defaults.flavor", self.config_file) self.ram_size_in_mb = ft_utils.get_parameter_from_yaml( |