openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Separated Fuel and Slave nodes credentials"

This commit is contained in:
Jenkins 2016-05-04 15:13:22 +00:00 committed by Gerrit Code Review
parent 9118a9bf65 c1dca465b5
commit b2c4e967f2
3 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fuelweb_test/helpers/ssh_manager.py
View File

@ -26,6 +26,8 @@ import six
from fuelweb_test import logger
from fuelweb_test.helpers.metaclasses import SingletonMeta
from fuelweb_test.helpers.exceptions import UnexpectedExitCode
from fuelweb_test.settings import SSH_FUEL_CREDENTIALS
from fuelweb_test.settings import SSH_SLAVE_CREDENTIALS
@six.add_metaclass(SingletonMeta)
@ -36,14 +38,20 @@ class SSHManager(object):
self.__connections = {} # Disallow direct type change and deletion
self.admin_ip = None
self.admin_port = None
self.login = None
self.__password = None
self.admin_login = None
self.__admin_password = None
self.slave_login = None
self.__slave_password = None
@property
def connections(self):
return self.__connections
def initialize(self, admin_ip, login, password):
def initialize(self, admin_ip,
admin_login=SSH_FUEL_CREDENTIALS['login'],
admin_password=SSH_FUEL_CREDENTIALS['password'],
slave_login=SSH_SLAVE_CREDENTIALS['login'],
slave_password=SSH_SLAVE_CREDENTIALS['password']):
""" It will be moved to __init__
:param admin_ip: ip address of admin node
@ -53,8 +61,10 @@ class SSHManager(object):
"""
self.admin_ip = admin_ip
self.admin_port = 22
self.login = login
self.__password = password
self.admin_login = admin_login
self.__admin_password = admin_password
self.slave_login = slave_login
self.__slave_password = slave_password
@staticmethod
def _connect(remote):
@ -74,13 +84,13 @@ class SSHManager(object):
def _get_keys(self):
keys = []
admin_remote = self._get_remote(self.admin_ip)
admin_remote = self.get_remote(self.admin_ip)
key_string = '/root/.ssh/id_rsa'
with admin_remote.open(key_string) as f:
keys.append(RSAKey.from_private_key(f))
return keys
def _get_remote(self, ip, port=22):
def get_remote(self, ip, port=22):
""" Function returns remote SSH connection to node by ip address
:param ip: IP of host
@ -92,14 +102,24 @@ class SSHManager(object):
'{ip}:{port}'.format(ip=ip, port=port))
keys = self._get_keys() if ip != self.admin_ip else []
if ip == self.admin_ip:
username = self.admin_login
password = self.__admin_password
else:
username = self.slave_login
password = self.__slave_password
self.connections[(ip, port)] = SSHClient(
ssh_client = SSHClient(
host=ip,
port=port,
username=self.login,
password=self.__password,
username=username,
password=password,
private_keys=keys
)
if ip != self.admin_ip:
ssh_client.sudo_mode = True
self.connections[(ip, port)] = ssh_client
logger.debug('SSH_MANAGER:Return existed connection for '
'{ip}:{port}'.format(ip=ip, port=port))
logger.debug('SSH_MANAGER: Connections {0}'.format(self.connections))
@ -138,11 +158,11 @@ class SSHManager(object):
ip=ip, port=port))
def execute(self, ip, cmd, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.execute(cmd)
def check_call(self, ip, cmd, port=22, verbose=False):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.check_call(cmd, verbose)
def execute_on_remote(self, ip, cmd, port=22, err_msg=None,
@ -214,7 +234,7 @@ class SSHManager(object):
return result
def execute_async_on_remote(self, ip, cmd, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.execute_async(cmd)
@staticmethod
@ -238,35 +258,35 @@ class SSHManager(object):
return obj
def open_on_remote(self, ip, path, mode='r', port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.open(path, mode)
def upload_to_remote(self, ip, source, target, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.upload(source, target)
def download_from_remote(self, ip, destination, target, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.download(destination, target)
def exists_on_remote(self, ip, path, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.exists(path)
def isdir_on_remote(self, ip, path, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.isdir(path)
def isfile_on_remote(self, ip, path, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.isfile(path)
def mkdir_on_remote(self, ip, path, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.mkdir(path)
def rm_rf_on_remote(self, ip, path, port=22):
remote = self._get_remote(ip=ip, port=port)
remote = self.get_remote(ip=ip, port=port)
return remote.rm_rf(path)
def cond_upload(self, ip, source, target, port=22, condition='',
@ -281,7 +301,7 @@ class SSHManager(object):
:return: count of files
"""
# remote = self._get_remote(ip=ip, port=port)
# remote = self.get_remote(ip=ip, port=port)
# maybe we should use SSHClient function. e.g. remote.isdir(target)
# we can move this function to some *_actions class
if self.isdir_on_remote(ip=ip, port=port, path=target):

