da17f00f2f
In some scenario tests there is need to use advanced image,
like Ubuntu or Centos, because Cirros doesn't provide required
features.
It is like that in some tests from modules:
neutron_tempest_plugin.scenario.test_mtu
neutron_tempest_plugin.scenario.test_trunk
But such advanced image needs much more time to boot and to
have SSH to vm available.
There is no need to use such advanced image in all tests.
This patch makes some changes in tempest plugin config options:
* image_is_advanced - option is removed,
* advanced_image_ref - new option added - it's uuid for advanced image,
* advanced_flavor_ref - new option added - id of flavor to use with
advanced image
* advanced_image_ssh_user - new option added - name of user to use
to ssh to vm booted from advanced image,
This patch also modify neutron_tempest_plugin devstack plugin that
it now can find advanced image id in installed Glance service and
configure those new config options in Tempest's config file.
This patch also modifies scenario jobs definitions that this
new advanced_image can be configured and used when it's nesessary.
Finally this patch also changes tests mentioned above that now
this advanced image is used in those tests.
All other scenario tests should works with default, Cirros image.
Change-Id: If1b83fbaf33cc01473badeb5cabc8e8670d51d9e
117 lines
5.0 KiB
Python
117 lines
5.0 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo_config import cfg
|
|
from tempest import config
|
|
|
|
|
|
CONF = config.CONF
|
|
|
|
|
|
NeutronPluginOptions = [
|
|
cfg.ListOpt('provider_vlans',
|
|
default=[],
|
|
help='List of provider networks available in the deployment.'),
|
|
cfg.BoolOpt('specify_floating_ip_address_available',
|
|
default=True,
|
|
help='Allow passing an IP Address of the floating ip when '
|
|
'creating the floating ip'),
|
|
cfg.ListOpt('available_type_drivers',
|
|
default=[],
|
|
help='List of network types available to neutron, '
|
|
'e.g. vxlan,vlan,gre.'),
|
|
cfg.StrOpt('agent_availability_zone',
|
|
help='The availability zone for all agents in the deployment. '
|
|
'Configure this only when the single value is used by '
|
|
'all agents in the deployment.'),
|
|
cfg.IntOpt('max_networks_per_project',
|
|
default=4,
|
|
help='Max number of networks per project. '
|
|
'Configure this only when project is limited with real '
|
|
'vlans in deployment.'),
|
|
cfg.StrOpt('l3_agent_mode',
|
|
help='The agent mode for L3 agents in the deployment. '
|
|
'Configure this only when the single value is used by '
|
|
'all agents in the deployment.'),
|
|
cfg.StrOpt('test_mtu_networks',
|
|
default='[{"provider:network_type":"vxlan",'
|
|
'"mtu":1200, "cidr":"10.100.0.0/16"}'
|
|
','
|
|
'{"provider:network_type":"vxlan",'
|
|
'"mtu":1300, "cidr":"10.200.0.0/16"}]',
|
|
help='Configuration for test networks. The format is JSON. '
|
|
'"provider:network_type":<TYPE> - string '
|
|
'"mtu":<MTU> - integer '
|
|
'"cidr"<SUBNET/MASK> - string '
|
|
'"provider:segmentation_id":<VLAN_ID> - integer'),
|
|
|
|
# Option for feature to connect via SSH to VMs using an intermediate SSH
|
|
# server
|
|
cfg.StrOpt('ssh_proxy_jump_host',
|
|
default=None,
|
|
help='Proxy jump host used to connect via SSH to VMs..'),
|
|
cfg.StrOpt('ssh_proxy_jump_username',
|
|
default='root',
|
|
help='User name used to connect to "ssh_proxy_jump_host".'),
|
|
cfg.StrOpt('ssh_proxy_jump_password',
|
|
default=None,
|
|
help='Password used to connect to "ssh_proxy_jump_host".'),
|
|
cfg.StrOpt('ssh_proxy_jump_keyfile',
|
|
default=None,
|
|
help='Keyfile used to connect to "ssh_proxy_jump_host".'),
|
|
cfg.IntOpt('ssh_proxy_jump_port',
|
|
default=22,
|
|
help='Port used to connect to "ssh_proxy_jump_host".'),
|
|
|
|
# Options for special, "advanced" image like e.g. Ubuntu. Such image can be
|
|
# used in tests which require some more advanced tool than available in
|
|
# Cirros
|
|
cfg.StrOpt('advanced_image_ref',
|
|
default=None,
|
|
help='Valid advanced image uuid to be used in tests. '
|
|
'It is an image that supports features that Cirros '
|
|
'does not, like Ubuntu or CentOS supporting advanced '
|
|
'features.'),
|
|
cfg.StrOpt('advanced_image_flavor_ref',
|
|
default=None,
|
|
help='Valid flavor to use with advanced image in tests. '
|
|
'This is required if advanced image has to be used in '
|
|
'tests.'),
|
|
cfg.StrOpt('advanced_image_ssh_user',
|
|
default=None,
|
|
help='Name of ssh user to use with advanced image in tests. '
|
|
'This is required if advanced image has to be used in '
|
|
'tests.'),
|
|
]
|
|
|
|
# TODO(amuller): Redo configuration options registration as part of the planned
|
|
# transition to the Tempest plugin architecture
|
|
for opt in NeutronPluginOptions:
|
|
CONF.register_opt(opt, 'neutron_plugin_options')
|
|
|
|
|
|
config_opts_translator = {
|
|
'project_network_cidr': 'tenant_network_cidr',
|
|
'project_network_v6_cidr': 'tenant_network_v6_cidr',
|
|
'project_network_mask_bits': 'tenant_network_mask_bits',
|
|
'project_network_v6_mask_bits': 'tenant_network_v6_mask_bits'}
|
|
|
|
|
|
def safe_get_config_value(group, name):
|
|
"""Safely get Oslo config opts from Tempest, using old and new names."""
|
|
conf_group = getattr(CONF, group)
|
|
|
|
try:
|
|
return getattr(conf_group, name)
|
|
except cfg.NoSuchOptError:
|
|
return getattr(conf_group, config_opts_translator[name])
|