summaryrefslogtreecommitdiffstats
path: root/doctor_tests
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2018-03-19 17:12:03 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2018-03-20 10:33:46 +0800
commit6bd4e026fca92b281382a3f6b46f7ab7eeb31f45 (patch)
tree6284dfdbcd651476d72895e8b09d5e420b9b2fa2 /doctor_tests
parent8dc884e35c1cbfb2181f2bf803e3dc0171cbdbe6 (diff)
support MCP installer
1.support MCP installer 2.optimize the installer code JIRA: DOCTOR-121 Change-Id: I8675c2652944575a8f73d0d1e2dafaad5a3e88e3 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'doctor_tests')
-rw-r--r--doctor_tests/installer/__init__.py5
-rw-r--r--doctor_tests/installer/apex.py101
-rw-r--r--doctor_tests/installer/base.py74
-rw-r--r--doctor_tests/installer/daisy.py62
-rw-r--r--doctor_tests/installer/mcp.py89
5 files changed, 198 insertions, 133 deletions
diff --git a/doctor_tests/installer/__init__.py b/doctor_tests/installer/__init__.py
index 1ee59d9..31fce75 100644
--- a/doctor_tests/installer/__init__.py
+++ b/doctor_tests/installer/__init__.py
@@ -14,7 +14,7 @@ from oslo_utils import importutils
OPTS = [
cfg.StrOpt('type',
default=os.environ.get('INSTALLER_TYPE', 'local'),
- choices=['local', 'apex', 'daisy'],
+ choices=['local', 'apex', 'daisy', 'fuel'],
help='the type of installer',
required=True),
cfg.StrOpt('ip',
@@ -30,7 +30,8 @@ OPTS = [
_installer_name_class_mapping = {
'local': 'doctor_tests.installer.local.LocalInstaller',
'apex': 'doctor_tests.installer.apex.ApexInstaller',
- 'daisy': 'doctor_tests.installer.daisy.DaisyInstaller'
+ 'daisy': 'doctor_tests.installer.daisy.DaisyInstaller',
+ 'fuel': 'doctor_tests.installer.mcp.McpInstaller'
}
diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py
index e106f24..1ce3eb6 100644
--- a/doctor_tests/installer/apex.py
+++ b/doctor_tests/installer/apex.py
@@ -6,14 +6,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import getpass
-import grp
-import os
-import pwd
-import stat
-import subprocess
-
-from doctor_tests.common.utils import get_doctor_test_root_dir
from doctor_tests.common.utils import SSHClient
from doctor_tests.installer.base import BaseInstaller
@@ -31,14 +23,12 @@ class ApexInstaller(BaseInstaller):
self.key_file = None
self.controllers = list()
self.controller_clients = list()
- self.servers = list()
- self.test_dir = get_doctor_test_root_dir()
def setup(self):
self.log.info('Setup Apex installer start......')
- self.get_ssh_key_from_installer()
- self.get_controller_ips()
+ self.key_file = self.get_ssh_key_from_installer()
+ self.controllers = self.get_controller_ips()
self.create_flavor()
self.set_apply_patches()
self.setup_stunnel()
@@ -49,21 +39,8 @@ class ApexInstaller(BaseInstaller):
server.terminate()
def get_ssh_key_from_installer(self):
- self.log.info('Get SSH keys from Apex installer......')
-
- if self.key_file is not None:
- self.log.info('Already have SSH keys from Apex installer......')
- return self.key_file
-
- ssh_key = '{0}/{1}'.format(self.test_dir, 'instack_key')
- self.client.scp('/home/stack/.ssh/id_rsa', ssh_key, method='get')
- user = getpass.getuser()
- uid = pwd.getpwnam(user).pw_uid
- gid = grp.getgrnam(user).gr_gid
- os.chown(ssh_key, uid, gid)
- os.chmod(ssh_key, stat.S_IREAD)
- self.key_file = ssh_key
- return self.key_file
+ key_path = '/home/stack/.ssh/id_rsa'
+ return self._get_ssh_key(self.client, key_path)
def get_controller_ips(self):
self.log.info('Get controller ips from Apex installer......')
@@ -71,75 +48,41 @@ class ApexInstaller(BaseInstaller):
command = "source stackrc; " \
"nova list | grep ' overcloud-controller-[0-9] ' " \
"| sed -e 's/^.*ctlplane=//' |awk '{print $1}'"
- ret, controllers = self.client.ssh(command)
- if ret:
- raise Exception('Exec command to get controller ips'
- 'in Apex installer failed, ret=%s, output=%s'
- % (ret, controllers))
+ controllers = self._run_cmd_remote(self.client, command)
self.log.info('Get controller_ips:%s from Apex installer'
% controllers)
- self.controllers = controllers
+ return controllers
def get_host_ip_from_hostname(self, hostname):
- self.log.info('Get host ip from host name in Apex installer......')
+ self.log.info('Get host ip by hostname=%s from Apex installer......'
+ % hostname)
hostname_in_undercloud = hostname.split('.')[0]
-
command = "source stackrc; nova show %s | awk '/ ctlplane network /{print $5}'" % (hostname_in_undercloud) # noqa
- ret, host_ip = self.client.ssh(command)
- if ret:
- raise Exception('Exec command to get host ip from hostname(%s)'
- 'in Apex installer failed, ret=%s, output=%s'
- % (hostname, ret, host_ip))
- self.log.info('Get host_ip:%s from host_name:%s in Apex installer'
- % (host_ip, hostname))
- return host_ip[0]
-
- def setup_stunnel(self):
- self.log.info('Setup ssh stunnel in controller nodes'
- 'in Apex installer......')
- for node_ip in self.controllers:
- cmd = ("ssh -o UserKnownHostsFile=/dev/null"
- " -o StrictHostKeyChecking=no"
- " -i %s %s@%s -R %s:localhost:%s"
- " sleep 600 > ssh_tunnel.%s.log"
- " 2>&1 < /dev/null &"
- % (self.key_file,
- self.node_user_name,
- node_ip,
- self.conf.consumer.port,
- self.conf.consumer.port,
- node_ip))
- server = subprocess.Popen(cmd, shell=True)
- self.servers.append(server)
- server.communicate()
+ host_ips = self._run_cmd_remote(self.client, command)
+ return host_ips[0]
def set_apply_patches(self):
self.log.info('Set apply patches start......')
+ restart_cm_cmd = 'sudo systemctl restart ' \
+ 'openstack-ceilometer-notification.service'
+
for node_ip in self.controllers:
client = SSHClient(node_ip, self.node_user_name,
key_filename=self.key_file)
self.controller_clients.append(client)
- self._ceilometer_apply_patches(client, self.cm_set_script)
+ self._run_apply_patches(client,
+ restart_cm_cmd,
+ self.cm_set_script)
def restore_apply_patches(self):
self.log.info('restore apply patches start......')
+ restart_cm_cmd = 'sudo systemctl restart ' \
+ 'openstack-ceilometer-notification.service'
+
for client in self.controller_clients:
- self._ceilometer_apply_patches(client, self.cm_restore_script)
-
- def _ceilometer_apply_patches(self, ssh_client, script_name):
- installer_dir = os.path.dirname(os.path.realpath(__file__))
- script_abs_path = '{0}/{1}/{2}'.format(installer_dir,
- 'common', script_name)
-
- ssh_client.scp(script_abs_path, script_name)
- cmd = 'sudo python %s' % script_name
- ret, output = ssh_client.ssh(cmd)
- if ret:
- raise Exception('Do the ceilometer command in controller'
- ' node failed, ret=%s, cmd=%s, output=%s'
- % (ret, cmd, output))
- ssh_client.ssh('sudo systemctl restart '
- 'openstack-ceilometer-notification.service')
+ self._run_apply_patches(client,
+ restart_cm_cmd,
+ self.cm_restore_script)
diff --git a/doctor_tests/installer/base.py b/doctor_tests/installer/base.py
index 27e7502..76bbeb1 100644
--- a/doctor_tests/installer/base.py
+++ b/doctor_tests/installer/base.py
@@ -7,8 +7,15 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
import abc
+import getpass
+import grp
+import os
+import pwd
import six
+import stat
+import subprocess
+from doctor_tests.common.utils import get_doctor_test_root_dir
from doctor_tests.identity_auth import get_session
from doctor_tests.os_clients import nova_client
@@ -18,6 +25,7 @@ class BaseInstaller(object):
def __init__(self, conf, log):
self.conf = conf
self.log = log
+ self.servers = list()
@abc.abstractproperty
def node_user_name(self):
@@ -46,3 +54,69 @@ class BaseInstaller(object):
flavors = {flavor.name: flavor for flavor in self.nova.flavors.list()}
if self.conf.flavor not in flavors:
self.nova.flavors.create(self.conf.flavor, 512, 1, 1)
+
+ def setup_stunnel(self):
+ self.log.info('Setup ssh stunnel in %s installer......'
+ % self.conf.installer.type)
+
+ for node_ip in self.controllers:
+ cmd = ("ssh -o UserKnownHostsFile=/dev/null"
+ " -o StrictHostKeyChecking=no"
+ " -i %s %s@%s -R %s:localhost:%s"
+ " sleep 600 > ssh_tunnel.%s.log"
+ " 2>&1 < /dev/null &"
+ % (self.key_file,
+ self.node_user_name,
+ node_ip,
+ self.conf.consumer.port,
+ self.conf.consumer.port,
+ node_ip))
+ server = subprocess.Popen(cmd, shell=True)
+ self.servers.append(server)
+ server.communicate()
+
+ def _get_ssh_key(self, client, key_path):
+ self.log.info('Get SSH keys from %s installer......'
+ % self.conf.installer.type)
+
+ if self.key_file is not None:
+ self.log.info('Already have SSH keys from %s installer......'
+ % self.conf.installer.type)
+ return self.key_file
+
+ ssh_key = '{0}/{1}'.format(get_doctor_test_root_dir(), 'instack_key')
+ client.scp(key_path, ssh_key, method='get')
+ user = getpass.getuser()
+ uid = pwd.getpwnam(user).pw_uid
+ gid = grp.getgrnam(user).gr_gid
+ os.chown(ssh_key, uid, gid)
+ os.chmod(ssh_key, stat.S_IREAD)
+ return ssh_key
+
+ def _run_cmd_remote(self, client, command):
+ self.log.info('Run command=%s in %s installer......'
+ % (command, self.conf.installer.type))
+
+ ret, output = client.ssh(command)
+ if ret:
+ raise Exception('Exec command in %s installer failed,'
+ 'ret=%s, output=%s'
+ % (self.conf.installer.type,
+ ret, output))
+ self.log.info('Output=%s command=%s in %s installer'
+ % (output, command, self.conf.installer.type))
+ return output
+
+ def _run_apply_patches(self, client, restart_cmd, script_name):
+ installer_dir = os.path.dirname(os.path.realpath(__file__))
+ script_abs_path = '{0}/{1}/{2}'.format(installer_dir,
+ 'common', script_name)
+
+ client.scp(script_abs_path, script_name)
+ cmd = 'sudo python %s' % script_name
+ ret, output = client.ssh(cmd)
+ if ret:
+ raise Exception('Do the command in controller'
+ ' node failed, ret=%s, cmd=%s, output=%s'
+ % (ret, cmd, output))
+ client.ssh(restart_cmd)
diff --git a/doctor_tests/installer/daisy.py b/doctor_tests/installer/daisy.py
index d8b6d86..52ccb7c 100644
--- a/doctor_tests/installer/daisy.py
+++ b/doctor_tests/installer/daisy.py
@@ -6,14 +6,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import getpass
-import grp
-import os
-import pwd
-import stat
-import subprocess
-
-from doctor_tests.common.utils import get_doctor_test_root_dir
from doctor_tests.common.utils import SSHClient
from doctor_tests.installer.base import BaseInstaller
@@ -28,14 +20,12 @@ class DaisyInstaller(BaseInstaller):
password='r00tme')
self.key_file = None
self.controllers = list()
- self.servers = list()
- self.test_dir = get_doctor_test_root_dir()
def setup(self):
self.log.info('Setup Daisy installer start......')
- self.get_ssh_key_from_installer()
- self.get_controller_ips()
+ self.key_file = self.get_ssh_key_from_installer()
+ self.controllers = self.get_controller_ips()
self.create_flavor()
self.setup_stunnel()
@@ -44,38 +34,21 @@ class DaisyInstaller(BaseInstaller):
server.terminate()
def get_ssh_key_from_installer(self):
- self.log.info('Get SSH keys from Daisy installer......')
-
- if self.key_file is not None:
- self.log.info('Already have SSH keys from Daisy installer......')
- return self.key_file
-
- ssh_key = '{0}/{1}'.format(self.test_dir, 'instack_key')
- self.client.scp('/root/.ssh/id_dsa', ssh_key, method='get')
- user = getpass.getuser()
- uid = pwd.getpwnam(user).pw_uid
- gid = grp.getgrnam(user).gr_gid
- os.chown(ssh_key, uid, gid)
- os.chmod(ssh_key, stat.S_IREAD)
- self.key_file = ssh_key
- return self.key_file
+ key_path = '/root/.ssh/id_dsa'
+ return self._get_ssh_key(self.client, key_path)
def get_controller_ips(self):
self.log.info('Get controller ips from Daisy installer......')
command = "source daisyrc_admin; " \
"daisy host-list | grep 'CONTROLLER_LB' | cut -d '|' -f 3 "
- ret, controllers = self.client.ssh(command)
- if ret:
- raise Exception('Exec command to get controller ips'
- 'in Daisy installer failed'
- 'ret=%s, output=%s' % (ret, controllers))
- controller_ips = []
- for controller in controllers:
- controller_ips.append(self.get_host_ip_from_hostname(controller))
+ controller_names = self._run_cmd_remote(self.client, command)
+ controllers = \
+ [self.get_host_ip_from_hostname(controller)
+ for controller in controller_names]
self.log.info('Get controller_ips:%s from Daisy installer'
- % controller_ips)
- self.controllers = controller_ips
+ % controllers)
+ return controllers
def get_host_ip_from_hostname(self, hostname):
self.log.info('Get host ip from host name......')
@@ -85,18 +58,3 @@ class DaisyInstaller(BaseInstaller):
self.log.info('Get host_ip:%s from host_name:%s'
% (host_ip, hostname))
return host_ip
-
- def setup_stunnel(self):
- self.log.info('Setup ssh stunnel in controller nodes'
- 'in Daisy installer......')
- for node_ip in self.controllers:
- cmd = ("ssh -o UserKnownHostsFile=/dev/null"
- " -o StrictHostKeyChecking=no"
- " -i %s %s@%s -R %s:localhost:%s"
- " sleep 600 > ssh_tunnel.%s 2>&1 < /dev/null &"
- % (self.key_file, self.node_user_name,
- node_ip, self.conf.consumer.port,
- self.conf.consumer.port, node_ip))
- server = subprocess.Popen(cmd, shell=True)
- self.servers.append(server)
- server.communicate()
diff --git a/doctor_tests/installer/mcp.py b/doctor_tests/installer/mcp.py
new file mode 100644
index 0000000..8ba9f00
--- /dev/null
+++ b/doctor_tests/installer/mcp.py
@@ -0,0 +1,89 @@
+##############################################################################
+# Copyright (c) 2018 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+from os.path import isfile
+
+from doctor_tests.common.utils import SSHClient
+from doctor_tests.installer.base import BaseInstaller
+
+
+class McpInstaller(BaseInstaller):
+ node_user_name = 'ubuntu'
+ cm_set_script = 'set_ceilometer.py'
+ cm_restore_script = 'restore_ceilometer.py'
+
+ def __init__(self, conf, log):
+ super(McpInstaller, self).__init__(conf, log)
+ self.key_file = self.get_ssh_key_from_installer()
+ self.client = SSHClient(self.conf.installer.ip,
+ self.node_user_name,
+ key_filename=self.key_file)
+ self.controllers = list()
+ self.controller_clients = list()
+
+ def setup(self):
+ self.log.info('Setup MCP installer start......')
+
+ self.controllers = self.get_controller_ips()
+ self.create_flavor()
+ self.set_apply_patches()
+ self.setup_stunnel()
+
+ def cleanup(self):
+ self.restore_apply_patches()
+ for server in self.servers:
+ server.terminate()
+
+ def get_ssh_key_from_installer(self):
+ self.log.info('Get SSH keys from MCP......')
+
+ # Assuming mcp.rsa is already mapped to functest container
+ # if not, only the test runs on jumphost can get the ssh_key
+ # default in path /var/lib/opnfv/mcp.rsa
+ ssh_key = '/root/.ssh/id_rsa'
+ mcp_key = '/var/lib/opnfv/mcp.rsa'
+ return ssh_key if isfile(ssh_key) else mcp_key
+
+ def get_controller_ips(self):
+ self.log.info('Get controller ips from Mcp installer......')
+
+ command = "sudo salt --out yaml 'ctl*' " \
+ "pillar.get _param:openstack_control_address |" \
+ "awk '{print $2}'"
+ controllers = self._run_cmd_remote(self.client, command)
+ self.log.info('Get controller_ips:%s from Mcp installer'
+ % controllers)
+ return controllers
+
+ def get_host_ip_from_hostname(self, hostname):
+ command = "sudo salt --out yaml '%s*' " \
+ "pillar.get _param:single_address |" \
+ "awk '{print $2}'" % hostname
+ host_ips = self._run_cmd_remote(self.client, command)
+ return host_ips[0]
+
+ def set_apply_patches(self):
+ self.log.info('Set apply patches start......')
+
+ restart_cm_cmd = 'sudo service ceilometer-agent-notification restart'
+ for node_ip in self.controllers:
+ client = SSHClient(node_ip, self.node_user_name,
+ key_filename=self.key_file)
+ self.controller_clients.append(client)
+ self._run_apply_patches(client,
+ restart_cm_cmd,
+ self.cm_set_script)
+
+ def restore_apply_patches(self):
+ self.log.info('restore apply patches start......')
+
+ restart_cm_cmd = 'sudo service ceilometer-agent-notification restart'
+ for client in self.controller_clients:
+ self._run_apply_patches(client,
+ restart_cm_cmd,
+ self.cm_restore_script)