22
fuelweb_test/models/environment.py
View File

@ -63,8 +63,10 @@ class EnvironmentModel(object):
self.ssh_manager = SSHManager()
self.ssh_manager.initialize(
self.get_admin_node_ip(),
login=settings.SSH_CREDENTIALS['login'],
password=settings.SSH_CREDENTIALS['password']
admin_login=settings.SSH_FUEL_CREDENTIALS['login'],
admin_password=settings.SSH_FUEL_CREDENTIALS['password'],
slave_login=settings.SSH_SLAVE_CREDENTIALS['login'],
slave_password=settings.SSH_SLAVE_CREDENTIALS['password']
)
self.admin_actions = AdminActions()
self.base_actions = BaseActions()
@ -319,8 +321,8 @@ class EnvironmentModel(object):
return True
def set_admin_ssh_password(self):
new_login = settings.SSH_CREDENTIALS['login']
new_password = settings.SSH_CREDENTIALS['password']
new_login = settings.SSH_FUEL_CREDENTIALS['login']
new_password = settings.SSH_FUEL_CREDENTIALS['password']
try:
self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip,
@ -332,8 +334,10 @@ class EnvironmentModel(object):
' FAIL, trying to change password from default')
self.ssh_manager.initialize(
admin_ip=self.ssh_manager.admin_ip,
login='root',
password='r00tme'
admin_login='root',
admin_password='r00tme',
slave_login=settings.SSH_SLAVE_CREDENTIALS['login'],
slave_password=settings.SSH_SLAVE_CREDENTIALS['password']
)
self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip,
@ -342,8 +346,10 @@ class EnvironmentModel(object):
)
self.ssh_manager.initialize(
admin_ip=self.ssh_manager.admin_ip,
login=new_login,
password=new_password
admin_login=new_login,
admin_password=new_password,
slave_login=settings.SSH_SLAVE_CREDENTIALS['login'],
slave_password=settings.SSH_SLAVE_CREDENTIALS['password']
)
self.ssh_manager.update_connection(
ip=self.ssh_manager.admin_ip,

6
fuelweb_test/settings.py
View File

@ -551,10 +551,14 @@ KEYSTONE_CREDS = {'username': os.environ.get('KEYSTONE_USERNAME', 'admin'),
'tenant_name': os.environ.get('KEYSTONE_TENANT', 'admin')}
# Default SSH password 'ENV_FUEL_PASSWORD' can be changed on Fuel master node
SSH_CREDENTIALS = {
SSH_FUEL_CREDENTIALS = {
'login': os.environ.get('ENV_FUEL_LOGIN', 'root'),
'password': os.environ.get('ENV_FUEL_PASSWORD', 'r00tme')}
SSH_SLAVE_CREDENTIALS = {
'login': os.environ.get('ENV_SLAVE_LOGIN', 'fuel'),
'password': os.environ.get('ENV_SLAVE_PASSWORD', 'fuel')}
###############################################################################
PATCHING_WEB_DIR = os.environ.get("PATCHING_WEB_DIR", "/var/www/nailgun/")