fix package path and move files under doctor_tests

Change-Id: Ibde6a36c43064e5fbea1a0b7a9b49349c343e42f
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

7 files changed, 0 insertions, 428 deletions

diff --git a/tests/installer/__init__.py b/tests/installer/__init__.py
deleted file mode 100644
index bb0e452d..00000000
--- a/tests/installer/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-import os
-
-from oslo_config import cfg
-from oslo_utils import importutils
-
-OPTS = [
-    cfg.StrOpt('type',
-               default=os.environ.get('INSTALLER_TYPE', 'local'),
-               choices=['local', 'apex'],
-               help='the type of installer',
-               required=True),
-    cfg.StrOpt('ip',
-               default=os.environ.get('INSTALLER_IP', '127.0.0.1'),
-               help='the ip of installer'),
-    cfg.StrOpt('username',
-               default='root',
-               help='the user name for login installer server',
-               required=True),
-]
-
-
-_installer_name_class_mapping = {
-    'local': 'installer.local.LocalInstaller',
-    'apex': 'installer.apex.ApexInstaller'
-}
-
-
-def get_installer(conf, log):
-    installer_class = _installer_name_class_mapping[conf.installer.type]
-    return importutils.import_object(installer_class, conf, log)
\ No newline at end of file
diff --git a/tests/installer/apex.py b/tests/installer/apex.py
deleted file mode 100644
index 98eb6c9c..00000000
--- a/tests/installer/apex.py
+++ /dev/null
@@ -1,127 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-import getpass
-import grp
-import os
-import pwd
-import stat
-import subprocess
-import sys
-
-from common.utils import SSHClient
-from installer.base import BaseInstaller
-
-
-class ApexInstaller(BaseInstaller):
-    node_user_name = 'heat-admin'
-    cm_set_script = 'set_ceilometer.py'
-    cm_restore_script = 'restore_ceilometer.py'
-
-    def __init__(self, conf, log):
-        super(ApexInstaller, self).__init__(conf, log)
-        self.client = SSHClient(self.conf.installer.ip,
-                                self.conf.installer.username,
-                                look_for_keys=True)
-        self.key_file = None
-        self.controllers = list()
-        self.controller_clients = list()
-        self.servers = list()
-
-    def setup(self):
-        self.log.info('Setup Apex installer start......')
-
-        self.get_ssh_key_from_installer()
-        self.get_controller_ips()
-        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 Apex installer......')
-
-        if self.key_file is not None:
-            self.log.info('Already have SSH keys from Apex installer......')
-            return self.key_file
-
-        self.client.scp('/home/stack/.ssh/id_rsa', './instack_key', method='get')
-        user = getpass.getuser()
-        uid = pwd.getpwnam(user).pw_uid
-        gid = grp.getgrnam(user).gr_gid
-        os.chown('./instack_key', uid, gid)
-        os.chmod('./instack_key', stat.S_IREAD)
-        current_dir = sys.path[0]
-        self.key_file = '{0}/{1}'.format(current_dir, 'instack_key')
-        return self.key_file
-
-    def get_controller_ips(self):
-        self.log.info('Get controller ips from Apex installer......')
-
-        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))
-        self.log.info('Get controller_ips:%s from Apex installer' % controllers)
-        self.controllers = controllers
-
-    def get_host_ip_from_hostname(self, hostname):
-        self.log.info('Get host ip from host name in Apex installer......')
-
-        hostname_in_undercloud = hostname.split('.')[0]
-
-        command = "source stackrc; nova show %s  | awk '/ ctlplane network /{print $5}'" % (hostname_in_undercloud)
-        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 = "sudo 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 set_apply_patches(self):
-        self.log.info('Set apply patches start......')
-
-        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)
-
-    def restore_apply_patches(self):
-        self.log.info('restore apply patches start......')
-
-        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')
-
diff --git a/tests/installer/base.py b/tests/installer/base.py
deleted file mode 100644
index fa39816a..00000000
--- a/tests/installer/base.py
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-import abc
-import six
-
-@six.add_metaclass(abc.ABCMeta)
-class BaseInstaller(object):
-    def __init__(self, conf, log):
-        self.conf = conf
-        self.log = log
-
-    @abc.abstractproperty
-    def node_user_name(self):
-        """user name for login to cloud node"""
-
-    @abc.abstractmethod
-    def get_ssh_key_from_installer(self):
-        pass
-
-    @abc.abstractmethod
-    def get_host_ip_from_hostname(self, hostname):
-        pass
-
-    @abc.abstractmethod
-    def setup(self):
-        pass
-
-    @abc.abstractmethod
-    def cleanup(self):
-        pass
diff --git a/tests/installer/common/congress.py b/tests/installer/common/congress.py
deleted file mode 100644
index db882de2..00000000
--- a/tests/installer/common/congress.py
+++ /dev/null
@@ -1,47 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-def set_doctor_driver_conf(ssh_client, restart_cmd):
-    cg_set_cmd = '''#!/bin/bash
-co_conf=/etc/congress/congress.conf
-co_conf_bak=/etc/congress/congress.conf.bak
-co_entry="congress.datasources.doctor_driver.DoctorDriver"
-if sudo grep -e "^drivers.*$co_entry" $co_conf; then
-    echo "NOTE: congress is configured as we needed"
-else
-    echo "modify the congress config"
-    sudo cp $co_conf $co_conf_bak
-    sudo sed -i -e "/^drivers/s/$/,$co_entry/"  $co_conf
-    %s
-fi
-    ''' % (restart_cmd)
-
-    ret, output = ssh_client.ssh(cg_set_cmd)
-    if ret:
-        raise Exception('Do the congress command in controller node failed....'
-                        'ret=%s, cmd=%s, output=%s' % (ret, cg_set_cmd, output))
-
-
-def restore_doctor_driver_conf(ssh_client, restart_cmd):
-    cg_restore_cmd = '''#!/bin/bash
-co_conf=/etc/congress/congress.conf
-co_conf_bak=/etc/congress/congress.conf.bak
-if [ -e $co_conf_bak ]; then
-    echo "restore the congress config"
-    sudo cp $co_conf_bak $co_conf
-    sudo rm $co_conf_bak
-    %s
-else
-    echo "Do not need to restore the congress config"
-fi
-    ''' % (restart_cmd)
-
-    ret, output = ssh_client.ssh(cg_restore_cmd)
-    if ret:
-        raise Exception('Do the congress command in controller node failed....'
-                        'ret=%s, cmd=%s, output=%s' % (ret, cg_restore_cmd, output))
diff --git a/tests/installer/common/restore_ceilometer.py b/tests/installer/common/restore_ceilometer.py
deleted file mode 100644
index d25b9ede..00000000
--- a/tests/installer/common/restore_ceilometer.py
+++ /dev/null
@@ -1,27 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-import os
-import shutil
-
-ep_file = '/etc/ceilometer/event_pipeline.yaml'
-ep_file_bak = '/etc/ceilometer/event_pipeline.yaml.bak'
-
-
-def restore_ep_config():
-
-    if not os.path.isfile(ep_file_bak):
-        print('Bak_file:%s does not exist.' % ep_file_bak)
-    else:
-        print('restore')
-        shutil.copyfile(ep_file_bak, ep_file)
-        os.remove(ep_file_bak)
-    return
-
-
-restore_ep_config()
diff --git a/tests/installer/common/set_ceilometer.py b/tests/installer/common/set_ceilometer.py
deleted file mode 100644
index f5946cb2..00000000
--- a/tests/installer/common/set_ceilometer.py
+++ /dev/null
@@ -1,44 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-import os
-import shutil
-import yaml
-
-ep_file = '/etc/ceilometer/event_pipeline.yaml'
-ep_file_bak = '/etc/ceilometer/event_pipeline.yaml.bak'
-event_notifier_topic = 'notifier://?topic=alarm.all'
-
-
-def set_notifier_topic():
-    config_modified = False
-
-    if not os.path.isfile(ep_file):
-        raise Exception("File doesn't exist: %s." % ep_file)
-
-    with open(ep_file, 'r') as file:
-        config = yaml.safe_load(file)
-
-    sinks = config['sinks']
-    for sink in sinks:
-        if sink['name'] == 'event_sink':
-            publishers = sink['publishers']
-            if event_notifier_topic not in publishers:
-                print('Add event notifier in ceilometer')
-                publishers.append(event_notifier_topic)
-                config_modified = True
-            else:
-                print('NOTE: event notifier is configured in ceilometer as we needed')
-
-    if config_modified:
-        shutil.copyfile(ep_file, ep_file_bak)
-        with open(ep_file, 'w+') as file:
-            file.write(yaml.safe_dump(config))
-
-
-set_notifier_topic()
diff --git a/tests/installer/local.py b/tests/installer/local.py
deleted file mode 100644
index dcdf41e3..00000000
--- a/tests/installer/local.py
+++ /dev/null
@@ -1,109 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-import os
-import shutil
-import subprocess
-
-from installer.base import BaseInstaller
-from common.utils import load_json_file
-from common.utils import write_json_file
-
-
-class LocalInstaller(BaseInstaller):
-    node_user_name = 'root'
-
-    nova_policy_file = '/etc/nova/policy.json'
-    nova_policy_file_backup = '%s%s' % (nova_policy_file, '.bak')
-
-    def __init__(self, conf, log):
-        super(LocalInstaller, self).__init__(conf, log)
-        self.policy_modified = False
-        self.add_policy_file = False
-
-    def setup(self):
-        self.get_ssh_key_from_installer()
-        self.set_apply_patches()
-
-    def cleanup(self):
-        self.restore_apply_patches()
-
-    def get_ssh_key_from_installer(self):
-        self.log.info('Assuming SSH keys already exchanged with computer for local installer type')
-        return None
-
-    def get_host_ip_from_hostname(self, hostname):
-        self.log.info('Get host ip from host name in local installer......')
-
-        cmd = "getent hosts %s | awk '{ print $1 }'" % (hostname)
-        server = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
-        stdout, stderr = server.communicate()
-        host_ip = stdout.strip()
-
-        self.log.info('Get host_ip:%s from host_name:%s in local installer' % (host_ip, hostname))
-        return host_ip
-
-    def set_apply_patches(self):
-        self._set_nova_policy()
-
-    def restore_apply_patches(self):
-        self._restore_nova_policy()
-
-    def _set_nova_policy(self):
-        host_status_policy = 'os_compute_api:servers:show:host_status'
-        host_status_rule = 'rule:admin_or_owner'
-        policy_data = {
-            'context_is_admin': 'role:admin',
-            'owner': 'user_id:%(user_id)s',
-            'admin_or_owner': 'rule:context_is_admin or rule:owner',
-            host_status_policy: host_status_rule
-        }
-
-        if os.path.isfile(self.nova_policy_file):
-            data = load_json_file(self.nova_policy_file)
-            if host_status_policy in data:
-                rule_origion = data[host_status_policy]
-                if host_status_rule == rule_origion:
-                    self.log.info('Do not need to modify nova policy.')
-                    self.policy_modified = False
-                else:
-                    # update the host_status_policy
-                    data[host_status_policy] = host_status_rule
-                    self.policy_modified = True
-            else:
-                # add the host_status_policy, if the admin_or_owner is not
-                # defined, add it also
-                for policy, rule in policy_data.items():
-                    if policy not in data:
-                        data[policy] = rule
-                self.policy_modified = True
-            if self.policy_modified:
-                self.log.info('Nova policy is Modified.')
-                shutil.copyfile(self.nova_policy_file,
-                                self.nova_policy_file_backup)
-        else:
-            # file does not exit, create a new one and add the policy
-            self.log.info('Nova policy file not exist. Creating a new one')
-            data = policy_data
-            self.add_policy_file = True
-
-        if self.policy_modified or self.add_policy_file:
-            write_json_file(self.nova_policy_file, data)
-            os.system('screen -S stack -p n-api -X stuff "^C^M^[[A^M"')
-
-    def _restore_nova_policy(self):
-        if self.policy_modified:
-            shutil.copyfile(self.nova_policy_file_backup, self.nova_policy_file)
-            os.remove(self.nova_policy_file_backup)
-        elif self.add_policy_file:
-            os.remove(self.nova_policy_file)
-
-        if self.add_policy_file or self.policy_modified:
-            os.system('screen -S stack -p n-api -X stuff "^C^M^[[A^M"')
-            self.add_policy_file = False
-            self.policy_modified = False