openstack
/
fuel-qa
Code Issues Proposed changes

fix import conflicts: rename ssl to ssl_helpers 

Rename helpers/ssl to helpers/ssl_helpers
Closes-bug: #1565776

Change-Id: I78e743b299e69dee2684df9e97b48d0054148fea
This commit is contained in:
Alexey Stepanov 2016-04-04 15:47:03 +03:00
parent da2503b12f
commit a413764bd6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
fuelweb_test/helpers/ssl.py → fuelweb_test/helpers/ssl_helpers.py
View File

4
fuelweb_test/models/fuel_web_client.py
View File

@ -52,8 +52,8 @@ from fuelweb_test.helpers.decorators import update_fuel
from fuelweb_test.helpers.decorators import upload_manifests
from fuelweb_test.helpers.security import SecurityChecks
from fuelweb_test.helpers.ssh_manager import SSHManager
from fuelweb_test.helpers.ssl import change_cluster_ssl_config
from fuelweb_test.helpers.ssl import copy_cert_from_master
from fuelweb_test.helpers.ssl_helpers import change_cluster_ssl_config
from fuelweb_test.helpers.ssl_helpers import copy_cert_from_master
from fuelweb_test.helpers.uca import change_cluster_uca_config
from fuelweb_test.helpers.utils import get_node_hiera_roles
from fuelweb_test.helpers.utils import node_freemem

2
fuelweb_test/tests/test_cli_base.py
View File

@ -22,7 +22,7 @@ from devops.helpers.helpers import wait
from six.moves import urllib
# pylint: enable=import-error
from fuelweb_test.helpers.ssl import change_cluster_ssl_config
from fuelweb_test.helpers.ssl_helpers import change_cluster_ssl_config
from fuelweb_test.tests.base_test_case import TestBasic
from fuelweb_test import logwrap
from fuelweb_test import logger