fix the integration test for ubuntu

- adapt parameters to python-openstackclient
- adapt options of libvirtd to work with Xenial
- create subnet
- add temprary fix for oslo.privsep caused by outdated ubuntu sources
- added temporary workover for ossdk bug
- grab the log output of mysql-default folder
- add empty bindep.txt to avoid installing unneeded fallback packages

Depends-On: I0431f09c5898bc2a42b17d27b60592ed5d2a4353
Depends-On: I29fd680ca4b16160a015fbf809cdd81860df9eeb

Change-Id: Ie867e9438bf24accfe466c117a8e02ffc9b1352c
This commit is contained in:
mbuege 2016-12-12 20:03:38 +01:00 committed by Christoph Albers
parent 5193488569
commit 6162b549cc
2 changed files with 15 additions and 6 deletions

View File

@ -155,15 +155,15 @@ end
# Helper for setting up basic nova tests
def _run_nova_tests(pass) # rubocop:disable Metrics/MethodLength
_run_commands('cinder storage volume create', {
'openstack' => ['volume list', "volume create --description test_volume_#{pass} 1"],
'openstack' => ['volume list', "volume create --description test_volume_#{pass} --size 1 test_volume_#{pass}"],
'sleep' => ['10'] }
)
_run_commands('cinder storate volume query', {
_run_commands('cinder storage volume query', {
'openstack' => ['volume list'] }
)
uuid = `sudo bash -c ". /root/openrc && openstack volume list | grep test_volume_#{pass} | cut -d ' ' -f 2"`
uuid = `sudo bash -c ". /root/openrc && openstack volume show --format yaml test_volume_#{pass} | grep "^id:" | cut -d ':' -f 2"`
_run_commands('nova server create', {
'openstack' => ['server list', "server create --image cirros --flavor 1 --block-device-mapping vdb=#{uuid.chomp!}:::1 test"],
'openstack' => ['server list', "server create --image cirros --flavor m1.nano --block-device-mapping vdb=#{uuid.strip}:::1 test"],
'sleep' => ['40'] }
)
_run_commands('nova server cleanup', {
@ -176,9 +176,18 @@ def _run_nova_tests(pass) # rubocop:disable Metrics/MethodLength
end
# Helper for setting up neutron local network
# due to https://bugs.launchpad.net/nova/+bug/1616240
# we temporarily need to install/update oslo-privsep explicitly for ubuntu
def _setup_local_network # rubocop:disable Metrics/MethodLength
case @platform
when 'ubuntu16'
_run_commands('install oslo.privsep for ubuntu', {
'sudo pip' => ['install oslo-privsep'],
'sudo systemctl' => ['restart neutron-*', 'restart nova-*']},
)
end
_run_commands('neutron local network setup', {
'openstack' => ['network create --share local_net'] }
'openstack' => ['network create --share local_net', 'subnet create --network local_net --subnet-range 192.168.180.0/24 local_subnet'] }
)
end
@ -190,7 +199,7 @@ end
def _save_logs(prefix, log_dir)
sh %(sleep 25)
%w(nova neutron keystone cinder glance heat apache2 rabbitmq mysql openvswitch mariadb ceilometer).each do |project|
%w(nova neutron keystone cinder glance heat apache2 rabbitmq mysql-default openvswitch mariadb ceilometer).each do |project|
sh %(mkdir -p #{log_dir}/#{prefix}/#{project})
sh %(sudo cp -rL /etc/#{project} #{log_dir}/#{prefix}/#{project}/etc || true)
sh %(sudo cp -rL /var/log/#{project} #{log_dir}/#{prefix}/#{project}/log || true)

0
bindep.txt Normal file
View File