From 35e9338672f614fec0ee4c14c6cfa831e039a774 Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Mon, 4 Feb 2019 17:10:16 +0200 Subject: [PATCH] Align default integration config values with code Let's make default config as an example and keep it in consistency with a code. Change-Id: I869c31d617e4a3e5be5d69714e59770c38458d33 --- .../test/integration_tests/config.py | 14 ++++++-------- .../test/integration_tests/horizon.conf | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/openstack_dashboard/test/integration_tests/config.py b/openstack_dashboard/test/integration_tests/config.py index 3ca119b851..b2f402e4f6 100644 --- a/openstack_dashboard/test/integration_tests/config.py +++ b/openstack_dashboard/test/integration_tests/config.py @@ -17,7 +17,7 @@ from oslo_config import cfg DashboardGroup = [ cfg.StrOpt('dashboard_url', - default='http://localhost/', + default='http://localhost/dashboard/', help="Where the dashboard can be found"), cfg.StrOpt('help_url', default='https://docs.openstack.org/', @@ -61,16 +61,14 @@ IdentityGroup = [ ImageGroup = [ cfg.StrOpt('panel_type', - default='legacy', + default='angular', help='type/version of images panel'), cfg.StrOpt('http_image', default='http://download.cirros-cloud.net/0.3.1/' 'cirros-0.3.1-x86_64-uec.tar.gz', help='http accessible image'), cfg.ListOpt('images_list', - default=['cirros-0.3.4-x86_64-uec', - 'cirros-0.3.4-x86_64-uec-kernel', - 'cirros-0.3.4-x86_64-uec-ramdisk'], + default=['cirros-0.3.5-x86_64-disk'], help='default list of images') ] @@ -90,10 +88,10 @@ SeleniumGroup = [ default=10, help="Implicit wait timeout in seconds"), cfg.IntOpt('explicit_wait', - default=300, + default=90, help="Explicit wait timeout in seconds"), cfg.IntOpt('page_timeout', - default=30, + default=60, help="Page load timeout in seconds"), cfg.StrOpt('screenshots_directory', default="integration_tests_screenshots", @@ -120,7 +118,7 @@ InstancesGroup = [ default='nova', help="Zone to be selected for launch Instances"), cfg.StrOpt('image_name', - default='cirros-0.3.4-x86_64-uec (24.0 MB)', + default='cirros-0.3.5-x86_64-disk (12.7 MB)', help="Boot Source to be selected for launch Instances"), cfg.StrOpt('flavor', default='m1.tiny', diff --git a/openstack_dashboard/test/integration_tests/horizon.conf b/openstack_dashboard/test/integration_tests/horizon.conf index c55a17a669..f4c9beb94b 100644 --- a/openstack_dashboard/test/integration_tests/horizon.conf +++ b/openstack_dashboard/test/integration_tests/horizon.conf @@ -70,7 +70,7 @@ default_keystone_admin_role=admin [network] # The cidr block to allocate tenant ipv4 subnets from (string value) -tenant_network_cidr=10.100.0.0/16 +network_cidr=10.100.0.0/16 [service_available] # Whether is Neutron expected to be available (boolean value)