Merge "Add network availability zones client"
diff --git a/.zuul.yaml b/.zuul.yaml
index 3c4221f..bd8619f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,7 @@
tox_envlist: all
devstack_localrc:
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
- NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-mac-address-regenerate,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details
+ NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-mac-address-regenerate,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details
devstack_plugins:
neutron: git://git.openstack.org/openstack/neutron.git
neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
@@ -129,9 +129,11 @@
devstack_localrc:
PHYSICAL_NETWORK: default
DOWNLOAD_DEFAULT_IMAGES: false
- IMAGE_URLS: http://cloud-images.ubuntu.com/releases/16.04/release-20180622/ubuntu-16.04-server-cloudimg-amd64-disk1.img,
- DEFAULT_INSTANCE_TYPE: ds512M
- DEFAULT_INSTANCE_USER: ubuntu
+ IMAGE_URLS: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,http://cloud-images.ubuntu.com/releases/16.04/release-20180622/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
+ DEFAULT_IMAGE_NAME: cirros-0.3.4-i386-disk
+ ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
BUILD_TIMEOUT: 784
devstack_services:
cinder: true
@@ -143,7 +145,7 @@
vars:
devstack_localrc:
Q_AGENT: linuxbridge
- NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-timestamp,standard-attr-tag,subnet_allocation,tag,tag-ext,trunk,trunk-details
+ NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-timestamp,standard-attr-tag,subnet_allocation,tag,tag-ext,trunk,trunk-details
devstack_local_conf:
post-config:
$NEUTRON_CONF:
@@ -182,18 +184,128 @@
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario
- parent: legacy-dsvm-base-multinode
- run: playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml
- post-run: playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml
- nodeset: legacy-ubuntu-xenial-2-node
- timeout: 10800
+ parent: tempest-multinode-full
+ description: |
+ Perform setup for Neutron tempest tests in multinode with DVR scenario
+ roles:
+ - zuul: openstack-dev/devstack
required-projects:
- openstack-infra/devstack-gate
- openstack/neutron
- openstack/neutron-tempest-plugin
- openstack/tempest
- irrelevant-files: *tempest-irrelevant-files
+ pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml
voting: false
+ vars:
+ tempest_concurrency: 4
+ tox_envlist: all
+ tempest_test_regex: ^neutron_tempest_plugin\.scenario
+ devstack_localrc:
+ TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
+ NETWORK_API_EXTENSIONS: "address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details"
+ PHYSICAL_NETWORK: default
+ DOWNLOAD_DEFAULT_IMAGES: false
+ IMAGE_URLS: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,http://cloud-images.ubuntu.com/releases/16.04/release-20180622/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
+ DEFAULT_IMAGE_NAME: cirros-0.3.4-i386-disk
+ ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ BUILD_TIMEOUT: 784
+ devstack_plugins:
+ neutron: git://git.openstack.org/openstack/neutron.git
+ neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
+ devstack_services:
+ tls-proxy: false
+ tempest: true
+ neutron-dns: true
+ neutron-qos: true
+ neutron-segments: true
+ neutron-trunk: true
+ neutron-log: true
+ cinder: true
+ devstack_local_conf:
+ post-config:
+ $NEUTRON_CONF:
+ quotas:
+ quota_router: 100
+ quota_floatingip: 500
+ quota_security_group: 100
+ quota_security_group_rule: 1000
+ DEFAULT:
+ router_distributed: True
+ # NOTE(slaweq): We can get rid of this hardcoded absolute path when
+ # devstack-tempest job will be switched to use lib/neutron instead of
+ # lib/neutron-legacy
+ "/$NEUTRON_CORE_PLUGIN_CONF":
+ ml2:
+ type_drivers: flat,geneve,vlan,gre,local,vxlan
+ mechanism_drivers: openvswitch,l2population
+ ml2_type_vlan:
+ network_vlan_ranges: foo:1:10
+ ml2_type_vxlan:
+ vni_ranges: 1:2000
+ ml2_type_gre:
+ tunnel_id_ranges: 1:1000
+ agent:
+ enable_distributed_routing: True
+ l2_population: True
+ tunnel_types: vxlan,gre
+ ovs:
+ tunnel_bridge: br-tun
+ bridge_mappings: public:br-ex
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ agent_mode: dvr_snat
+ agent:
+ availability_zone: nova
+ $NEUTRON_DHCP_CONF:
+ agent:
+ availability_zone: nova
+ "/etc/neutron/api-paste.ini":
+ "composite:neutronapi_v2_0":
+ use: "call:neutron.auth:pipeline_factory"
+ noauth: "cors request_id catch_errors osprofiler extensions neutronapiapp_v2_0"
+ keystone: "cors request_id catch_errors osprofiler authtoken keystonecontext extensions neutronapiapp_v2_0"
+ test-config:
+ $TEMPEST_CONFIG:
+ neutron_plugin_options:
+ provider_vlans: foo,
+ agent_availability_zone: nova
+ image_is_advanced: true
+ available_type_drivers: flat,geneve,vlan,gre,local,vxlan
+ l3_agent_mode: dvr_snat
+ group-vars:
+ subnode:
+ devstack_services:
+ tls-proxy: false
+ q-agt: true
+ q-l3: true
+ q-meta: true
+ neutron-qos: true
+ neutron-trunk: true
+ neutron-log: true
+ devstack_local_conf:
+ post-config:
+ $NEUTRON_CONF:
+ DEFAULT:
+ router_distributed: True
+ # NOTE(slaweq): We can get rid of this hardcoded absolute path when
+ # devstack-tempest job will be switched to use lib/neutron instead of
+ # lib/neutron-legacy
+ "/$NEUTRON_CORE_PLUGIN_CONF":
+ agent:
+ enable_distributed_routing: True
+ l2_population: True
+ tunnel_types: vxlan,gre
+ ovs:
+ tunnel_bridge: br-tun
+ bridge_mappings: public:br-ex
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ agent_mode: dvr_snat
+ agent:
+ availability_zone: nova
+ irrelevant-files: *tempest-irrelevant-files
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario-queens
@@ -222,6 +334,11 @@
devstack_localrc:
TEMPEST_PLUGINS: '"/opt/stack/designate-tempest-plugin /opt/stack/neutron-tempest-plugin"'
DESIGNATE_BACKEND_DRIVER: bind9
+ DOWNLOAD_DEFAULT_IMAGES: false
+ IMAGE_URLS: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,
+ # In this job advanced image is not needed, so it's name should be
+ # empty
+ ADVANCED_IMAGE_NAME: ""
devstack_plugins:
designate: git://git.openstack.org/openstack/designate.git
devstack_services:
diff --git a/devstack/customize_image.sh b/devstack/customize_image.sh
new file mode 100644
index 0000000..669c761
--- /dev/null
+++ b/devstack/customize_image.sh
@@ -0,0 +1,158 @@
+# This script include functions that allow guest image files customization
+# before uploading them to OpenStack image service
+
+# ensure we don't re-source this in the same environment
+[[ -z "$_NEUTRON_TEMPEST_PLUGIN_CUSTOMIZE_IMAGE" ]] || return 0
+declare -r -g _NEUTRON_TEMPEST_PLUGIN_CUSTOMIZE_IMAGE=1
+
+source "${NEUTRON_TEMPEST_PLUGIN_DIR}/functions.sh"
+
+# By default enable guest image customization. It will be automatically skipped
+# for cirros images
+CUSTOMIZE_IMAGE=${CUSTOMIZE_IMAGE:-True}
+
+# Image customization is performed using virt-customize
+# using direct backend by default
+LIBGUESTFS_BACKEND=${LIBGUESTFS_BACKEND:-direct}
+
+# Disable KVM hardware accelleration by default
+LIBGUESTFS_BACKEND_SETTINGS=${LIBGUESTFS_BACKEND_SETTINGS:-force_tcg}
+
+# Install tools required for customizing guest image files
+function install_customize_image_tools {
+ local do_customize=$(trueorfalse True CUSTOMIZE_IMAGE)
+ if [ ${do_customize} == True ]; then
+ # Make sure virt-customize is installed
+ install_package libguestfs-tools
+ fi
+}
+
+# Wraps upload_image function to eventually customize image file before
+# uploading it via "openstack image create" command
+save_function upload_image overridden_upload_image
+function upload_image {
+ local image_url=$1
+
+ # Fork a subshell to have environment restored at the end of this function
+ (
+ # Check user configuration
+ local customize_image=$(trueorfalse True CUSTOMIZE_IMAGE)
+ if [ ${customize_image} == True ]; then
+ # Temporarly wraps openstack command with openstack_image_create
+ # function
+ function openstack {
+ IMAGE_URL=${image_url} upload_custom_image "$@"
+ }
+ fi
+
+ # Execute original upload_image function
+ overridden_upload_image "$@"
+ )
+}
+
+# Wraps "openstack image create" command to customize image file before
+# uploading it to OpenstackImage service.
+# Called only when ${CUSTOMIZE_IMAGE} is True
+function upload_custom_image {
+ # Copy command arguments for later use
+ local args=( "$@" )
+
+ # Look for image create sub-command:
+ # skip any argument before "image" and "create" words
+ local i=0
+ local subcommands=()
+ for subcommand in image create; do
+ for (( ; i < ${#args[@]}; )) {
+ local arg=${args[i]}
+ (( ++i ))
+ if [ "${arg}" == "${subcommand}" ]; then
+ subcommands+=( "${arg}" )
+ break
+ fi
+ }
+ done
+
+ if [ "${subcommands[*]}" == "image create" ]; then
+ # create image subcommand has been detected
+
+ # Put here temporary files to be delete before exiting from this
+ # function
+ local temp_dir=$(mktemp -d)
+ chmod 777 "${temp_dir}"
+
+ # Parse openstack image create subcommand arguments
+ local image_url="${IMAGE_URL}"
+ local image_file=
+ local disk_format=auto
+ local container_format=bare
+
+ for (( ; i < ${#args[@]}; )) {
+ local arg=${args[$i]}
+ (( ++i ))
+
+ if [[ "${arg}" == --* ]]; then
+ # Handle --<option_name>=<option_value> syntax
+ local option_fields=(${arg//=/ })
+ local option_name=${option_fields[0]}
+ local option_value=${option_fields[1]:-}
+
+ case "${option_name}" in
+
+ --container-format) # Found container format
+ container_format=${option_value:-${args[ (( i++ )) ]}}
+ ;;
+
+ --disk-format) # Found disk format
+ disk_format=${option_value:-${args[ (( i++ )) ]}}
+ ;;
+
+ --file) # Found image file name
+ image_file=${option_value:-${args[ (( i++ )) ]}}
+ ;;
+ esac
+ fi
+ }
+
+ if [ "${image_file}" == "" ]; then
+ # Copy image file from stdin to a temporary file
+ image_file=${temp_dir}/$(basename "${image_url}")
+ cat > "${image_file}"
+
+ # Add option to load image from file
+ args+=( --file "${image_file}" )
+ fi
+
+ # Make image file readable and writable by qemu user
+ sudo chmod 666 "${image_file}"
+
+ # Customize image file
+ TEMP_DIR=${temp_dir} \
+ DISK_FORMAT=${disk_format} \
+ customize_image "${image_file}"
+ fi
+
+ # Upload custom image file
+ overridden_openstack "${args[@]}" || local error=$?
+
+ # Finally delete temporary files
+ sudo rm -fR "${temp_dir}" || true
+
+ return ${error:-0}
+}
+
+function overridden_openstack {
+ "$(which openstack)" "$@"
+}
+
+# Execute customization commands on a VM with attached guest image file.
+# Called only when ${CUSTOMIZE_IMAGE} is True
+function customize_image {
+ local image_file=$1
+ local top_dir=$(dirname "${NEUTRON_TEMPEST_PLUGIN_DIR}")
+ (
+ export TEMP_DIR DISK_FORMAT RC_DIR
+ if [[ "$(basename ${image_file})" == ubuntu-* ]]; then
+ "${top_dir}/tools/customize_ubuntu_image" "${image_file}"
+ fi
+ )
+}
diff --git a/devstack/functions.sh b/devstack/functions.sh
new file mode 100644
index 0000000..8d8a4bf
--- /dev/null
+++ b/devstack/functions.sh
@@ -0,0 +1,87 @@
+# Generic use functions
+
+# ensure we don't re-source this in the same environment
+[[ -z "$_NEUTRON_TEMPEST_PLUGIN_FUNCTIONS" ]] || return 0
+declare -r -g _NEUTRON_TEMPEST_PLUGIN_FUNCTIONS=1
+
+# Create a function copying the code from an existing one
+function save_function {
+ local old_name=$1
+ local new_name=$2
+
+ # Saving the same function again after redefining it could produce a
+ # recorsive function in case for example this plugin is sourced twice
+ if type -t "${new_name}"; then
+ # Prevent copying the same function twice
+ return 0
+ fi
+
+ # Save xtrace setting
+ _XTRACE_FUNCTIONS=$(set +o | grep xtrace)
+ set +o xtrace
+
+ # Get code of the original function
+ local old_code=$(declare -f ${old_name})
+ # Produce code for the new function
+ local new_code="${new_name}${old_code#${old_name}}"
+ # Define the new function
+ eval "${new_code}"
+
+ # Restore xtrace
+ $_XTRACE_FUNCTIONS
+}
+
+#Add advanced image config to tempest.conf
+function configure_advanced_image {
+ local advanced_image_uuid
+
+ if ! is_service_enabled glance; then
+ # if glance is not enabled, there is no image for to configure
+ return 0
+ fi
+
+ if [[ -z "$ADVANCED_IMAGE_NAME" ]]; then
+ # if name of advanced image is not provided, there is no image to
+ # configure
+ return 0
+ fi
+
+ while read -r IMAGE_NAME IMAGE_UUID; do
+ if [ "$IMAGE_NAME" = "$ADVANCED_IMAGE_NAME" ]; then
+ advanced_image_uuid="$IMAGE_UUID"
+ break
+ fi
+ done < <(openstack image list --property status=active | awk -F'|' '!/^(+--)|ID|aki|ari/ { print $3,$2 }')
+
+ if [[ -z "$advanced_image_uuid" ]]; then
+ echo "No image with name $ADVANCED_IMAGE_NAME found."
+ return 1
+ fi
+
+ iniset $TEMPEST_CONFIG neutron_plugin_options advanced_image_ref $advanced_image_uuid
+ iniset $TEMPEST_CONFIG neutron_plugin_options advanced_image_ssh_user $ADVANCED_INSTANCE_USER
+}
+
+
+function configure_flavor_for_advanced_image {
+ local flavor_ref
+
+ if ! is_service_enabled nova; then
+ # if nova is not enabled, there is no flavor to configure
+ return 0
+ fi
+
+ if [[ -z "$ADVANCED_INSTANCE_TYPE" ]]; then
+ # if name of flavor for advanced image is not provided, there is no
+ # flavor to configure
+ return 0
+ fi
+
+ flavor_ref=$(openstack flavor show $ADVANCED_INSTANCE_TYPE -f value -c id)
+ if [[ -z "$flavor_ref" ]]; then
+ echo "Found no valid flavors to use for $ADVANCED_IMAGE_NAME !"
+ echo "Fallback to use $DEFAULT_INSTANCE_TYPE"
+ flavor_ref=$(iniget $TEMPEST_CONFIG compute flavor_ref)
+ fi
+ iniset $TEMPEST_CONFIG neutron_plugin_options advanced_image_flavor_ref $flavor_ref
+}
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a2009ea..25cfba6 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -1,6 +1,12 @@
+# Directory where this plugin.sh file is
+NEUTRON_TEMPEST_PLUGIN_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+source "${NEUTRON_TEMPEST_PLUGIN_DIR}/customize_image.sh"
+
# install_neutron_tempest_plugin
function install_neutron_tempest_plugin {
setup_dev_lib "neutron-tempest-plugin"
+ install_customize_image_tools
}
if [[ "$1" == "stack" ]]; then
@@ -9,5 +15,9 @@
echo_summary "Installing neutron-tempest-plugin"
install_neutron_tempest_plugin
;;
+ test-config)
+ echo_summary "Configuring neutron-tempest-plugin tempest options"
+ configure_advanced_image
+ configure_flavor_for_advanced_image
esac
fi
diff --git a/devstack/settings b/devstack/settings
index 614376f..6804a47 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,3 +1,7 @@
GITREPO["neutron-tempest-plugin"]=${NEUTRON_TEMPEST_REPO:-${GIT_BASE}/openstack/neutron-tempest-plugin.git}
GITDIR["neutron-tempest-plugin"]=$DEST/neutron-tempest-plugin
GITBRANCH["neutron-tempest-plugin"]=master
+
+ADVANCED_IMAGE_NAME=${ADVANCED_IMAGE_NAME:-""}
+ADVANCED_INSTANCE_TYPE=${ADVANCED_INSTANCE_TYPE:-$DEFAULT_INSTANCE_TYPE}
+ADVANCED_INSTANCE_USER=${ADVANCED_INSTANCE_USER:-$DEFAULT_INSTANCE_USER}
diff --git a/neutron_tempest_plugin/api/admin/test_agent_availability_zone.py b/neutron_tempest_plugin/api/admin/test_agent_availability_zone.py
index 245715f..c69c63d 100644
--- a/neutron_tempest_plugin/api/admin/test_agent_availability_zone.py
+++ b/neutron_tempest_plugin/api/admin/test_agent_availability_zone.py
@@ -40,9 +40,10 @@
@testtools.skipUnless(CONF.neutron_plugin_options.agent_availability_zone,
"Need a single availability_zone assumption.")
def test_agents_availability_zone(self):
- """
- Test list agents availability_zone, only L3 and DHCP agent support
- availability_zone, default availability_zone is "nova".
+ """Test list agents availability_zone
+
+ Only L3 and DHCP agent support availability_zone, default
+ availability_zone is "nova".
"""
body = self.admin_client.list_agents()
agents = body['agents']
diff --git a/neutron_tempest_plugin/api/admin/test_agent_management.py b/neutron_tempest_plugin/api/admin/test_agent_management.py
index 72cba62..ad0368a 100644
--- a/neutron_tempest_plugin/api/admin/test_agent_management.py
+++ b/neutron_tempest_plugin/api/admin/test_agent_management.py
@@ -81,9 +81,7 @@
self.assertEqual(updated_description, description)
def _restore_agent(self, dyn_agent):
- """
- Restore the agent description after update test.
- """
+ """Restore the agent description after update test."""
description = dyn_agent['description']
origin_agent = {'description': description}
self.admin_client.update_agent(agent_id=dyn_agent['id'],
diff --git a/neutron_tempest_plugin/api/admin/test_external_network_extension.py b/neutron_tempest_plugin/api/admin/test_external_network_extension.py
index cd4635c..a713492 100644
--- a/neutron_tempest_plugin/api/admin/test_external_network_extension.py
+++ b/neutron_tempest_plugin/api/admin/test_external_network_extension.py
@@ -162,14 +162,12 @@
target_tenant=self.admin_client.tenant_id)
self.create_subnet(net, client=self.admin_client, enable_dhcp=False)
with testtools.ExpectedException(lib_exc.NotFound):
- self.client2.create_floatingip(
- floating_network_id=net['id'])
+ self.create_floatingip(net['id'], client=self.client2)
self.admin_client.create_rbac_policy(
object_type='network', object_id=net['id'],
action='access_as_external',
target_tenant=self.client2.tenant_id)
- self.client2.create_floatingip(
- floating_network_id=net['id'])
+ self.create_floatingip(net['id'], client=self.client2)
@decorators.idempotent_id('476be1e0-f72e-47dc-9a14-4435926bbe82')
def test_policy_allows_tenant_to_attach_ext_gw(self):
diff --git a/neutron_tempest_plugin/api/admin/test_floating_ips_admin_actions.py b/neutron_tempest_plugin/api/admin/test_floating_ips_admin_actions.py
index 3607060..1efe516 100644
--- a/neutron_tempest_plugin/api/admin/test_floating_ips_admin_actions.py
+++ b/neutron_tempest_plugin/api/admin/test_floating_ips_admin_actions.py
@@ -32,7 +32,7 @@
def resource_setup(cls):
super(FloatingIPAdminTestJSON, cls).resource_setup()
cls.ext_net_id = CONF.network.public_network_id
- cls.floating_ip = cls.create_floatingip(cls.ext_net_id)
+ cls.floating_ip = cls.create_floatingip()
cls.alt_client = cls.os_alt.network_client
cls.network = cls.create_network()
cls.subnet = cls.create_subnet(cls.network)
@@ -44,10 +44,7 @@
@decorators.attr(type='negative')
@decorators.idempotent_id('11116ee9-4e99-5b15-b8e1-aa7df92ca589')
def test_associate_floating_ip_with_port_from_another_project(self):
- body = self.client.create_floatingip(
- floating_network_id=self.ext_net_id)
- floating_ip = body['floatingip']
- self.addCleanup(self.client.delete_floatingip, floating_ip['id'])
+ floating_ip = self.create_floatingip()
project_id = self.create_project()['id']
port = self.admin_client.create_port(network_id=self.network['id'],
@@ -65,20 +62,17 @@
# other tests may end up stealing the IP before we can use it
# since it's on the external network so we need to retry if it's
# in use.
- for i in range(100):
+ for _ in range(100):
fip = self.get_unused_ip(self.ext_net_id, ip_version=4)
try:
- body = self.admin_client.create_floatingip(
- floating_network_id=self.ext_net_id,
- floating_ip_address=fip)
+ created_floating_ip = self.create_floatingip(
+ floating_ip_address=fip,
+ client=self.admin_client)
break
except lib_exc.Conflict:
pass
else:
self.fail("Could not get an unused IP after 100 attempts")
- created_floating_ip = body['floatingip']
- self.addCleanup(self.admin_client.delete_floatingip,
- created_floating_ip['id'])
self.assertIsNotNone(created_floating_ip['id'])
self.assertIsNotNone(created_floating_ip['tenant_id'])
self.assertEqual(created_floating_ip['floating_ip_address'], fip)
diff --git a/neutron_tempest_plugin/api/admin/test_quotas_negative.py b/neutron_tempest_plugin/api/admin/test_quotas_negative.py
index 7d699d1..cd64e5c 100644
--- a/neutron_tempest_plugin/api/admin/test_quotas_negative.py
+++ b/neutron_tempest_plugin/api/admin/test_quotas_negative.py
@@ -167,11 +167,7 @@
new_quotas = {'floatingip': 1}
self._setup_quotas(tenant_id, **new_quotas)
- ext_net_id = CONF.network.public_network_id
- fip_args = {'tenant_id': tenant_id,
- 'floating_network_id': ext_net_id}
- fip = self.admin_client.create_floatingip(**fip_args)['floatingip']
- self.addCleanup(self.admin_client.delete_floatingip, fip['id'])
+ self.create_floatingip(client=self.admin_client, tenant_id=tenant_id)
- self.assertRaises(lib_exc.Conflict,
- self.admin_client.create_floatingip, **fip_args)
+ self.assertRaises(lib_exc.Conflict, self.create_floatingip,
+ client=self.admin_client, tenant_id=tenant_id)
diff --git a/neutron_tempest_plugin/api/admin/test_routers_dvr.py b/neutron_tempest_plugin/api/admin/test_routers_dvr.py
index 644bc38..8d80ba6 100644
--- a/neutron_tempest_plugin/api/admin/test_routers_dvr.py
+++ b/neutron_tempest_plugin/api/admin/test_routers_dvr.py
@@ -44,7 +44,8 @@
@decorators.idempotent_id('08a2a0a8-f1e4-4b34-8e30-e522e836c44e')
def test_distributed_router_creation(self):
- """
+ """Test distributed router creation
+
Test uses administrative credentials to creates a
DVR (Distributed Virtual Routing) router using the
distributed=True.
@@ -61,7 +62,8 @@
@decorators.idempotent_id('8a0a72b4-7290-4677-afeb-b4ffe37bc352')
def test_centralized_router_creation(self):
- """
+ """Test centralized router creation
+
Test uses administrative credentials to creates a
CVR (Centralized Virtual Routing) router using the
distributed=False.
@@ -84,7 +86,8 @@
@decorators.idempotent_id('acd43596-c1fb-439d-ada8-31ad48ae3c2e')
def test_centralized_router_update_to_dvr(self):
- """
+ """Test centralized to DVR router update
+
Test uses administrative credentials to creates a
CVR (Centralized Virtual Routing) router using the
distributed=False.Then it will "update" the router
diff --git a/neutron_tempest_plugin/api/admin/test_routers_ha.py b/neutron_tempest_plugin/api/admin/test_routers_ha.py
index d9aafe9..b717a10 100644
--- a/neutron_tempest_plugin/api/admin/test_routers_ha.py
+++ b/neutron_tempest_plugin/api/admin/test_routers_ha.py
@@ -40,7 +40,8 @@
@decorators.idempotent_id('8abc177d-14f1-4018-9f01-589b299cbee1')
def test_ha_router_creation(self):
- """
+ """Test HA router creation
+
Test uses administrative credentials to create a
HA (High Availability) router using the ha=True.
@@ -53,7 +54,8 @@
@decorators.idempotent_id('97b5f7ef-2192-4fa3-901e-979cd5c1097a')
def test_legacy_router_creation(self):
- """
+ """Test legacy router creation
+
Test uses administrative credentials to create a
SF (Single Failure) router using the ha=False.
@@ -68,7 +70,8 @@
@decorators.idempotent_id('5a6bfe82-5b23-45a4-b027-5160997d4753')
def test_legacy_router_update_to_ha(self):
- """
+ """Test legacy to HA router update
+
Test uses administrative credentials to create a
SF (Single Failure) router using the ha=False.
Then it will "update" the router ha attribute to True
diff --git a/neutron_tempest_plugin/api/admin/test_tag.py b/neutron_tempest_plugin/api/admin/test_tag.py
index c0210a2..fdcb6a1 100644
--- a/neutron_tempest_plugin/api/admin/test_tag.py
+++ b/neutron_tempest_plugin/api/admin/test_tag.py
@@ -15,7 +15,6 @@
from tempest.lib import exceptions as lib_exc
from neutron_tempest_plugin.api import base
-from neutron_tempest_plugin import config
class TagTestJSON(base.BaseAdminNetworkTest):
@@ -177,9 +176,7 @@
@classmethod
@utils.requires_ext(extension="router", service="network")
def _create_resource(cls):
- cls.ext_net_id = config.CONF.network.public_network_id
- floatingip = cls.create_floatingip(cls.ext_net_id)
- return floatingip['id']
+ return cls.create_floatingip()['id']
@decorators.attr(type='smoke')
@decorators.idempotent_id('53f6c2bf-e272-4e9e-b9a9-b165eb7be807')
@@ -418,9 +415,7 @@
@classmethod
@utils.requires_ext(extension="router", service="network")
def _create_resource(cls):
- cls.ext_net_id = config.CONF.network.public_network_id
- floatingip = cls.create_floatingip(cls.ext_net_id)
- return floatingip['id']
+ return cls.create_floatingip()['id']
def _list_resource(self, filters):
res = self.client.list_floatingips(**filters)
diff --git a/neutron_tempest_plugin/api/base.py b/neutron_tempest_plugin/api/base.py
index df0f4fa..028d901 100644
--- a/neutron_tempest_plugin/api/base.py
+++ b/neutron_tempest_plugin/api/base.py
@@ -34,8 +34,7 @@
class BaseNetworkTest(test.BaseTestCase):
- """
- Base class for the Neutron tests that use the Tempest Neutron REST client
+ """Base class for Neutron tests that use the Tempest Neutron REST client
Per the Neutron API Guide, API v1.x was removed from the source code tree
(docs.openstack.org/api/openstack-network/2.0/content/Overview-d1e71.html)
@@ -432,6 +431,8 @@
ip_version=ip_version, cidr=cidr, mask_bits=mask_bits):
if gateway is not None:
kwargs['gateway_ip'] = str(gateway or (subnet_cidr.ip + 1))
+ else:
+ kwargs['gateway_ip'] = None
try:
body = client.create_subnet(
network_id=network['id'],
diff --git a/neutron_tempest_plugin/api/clients.py b/neutron_tempest_plugin/api/clients.py
index ee0289c..407e694 100644
--- a/neutron_tempest_plugin/api/clients.py
+++ b/neutron_tempest_plugin/api/clients.py
@@ -29,9 +29,7 @@
class Manager(manager.Manager):
- """
- Top level manager for OpenStack tempest clients
- """
+ """Top level manager for OpenStack tempest clients"""
default_params = {
'disable_ssl_certificate_validation':
CONF.identity.disable_ssl_certificate_validation,
diff --git a/neutron_tempest_plugin/api/test_allowed_address_pair.py b/neutron_tempest_plugin/api/test_allowed_address_pair.py
index f34cc5b..0137ff2 100644
--- a/neutron_tempest_plugin/api/test_allowed_address_pair.py
+++ b/neutron_tempest_plugin/api/test_allowed_address_pair.py
@@ -20,7 +20,8 @@
class AllowedAddressPairTestJSON(base.BaseNetworkTest):
- """
+ """AllowedAddressPairTestJSON class
+
Tests the Neutron Allowed Address Pair API extension using the Tempest
REST client. The following API operations are tested with this extension:
diff --git a/neutron_tempest_plugin/api/test_auto_allocated_topology.py b/neutron_tempest_plugin/api/test_auto_allocated_topology.py
index 0baa2a8..4d70bfc 100644
--- a/neutron_tempest_plugin/api/test_auto_allocated_topology.py
+++ b/neutron_tempest_plugin/api/test_auto_allocated_topology.py
@@ -21,8 +21,8 @@
class TestAutoAllocatedTopology(base.BaseAdminNetworkTest):
+ """Tests Get-Me-A-Network
- """
Tests the Get-Me-A-Network operations in the Neutron API
using the REST client for Neutron.
"""
diff --git a/neutron_tempest_plugin/api/test_dhcp_ipv6.py b/neutron_tempest_plugin/api/test_dhcp_ipv6.py
index 0fab75c..4f2e576 100644
--- a/neutron_tempest_plugin/api/test_dhcp_ipv6.py
+++ b/neutron_tempest_plugin/api/test_dhcp_ipv6.py
@@ -82,7 +82,9 @@
@decorators.idempotent_id('98244d88-d990-4570-91d4-6b25d70d08af')
def test_dhcp_stateful_fixedips_outrange(self):
- """When port gets IP address from fixed IP range it
+ """Test DHCP Stateful fixed IPs out of range
+
+ When port gets IP address from fixed IP range it
shall be checked if it's from subnets range.
"""
kwargs = {'ipv6_ra_mode': 'dhcpv6-stateful',
diff --git a/neutron_tempest_plugin/api/test_extra_dhcp_options.py b/neutron_tempest_plugin/api/test_extra_dhcp_options.py
index e5f73b2..cb4dba8 100644
--- a/neutron_tempest_plugin/api/test_extra_dhcp_options.py
+++ b/neutron_tempest_plugin/api/test_extra_dhcp_options.py
@@ -20,8 +20,8 @@
class ExtraDHCPOptionsTestJSON(base.BaseNetworkTest):
+ """Test Extra DHCP Options
- """
Tests the following operations with the Extra DHCP Options Neutron API
extension:
diff --git a/neutron_tempest_plugin/api/test_flavors_extensions.py b/neutron_tempest_plugin/api/test_flavors_extensions.py
index 30f1eb6..42eb7b1 100644
--- a/neutron_tempest_plugin/api/test_flavors_extensions.py
+++ b/neutron_tempest_plugin/api/test_flavors_extensions.py
@@ -19,8 +19,8 @@
class TestFlavorsJson(base.BaseAdminNetworkTest):
+ """Test Flavors
- """
Tests the following operations in the Neutron API using the REST client for
Neutron:
diff --git a/neutron_tempest_plugin/api/test_floating_ips.py b/neutron_tempest_plugin/api/test_floating_ips.py
index 9f5778f..ea3d22e 100644
--- a/neutron_tempest_plugin/api/test_floating_ips.py
+++ b/neutron_tempest_plugin/api/test_floating_ips.py
@@ -48,11 +48,7 @@
# originally the floating IP had no attributes other than its
# association, so an update with an empty body was a signal to
# clear the association. This test ensures we maintain that behavior.
- body = self.client.create_floatingip(
- floating_network_id=self.ext_net_id,
- port_id=self.ports[0]['id'],
- )['floatingip']
- self.floating_ips.append(body)
+ body = self.create_floatingip(port=self.ports[0])
self.assertEqual(self.ports[0]['id'], body['port_id'])
body = self.client.update_floatingip(body['id'])['floatingip']
self.assertFalse(body['port_id'])
@@ -61,12 +57,7 @@
@utils.requires_ext(extension="standard-attr-description",
service="network")
def test_create_update_floatingip_description(self):
- body = self.client.create_floatingip(
- floating_network_id=self.ext_net_id,
- port_id=self.ports[0]['id'],
- description='d1'
- )['floatingip']
- self.floating_ips.append(body)
+ body = self.create_floatingip(port=self.ports[0], description='d1')
self.assertEqual('d1', body['description'])
body = self.client.show_floatingip(body['id'])['floatingip']
self.assertEqual('d1', body['description'])
@@ -84,12 +75,7 @@
service="network")
def test_floatingip_update_extra_attributes_port_id_not_changed(self):
port_id = self.ports[1]['id']
- body = self.client.create_floatingip(
- floating_network_id=self.ext_net_id,
- port_id=port_id,
- description='d1'
- )['floatingip']
- self.floating_ips.append(body)
+ body = self.create_floatingip(port_id=port_id, description='d1')
self.assertEqual('d1', body['description'])
body = self.client.show_floatingip(body['id'])['floatingip']
self.assertEqual(port_id, body['port_id'])
@@ -112,12 +98,7 @@
@utils.requires_ext(extension="fip-port-details", service="network")
def test_create_update_floatingip_port_details(self):
- body = self.client.create_floatingip(
- floating_network_id=self.ext_net_id,
- port_id=self.ports[0]['id'],
- description='d1'
- )['floatingip']
- self.floating_ips.append(body)
+ body = self.create_floatingip(port=self.ports[0], description='d1')
self._assert_port_details(self.ports[0], body)
body = self.client.show_floatingip(body['id'])['floatingip']
self._assert_port_details(self.ports[0], body)
diff --git a/neutron_tempest_plugin/api/test_floating_ips_negative.py b/neutron_tempest_plugin/api/test_floating_ips_negative.py
index 453af71..c8b8cb4 100644
--- a/neutron_tempest_plugin/api/test_floating_ips_negative.py
+++ b/neutron_tempest_plugin/api/test_floating_ips_negative.py
@@ -53,14 +53,8 @@
self.addCleanup(self.client.update_router, self.router['id'],
external_gateway_info={})
port = self.create_port(net)
- body1 = self.client.create_floatingip(
- floating_network_id=self.ext_net_id)
- floating_ip1 = body1['floatingip']
- self.addCleanup(self.client.delete_floatingip, floating_ip1['id'])
- body2 = self.client.create_floatingip(
- floating_network_id=self.ext_net_id)
- floating_ip2 = body2['floatingip']
- self.addCleanup(self.client.delete_floatingip, floating_ip2['id'])
+ floating_ip1 = self.create_floatingip()
+ floating_ip2 = self.create_floatingip()
self.client.update_floatingip(floating_ip1['id'],
port_id=port['id'])
self.assertRaises(lib_exc.Conflict, self.client.update_floatingip,
diff --git a/neutron_tempest_plugin/api/test_metering_extensions.py b/neutron_tempest_plugin/api/test_metering_extensions.py
index 745a8d0..ceeb2b6 100644
--- a/neutron_tempest_plugin/api/test_metering_extensions.py
+++ b/neutron_tempest_plugin/api/test_metering_extensions.py
@@ -23,8 +23,8 @@
class MeteringTestJSON(base.BaseAdminNetworkTest):
+ """Test Metering
- """
Tests the following operations in the Neutron API using the REST client for
Neutron:
diff --git a/neutron_tempest_plugin/api/test_network_ip_availability.py b/neutron_tempest_plugin/api/test_network_ip_availability.py
index 10aee2e..1cdfc7e 100644
--- a/neutron_tempest_plugin/api/test_network_ip_availability.py
+++ b/neutron_tempest_plugin/api/test_network_ip_availability.py
@@ -37,8 +37,8 @@
class NetworksIpAvailabilityTest(base.BaseAdminNetworkTest):
+ """Tests Networks IP Availability
- """
Tests the following operations in the Neutron API using the REST client for
Neutron:
diff --git a/neutron_tempest_plugin/api/test_networks.py b/neutron_tempest_plugin/api/test_networks.py
index 63e8ae5..f9d52ba 100644
--- a/neutron_tempest_plugin/api/test_networks.py
+++ b/neutron_tempest_plugin/api/test_networks.py
@@ -22,8 +22,8 @@
class NetworksTestJSON(base.BaseNetworkTest):
+ """Test Networks
- """
Tests the following operations in the Neutron API using the REST client for
Neutron:
diff --git a/neutron_tempest_plugin/api/test_qos.py b/neutron_tempest_plugin/api/test_qos.py
index 2bf99bf..4f93577 100644
--- a/neutron_tempest_plugin/api/test_qos.py
+++ b/neutron_tempest_plugin/api/test_qos.py
@@ -1053,16 +1053,24 @@
policy_id=policy['id'],
direction=self.DIRECTION_EGRESS, min_kbps=201)
- @decorators.idempotent_id('d6fce764-e511-4fa6-9f86-f4b41cf142cf')
- def test_rule_create_fail_for_direction_ingress(self):
+ @decorators.idempotent_id('35baf998-ae65-495c-9902-35a0d11e8936')
+ @utils.requires_ext(extension="qos-bw-minimum-ingress",
+ service="network")
+ def test_rule_create_pass_for_direction_ingress(self):
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=False)
- self.assertRaises(exceptions.BadRequest,
- self.admin_client.create_minimum_bandwidth_rule,
- policy_id=policy['id'],
- direction=self.DIRECTION_INGRESS,
- min_kbps=201)
+ self.admin_client.create_minimum_bandwidth_rule(
+ policy_id=policy['id'],
+ direction=self.DIRECTION_INGRESS,
+ min_kbps=201)
+
+ retrieved_policy = self.admin_client.show_qos_policy(policy['id'])
+ policy_rules = retrieved_policy['policy']['rules']
+ self.assertEqual(1, len(policy_rules))
+ self.assertEqual(qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH,
+ policy_rules[0]['type'])
+ self.assertEqual(self.DIRECTION_INGRESS, policy_rules[0]['direction'])
@decorators.idempotent_id('a49a6988-2568-47d2-931e-2dbc858943b3')
def test_rule_update(self):
diff --git a/neutron_tempest_plugin/api/test_revisions.py b/neutron_tempest_plugin/api/test_revisions.py
index eb32560..b03285d 100644
--- a/neutron_tempest_plugin/api/test_revisions.py
+++ b/neutron_tempest_plugin/api/test_revisions.py
@@ -309,7 +309,7 @@
@decorators.idempotent_id('9de71ebc-f5df-4cd0-80bc-60299fce3ce9')
@utils.requires_ext(extension="router", service="network")
@utils.requires_ext(extension="standard-attr-description",
- service="network")
+ service="network")
def test_update_floatingip_bumps_revision(self):
ext_id = config.CONF.network.public_network_id
net = self.create_network()
@@ -325,12 +325,7 @@
subnet['id'])
port = self.create_port(net)
self.addCleanup(self.client.delete_port, port['id'])
- body = self.client.create_floatingip(
- floating_network_id=ext_id,
- port_id=port['id'],
- description='d1'
- )['floatingip']
- self.floating_ips.append(body)
+ body = self.create_floatingip(port=port, description='d1')
self.assertIn('revision_number', body)
b2 = self.client.update_floatingip(body['id'], description='d2')
self.assertGreater(b2['floatingip']['revision_number'],
diff --git a/neutron_tempest_plugin/api/test_subnetpools.py b/neutron_tempest_plugin/api/test_subnetpools.py
index 25d9780..9d927cf 100644
--- a/neutron_tempest_plugin/api/test_subnetpools.py
+++ b/neutron_tempest_plugin/api/test_subnetpools.py
@@ -58,7 +58,8 @@
new_prefix = u'10.11.15.0/24'
larger_prefix = u'10.11.0.0/16'
- """
+ """Test Subnet Pools
+
Tests the following operations in the Neutron API using the REST client for
Neutron:
@@ -327,9 +328,7 @@
@decorators.idempotent_id('4c6963c2-f54c-4347-b288-75d18421c4c4')
@utils.requires_ext(extension='default-subnetpools', service='network')
def test_tenant_create_non_default_subnetpool(self):
- """
- Test creates a subnetpool, the "is_default" attribute is False.
- """
+ """Test creates a subnetpool, the "is_default" attribute is False."""
created_subnetpool = self._create_subnetpool()
self.assertFalse(created_subnetpool['is_default'])
diff --git a/neutron_tempest_plugin/api/test_timestamp.py b/neutron_tempest_plugin/api/test_timestamp.py
index 186d21f..f5888f9 100644
--- a/neutron_tempest_plugin/api/test_timestamp.py
+++ b/neutron_tempest_plugin/api/test_timestamp.py
@@ -247,14 +247,14 @@
@decorators.idempotent_id('8ae55186-464f-4b87-1c9f-eb2765ee81ac')
def test_create_floatingip_with_timestamp(self):
- fip = self.create_floatingip(self.ext_net_id)
+ fip = self.create_floatingip()
# Verifies body contains timestamp fields
self.assertIsNotNone(fip['created_at'])
self.assertIsNotNone(fip['updated_at'])
@decorators.idempotent_id('a3ac215a-61ac-13f9-9d3c-57c51f11afa1')
def test_update_floatingip_with_timestamp(self):
- fip = self.create_floatingip(self.ext_net_id)
+ fip = self.create_floatingip()
origin_updated_at = fip['updated_at']
update_body = {'description': 'new'}
body = self.client.update_floatingip(fip['id'], **update_body)
@@ -266,7 +266,7 @@
@decorators.idempotent_id('32a6a086-e1ef-413b-b13a-0cfe13ef051e')
def test_show_floatingip_attribute_with_timestamp(self):
- fip = self.create_floatingip(self.ext_net_id)
+ fip = self.create_floatingip()
body = self.client.show_floatingip(fip['id'])
show_fip = body['floatingip']
# verify the timestamp from creation and showed is same
diff --git a/neutron_tempest_plugin/common/ssh.py b/neutron_tempest_plugin/common/ssh.py
index 9812f4c..4829db2 100644
--- a/neutron_tempest_plugin/common/ssh.py
+++ b/neutron_tempest_plugin/common/ssh.py
@@ -146,8 +146,7 @@
_get_ssh_connection = connect
def close(self):
- """Closes connection to SSH server and cleanup resources.
- """
+ """Closes connection to SSH server and cleanup resources."""
client = self._client
if client is not None:
client.close()
diff --git a/neutron_tempest_plugin/common/utils.py b/neutron_tempest_plugin/common/utils.py
index c42d984..fa7bb8b 100644
--- a/neutron_tempest_plugin/common/utils.py
+++ b/neutron_tempest_plugin/common/utils.py
@@ -54,8 +54,8 @@
def wait_until_true(predicate, timeout=60, sleep=1, exception=None):
- """
- Wait until callable predicate is evaluated as True
+ """Wait until callable predicate is evaluated as True
+
:param predicate: Callable deciding whether waiting should continue.
Best practice is to instantiate predicate with functools.partial()
:param timeout: Timeout in seconds how long should function wait.
@@ -69,7 +69,7 @@
eventlet.sleep(sleep)
except eventlet.Timeout:
if exception is not None:
- #pylint: disable=raising-bad-type
+ # pylint: disable=raising-bad-type
raise exception
raise WaitTimeout("Timed out after %d seconds" % timeout)
diff --git a/neutron_tempest_plugin/config.py b/neutron_tempest_plugin/config.py
index e15748d..030a126 100644
--- a/neutron_tempest_plugin/config.py
+++ b/neutron_tempest_plugin/config.py
@@ -29,10 +29,6 @@
default=[],
help='List of network types available to neutron, '
'e.g. vxlan,vlan,gre.'),
- cfg.BoolOpt('image_is_advanced',
- default=False,
- help='Image that supports features that cirros does not, like'
- ' Ubuntu or CentOS supporting advanced features'),
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 '
@@ -75,6 +71,26 @@
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
diff --git a/neutron_tempest_plugin/scenario/admin/test_floatingip.py b/neutron_tempest_plugin/scenario/admin/test_floatingip.py
index e58be83..1af5502 100644
--- a/neutron_tempest_plugin/scenario/admin/test_floatingip.py
+++ b/neutron_tempest_plugin/scenario/admin/test_floatingip.py
@@ -85,18 +85,19 @@
network_id=self.network['id'],
device_id=server['server']['id']
)['ports'][0]
- fips.append(self.create_and_associate_floatingip(
- port['id'], client=self.os_admin.network_client))
+ fip = self.create_floatingip(port=port,
+ client=self.os_admin.network_client)
+ fips.append(fip)
server_ssh_clients.append(ssh.Client(
fips[i]['floating_ip_address'], CONF.validation.image_ssh_user,
pkey=self.keypair['private_key']))
- self.addCleanup(self.os_admin.network_client.delete_floatingip,
- fips[i]['id'])
return server_ssh_clients, fips
@decorators.idempotent_id('6bba729b-3fb6-494b-9e1e-82bbd89a1045')
def test_two_vms_fips(self):
- """This test verifies the ability of two instances
+ """Test two VMs floating IPs
+
+ This test verifies the ability of two instances
that were created in the same compute node and same availability zone
to reach each other.
"""
diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index 1aaf8ce..a2c5c72 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -40,6 +40,7 @@
def create_server(self, flavor_ref, image_ref, key_name, networks,
**kwargs):
"""Create a server using tempest lib
+
All the parameters are the ones used in Compute API
* - Kwargs that require admin privileges
@@ -134,8 +135,7 @@
@classmethod
def create_pingable_secgroup_rule(cls, secgroup_id=None,
client=None):
- """This rule is intended to permit inbound ping
- """
+ """This rule is intended to permit inbound ping"""
rule_list = [{'protocol': 'icmp',
'direction': 'ingress',
diff --git a/neutron_tempest_plugin/scenario/test_dns_integration.py b/neutron_tempest_plugin/scenario/test_dns_integration.py
index 923f013..20062c1 100644
--- a/neutron_tempest_plugin/scenario/test_dns_integration.py
+++ b/neutron_tempest_plugin/scenario/test_dns_integration.py
@@ -76,11 +76,9 @@
cls.keypair = cls.create_keypair()
def _create_floatingip_with_dns(self, dns_name):
- fip = self.os_primary.network_client.create_floatingip(
- CONF.network.public_network_id, dns_name=dns_name,
- dns_domain=self.zone['name'])['floatingip']
- self.floating_ips.append(fip)
- return fip
+ return self.create_floatingip(client=self.os_primary.network_client,
+ dns_name=dns_name,
+ dns_domain=self.zone['name'])
def _create_server(self, name=None):
port = self.create_port(self.network)
@@ -92,7 +90,7 @@
waiters.wait_for_server_status(self.os_primary.servers_client,
server['id'],
constants.SERVER_STATUS_ACTIVE)
- fip = self.create_and_associate_floatingip(port['id'])
+ fip = self.create_floatingip(port=port)
return {'port': port, 'fip': fip, 'server': server}
def _verify_dns_records(self, address, name):
diff --git a/neutron_tempest_plugin/scenario/test_floatingip.py b/neutron_tempest_plugin/scenario/test_floatingip.py
index 504af12..38833cd 100644
--- a/neutron_tempest_plugin/scenario/test_floatingip.py
+++ b/neutron_tempest_plugin/scenario/test_floatingip.py
@@ -21,6 +21,7 @@
from tempest.common import waiters
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
+from tempest.lib import exceptions
import testscenarios
from testscenarios.scenarios import multiply_scenarios
@@ -28,7 +29,6 @@
from neutron_tempest_plugin.common import ssh
from neutron_tempest_plugin.common import utils as common_utils
from neutron_tempest_plugin import config
-from neutron_tempest_plugin import exceptions
from neutron_tempest_plugin.scenario import base
from neutron_tempest_plugin.scenario import constants
from neutron_tempest_plugin.scenario import test_qos
@@ -87,7 +87,7 @@
network = self.network
port = self.create_port(network, security_groups=[self.secgroup['id']])
if create_floating_ip:
- fip = self.create_and_associate_floatingip(port['id'])
+ fip = self.create_floatingip(port=port)
else:
fip = None
server = self.create_server(
@@ -234,19 +234,20 @@
server['server']['id'], port_id=port['id'])
waiters.wait_for_interface_status(
self.os_primary.interfaces_client, server['server']['id'],
- port['id'], 'ACTIVE')
+ port['id'], lib_constants.PORT_STATUS_ACTIVE)
fip = self.client.show_floatingip(fip['id'])['floatingip']
self._check_port_details(
- fip, port, status='ACTIVE',
+ fip, port, status=lib_constants.PORT_STATUS_ACTIVE,
device_id=server['server']['id'], device_owner='compute:nova')
# detach the port from the server; this is a cast in the compute
# API so we have to poll the port until the device_id is unset.
self.delete_interface(server['server']['id'], port['id'])
- self._wait_for_port_detach(port['id'])
- fip = self.client.show_floatingip(fip['id'])['floatingip']
+ port = self._wait_for_port_detach(port['id'])
+ fip = self._wait_for_fip_port_down(fip['id'])
self._check_port_details(
- fip, port, status='DOWN', device_id='', device_owner='')
+ fip, port, status=lib_constants.PORT_STATUS_DOWN,
+ device_id='', device_owner='')
def _check_port_details(self, fip, port, status, device_id, device_owner):
self.assertIn('port_details', fip)
@@ -287,6 +288,36 @@
return port
+ def _wait_for_fip_port_down(self, fip_id, timeout=120, interval=10):
+ """Waits for the fip's attached port status to be 'DOWN'.
+
+ :param fip_id: The id of the floating IP.
+ :returns: The final fip dict from the show_floatingip response.
+ """
+ fip = self.client.show_floatingip(fip_id)['floatingip']
+ self.assertIn('port_details', fip)
+ port_details = fip['port_details']
+ status = port_details['status']
+ start = int(time.time())
+
+ while status != lib_constants.PORT_STATUS_DOWN:
+ time.sleep(interval)
+ fip = self.client.show_floatingip(fip_id)['floatingip']
+ self.assertIn('port_details', fip)
+ port_details = fip['port_details']
+ status = port_details['status']
+
+ timed_out = int(time.time()) - start >= timeout
+
+ if status != lib_constants.PORT_STATUS_DOWN and timed_out:
+ message = ('Floating IP %s attached port status failed to '
+ 'transition to DOWN (current status %s) within '
+ 'the required time (%s s).' %
+ (fip_id, status, timeout))
+ raise exceptions.TimeoutException(message)
+
+ return fip
+
class FloatingIPQosTest(FloatingIpTestCasesMixin,
test_qos.QoSTestMixin,
diff --git a/neutron_tempest_plugin/scenario/test_mtu.py b/neutron_tempest_plugin/scenario/test_mtu.py
index dbfde9b..941d499 100644
--- a/neutron_tempest_plugin/scenario/test_mtu.py
+++ b/neutron_tempest_plugin/scenario/test_mtu.py
@@ -47,8 +47,8 @@
def create_pingable_vm(self, net, keypair, secgroup):
server = self.create_server(
- flavor_ref=CONF.compute.flavor_ref,
- image_ref=CONF.compute.image_ref,
+ flavor_ref=CONF.neutron_plugin_options.advanced_image_flavor_ref,
+ image_ref=CONF.neutron_plugin_options.advanced_image_ref,
key_name=keypair['name'],
networks=[{'uuid': net['id']}],
security_groups=[{'name': secgroup[
@@ -58,7 +58,7 @@
constants.SERVER_STATUS_ACTIVE)
port = self.client.list_ports(
network_id=net['id'], device_id=server['server']['id'])['ports'][0]
- fip = self.create_and_associate_floatingip(port['id'])
+ fip = self.create_floatingip(port=port)
return server, fip
def _get_network_params(self):
@@ -105,22 +105,23 @@
self.keypair, self.secgroup)
server_ssh_client1 = ssh.Client(
self.floating_ips[0]['floating_ip_address'],
- CONF.validation.image_ssh_user,
+ CONF.neutron_plugin_options.advanced_image_ssh_user,
pkey=self.keypair['private_key'])
server2, fip2 = self.create_pingable_vm(self.networks[1],
self.keypair, self.secgroup)
server_ssh_client2 = ssh.Client(
self.floating_ips[0]['floating_ip_address'],
- CONF.validation.image_ssh_user,
+ CONF.neutron_plugin_options.advanced_image_ssh_user,
pkey=self.keypair['private_key'])
for fip in (fip1, fip2):
- self.check_connectivity(fip['floating_ip_address'],
- CONF.validation.image_ssh_user,
- self.keypair['private_key'])
+ self.check_connectivity(
+ fip['floating_ip_address'],
+ CONF.neutron_plugin_options.advanced_image_ssh_user,
+ self.keypair['private_key'])
return server_ssh_client1, fip1, server_ssh_client2, fip2
@testtools.skipUnless(
- CONF.neutron_plugin_options.image_is_advanced,
+ CONF.neutron_plugin_options.advanced_image_ref,
"Advanced image is required to run this test.")
@decorators.idempotent_id('3d73ec1a-2ec6-45a9-b0f8-04a273d9d344')
def test_connectivity_min_max_mtu(self):
@@ -197,22 +198,23 @@
self.keypair, self.secgroup)
server_ssh_client1 = ssh.Client(
self.floating_ips[0]['floating_ip_address'],
- CONF.validation.image_ssh_user,
+ CONF.neutron_plugin_options.advanced_image_ssh_user,
pkey=self.keypair['private_key'])
server2, fip2 = self.create_pingable_vm(self.networks[1],
self.keypair, self.secgroup)
server_ssh_client2 = ssh.Client(
self.floating_ips[0]['floating_ip_address'],
- CONF.validation.image_ssh_user,
+ CONF.neutron_plugin_options.advanced_image_ssh_user,
pkey=self.keypair['private_key'])
for fip in (fip1, fip2):
- self.check_connectivity(fip['floating_ip_address'],
- CONF.validation.image_ssh_user,
- self.keypair['private_key'])
+ self.check_connectivity(
+ fip['floating_ip_address'],
+ CONF.neutron_plugin_options.advanced_image_ssh_user,
+ self.keypair['private_key'])
return server_ssh_client1, fip1, server_ssh_client2, fip2
@testtools.skipUnless(
- CONF.neutron_plugin_options.image_is_advanced,
+ CONF.neutron_plugin_options.advanced_image_ref,
"Advanced image is required to run this test.")
@decorators.idempotent_id('bc470200-d8f4-4f07-b294-1b4cbaaa35b9')
def test_connectivity_min_max_mtu(self):
diff --git a/neutron_tempest_plugin/scenario/test_qos.py b/neutron_tempest_plugin/scenario/test_qos.py
index 702bbaa..1ec79f9 100644
--- a/neutron_tempest_plugin/scenario/test_qos.py
+++ b/neutron_tempest_plugin/scenario/test_qos.py
@@ -49,8 +49,7 @@
def _connect_socket(host, port):
- """Try to initiate a connection to a host using an ip address
- and a port.
+ """Try to initiate a connection to a host using an ip address and a port.
Trying couple of times until a timeout is reached in case the listening
host is not ready yet.
@@ -80,6 +79,7 @@
FILE_PATH = "/tmp/img"
NC_PORT = 1234
+ FILE_DOWNLOAD_TIMEOUT = 120
def _create_file_for_bw_tests(self, ssh_client):
cmd = ("(dd if=/dev/zero bs=%(bs)d count=%(count)d of=%(file_path)s) "
@@ -92,7 +92,7 @@
raise sc_exceptions.FileCreationFailedException(
file=QoSTestMixin.FILE_PATH)
- def _check_bw(self, ssh_client, host, port):
+ def _check_bw(self, ssh_client, host, port, expected_bw=LIMIT_BYTES_SEC):
cmd = "killall -q nc"
try:
ssh_client.exec_command(cmd)
@@ -102,14 +102,15 @@
'port': port, 'file_path': QoSTestMixin.FILE_PATH})
ssh_client.exec_command(cmd)
+ # Open TCP socket to remote VM and download big file
start_time = time.time()
client_socket = _connect_socket(host, port)
total_bytes_read = 0
-
while total_bytes_read < QoSTestMixin.FILE_SIZE:
data = client_socket.recv(QoSTestMixin.BUFFER_SIZE)
total_bytes_read += len(data)
+ # Calculate and return actual BW + logging result
time_elapsed = time.time() - start_time
bytes_per_second = total_bytes_read / time_elapsed
@@ -119,8 +120,7 @@
{'time_elapsed': time_elapsed,
'total_bytes_read': total_bytes_read,
'bytes_per_second': bytes_per_second})
-
- return bytes_per_second <= QoSTestMixin.LIMIT_BYTES_SEC
+ return bytes_per_second <= expected_bw
def _create_ssh_client(self):
return ssh.Client(self.fip['floating_ip_address'],
@@ -155,30 +155,118 @@
def resource_setup(cls):
super(QoSTest, cls).resource_setup()
- @decorators.idempotent_id('1f7ed39b-428f-410a-bd2b-db9f465680df')
- def test_qos(self):
- """This is a basic test that check that a QoS policy with
+ @decorators.idempotent_id('00682a0c-b72e-11e8-b81e-8c16450ea513')
+ def test_qos_basic_and_update(self):
+ """This test covers both:
- a bandwidth limit rule is applied correctly by sending
- a file from the instance to the test node.
- Then calculating the bandwidth every ~1 sec by the number of bits
- received / elapsed time.
+ 1) Basic QoS functionality
+ This is a basic test that check that a QoS policy with
+ a bandwidth limit rule is applied correctly by sending
+ a file from the instance to the test node.
+ Then calculating the bandwidth every ~1 sec by the number of bits
+ received / elapsed time.
+
+ 2) Update QoS policy
+ Administrator has the ability to update existing QoS policy,
+ this test is planned to verify that:
+ - actual BW is affected as expected after updating QoS policy.
+ Test scenario:
+ 1) Associating QoS Policy with "Original_bandwidth"
+ to the test node
+ 2) BW validation - by downloading file on test node.
+ ("Original_bandwidth" is expected)
+ 3) Updating existing QoS Policy to a new BW value
+ "Updated_bandwidth"
+ 4) BW validation - by downloading file on test node.
+ ("Updated_bandwidth" is expected)
+ Note:
+ There are two options to associate QoS policy to VM:
+ "Neutron Port" or "Network", in this test
+ both options are covered.
"""
+
+ # Setup resources
self._test_basic_resources()
- policy_id = self._create_qos_policy()
ssh_client = self._create_ssh_client()
- self.os_admin.network_client.create_bandwidth_limit_rule(
- policy_id, max_kbps=constants.LIMIT_KILO_BITS_PER_SECOND,
- max_burst_kbps=constants.LIMIT_KILO_BITS_PER_SECOND)
- port = self.client.list_ports(network_id=self.network['id'],
- device_id=self.server[
- 'server']['id'])['ports'][0]
- self.os_admin.network_client.update_port(port['id'],
- qos_policy_id=policy_id)
+
+ # Create QoS policy
+ bw_limit_policy_id = self._create_qos_policy()
+
+ # As admin user create QoS rule
+ rule_id = self.os_admin.network_client.create_bandwidth_limit_rule(
+ policy_id=bw_limit_policy_id,
+ max_kbps=constants.LIMIT_KILO_BITS_PER_SECOND,
+ max_burst_kbps=constants.LIMIT_KILO_BITS_PER_SECOND)[
+ 'bandwidth_limit_rule']['id']
+
+ # Associate QoS to the network
+ self.os_admin.network_client.update_network(
+ self.network['id'], qos_policy_id=bw_limit_policy_id)
+
+ # Create file on VM
self._create_file_for_bw_tests(ssh_client)
+
+ # Basic test, Check that actual BW while downloading file
+ # is as expected (Original BW)
utils.wait_until_true(lambda: self._check_bw(
ssh_client,
self.fip['floating_ip_address'],
port=self.NC_PORT),
- timeout=120,
+ timeout=self.FILE_DOWNLOAD_TIMEOUT,
+ sleep=1)
+
+ # As admin user update QoS rule
+ self.os_admin.network_client.update_bandwidth_limit_rule(
+ bw_limit_policy_id,
+ rule_id,
+ max_kbps=constants.LIMIT_KILO_BITS_PER_SECOND * 2,
+ max_burst_kbps=constants.LIMIT_KILO_BITS_PER_SECOND * 2)
+
+ # Check that actual BW while downloading file
+ # is as expected (Update BW)
+ utils.wait_until_true(lambda: self._check_bw(
+ ssh_client,
+ self.fip['floating_ip_address'],
+ port=self.NC_PORT,
+ expected_bw=QoSTest.LIMIT_BYTES_SEC * 2),
+ timeout=self.FILE_DOWNLOAD_TIMEOUT,
+ sleep=1)
+
+ # Create a new QoS policy
+ bw_limit_policy_id_new = self._create_qos_policy()
+
+ # As admin user create a new QoS rule
+ rule_id_new = self.os_admin.network_client.create_bandwidth_limit_rule(
+ policy_id=bw_limit_policy_id_new,
+ max_kbps=constants.LIMIT_KILO_BITS_PER_SECOND,
+ max_burst_kbps=constants.LIMIT_KILO_BITS_PER_SECOND)[
+ 'bandwidth_limit_rule']['id']
+
+ # Associate a new QoS policy to Neutron port
+ self.os_admin.network_client.update_port(
+ self.port['id'], qos_policy_id=bw_limit_policy_id_new)
+
+ # Check that actual BW while downloading file
+ # is as expected (Original BW)
+ utils.wait_until_true(lambda: self._check_bw(
+ ssh_client,
+ self.fip['floating_ip_address'],
+ port=self.NC_PORT),
+ timeout=self.FILE_DOWNLOAD_TIMEOUT,
+ sleep=1)
+
+ # As admin user update QoS rule
+ self.os_admin.network_client.update_bandwidth_limit_rule(
+ bw_limit_policy_id_new,
+ rule_id_new,
+ max_kbps=constants.LIMIT_KILO_BITS_PER_SECOND * 3,
+ max_burst_kbps=constants.LIMIT_KILO_BITS_PER_SECOND * 3)
+
+ # Check that actual BW while downloading file
+ # is as expected (Update BW)
+ utils.wait_until_true(lambda: self._check_bw(
+ ssh_client,
+ self.fip['floating_ip_address'],
+ port=self.NC_PORT, expected_bw=QoSTest.LIMIT_BYTES_SEC * 3),
+ timeout=self.FILE_DOWNLOAD_TIMEOUT,
sleep=1)
diff --git a/neutron_tempest_plugin/scenario/test_security_groups.py b/neutron_tempest_plugin/scenario/test_security_groups.py
index 9503fe3..ebdcf93 100644
--- a/neutron_tempest_plugin/scenario/test_security_groups.py
+++ b/neutron_tempest_plugin/scenario/test_security_groups.py
@@ -43,6 +43,7 @@
def create_vm_testing_sec_grp(self, num_servers=2, security_groups=None,
ports=None):
"""Create instance for security group testing
+
:param num_servers (int): number of servers to spawn
:param security_groups (list): list of security groups
:param ports* (list): list of ports
@@ -67,7 +68,7 @@
port = self.client.list_ports(
network_id=self.network['id'], device_id=server['server'][
'id'])['ports'][0]
- fips.append(self.create_and_associate_floatingip(port['id']))
+ fips.append(self.create_floatingip(port=port))
server_ssh_clients.append(ssh.Client(
fips[i]['floating_ip_address'], CONF.validation.image_ssh_user,
pkey=self.keypair['private_key']))
@@ -260,7 +261,9 @@
@decorators.idempotent_id('f07d0159-8f9e-4faa-87f5-a869ab0ad488')
def test_multiple_ports_secgroup_inheritance(self):
- """This test creates two ports with security groups, then
+ """Test multiple port security group inheritance
+
+ This test creates two ports with security groups, then
boots two instances and verify that the security group was
inherited properly and enforced in these instances.
"""
diff --git a/neutron_tempest_plugin/scenario/test_trunk.py b/neutron_tempest_plugin/scenario/test_trunk.py
index 9a92b38..1903180 100644
--- a/neutron_tempest_plugin/scenario/test_trunk.py
+++ b/neutron_tempest_plugin/scenario/test_trunk.py
@@ -64,12 +64,18 @@
return {'port': port, 'trunk': trunk, 'fip': fip,
'server': server}
- def _create_server_with_fip(self, port_id, **server_kwargs):
- fip = self.create_and_associate_floatingip(port_id)
+ def _create_server_with_fip(self, port_id, use_advanced_image=False,
+ **server_kwargs):
+ fip = self.create_floatingip(port_id=port_id)
+ flavor_ref = CONF.compute.flavor_ref
+ image_ref = CONF.compute.image_ref
+ if use_advanced_image:
+ flavor_ref = CONF.neutron_plugin_options.advanced_image_flavor_ref
+ image_ref = CONF.neutron_plugin_options.advanced_image_ref
return (
self.create_server(
- flavor_ref=CONF.compute.flavor_ref,
- image_ref=CONF.compute.image_ref,
+ flavor_ref=flavor_ref,
+ image_ref=image_ref,
key_name=self.keypair['name'],
networks=[{'port': port_id}],
security_groups=[{'name': self.secgroup[
@@ -89,7 +95,8 @@
t = self.client.show_trunk(trunk_id)['trunk']
return t['status'] == 'ACTIVE'
- def _create_server_with_port_and_subport(self, vlan_network, vlan_tag):
+ def _create_server_with_port_and_subport(self, vlan_network, vlan_tag,
+ use_advanced_image=False):
parent_port = self.create_port(self.network, security_groups=[
self.secgroup['security_group']['id']])
port_for_subport = self.create_port(
@@ -102,11 +109,16 @@
'segmentation_id': vlan_tag}
self.create_trunk(parent_port, [subport])
- server, fip = self._create_server_with_fip(parent_port['id'])
+ server, fip = self._create_server_with_fip(
+ parent_port['id'], use_advanced_image=use_advanced_image)
+
+ ssh_user = CONF.validation.image_ssh_user
+ if use_advanced_image:
+ ssh_user = CONF.neutron_plugin_options.advanced_image_ssh_user
server_ssh_client = ssh.Client(
fip['floating_ip_address'],
- CONF.validation.image_ssh_user,
+ ssh_user,
pkey=self.keypair['private_key'])
return {
@@ -116,12 +128,15 @@
'subport': port_for_subport,
}
- def _wait_for_server(self, server):
+ def _wait_for_server(self, server, advanced_image=False):
+ ssh_user = CONF.validation.image_ssh_user
+ if advanced_image:
+ ssh_user = CONF.neutron_plugin_options.advanced_image_ssh_user
waiters.wait_for_server_status(self.os_primary.servers_client,
server['server']['id'],
constants.SERVER_STATUS_ACTIVE)
self.check_connectivity(server['fip']['floating_ip_address'],
- CONF.validation.image_ssh_user,
+ ssh_user,
self.keypair['private_key'])
@decorators.idempotent_id('bb13fe28-f152-4000-8131-37890a40c79e')
@@ -205,7 +220,7 @@
self.keypair['private_key'])
@testtools.skipUnless(
- CONF.neutron_plugin_options.image_is_advanced,
+ CONF.neutron_plugin_options.advanced_image_ref,
"Advanced image is required to run this test.")
@decorators.idempotent_id('a8a02c9b-b453-49b5-89a2-cce7da66aafb')
def test_subport_connectivity(self):
@@ -215,11 +230,12 @@
self.create_subnet(vlan_network, gateway=None)
servers = [
- self._create_server_with_port_and_subport(vlan_network, vlan_tag)
+ self._create_server_with_port_and_subport(
+ vlan_network, vlan_tag, use_advanced_image=True)
for i in range(2)]
for server in servers:
- self._wait_for_server(server)
+ self._wait_for_server(server, advanced_image=True)
# Configure VLAN interfaces on server
command = CONFIGURE_VLAN_INTERFACE_COMMANDS % {'tag': vlan_tag}
server['ssh_client'].exec_command(command)
diff --git a/neutron_tempest_plugin/services/network/json/network_client.py b/neutron_tempest_plugin/services/network/json/network_client.py
index a28d668..58dfbf4 100644
--- a/neutron_tempest_plugin/services/network/json/network_client.py
+++ b/neutron_tempest_plugin/services/network/json/network_client.py
@@ -17,12 +17,10 @@
from tempest.lib.common import rest_client as service_client
from tempest.lib import exceptions as lib_exc
-from neutron_tempest_plugin import exceptions
-
class NetworkClientJSON(service_client.RestClient):
+ """NetworkClientJSON class
- """
Tempest REST client for Neutron. Uses v2 of the Neutron API, since the
V1 API has been removed from the code base.
@@ -280,7 +278,7 @@
if self.is_resource_deleted(resource_type, id):
return
if int(time.time()) - start_time >= self.build_timeout:
- raise exceptions.TimeoutException
+ raise lib_exc.TimeoutException
time.sleep(self.build_interval)
def is_resource_deleted(self, resource_type, id):
@@ -449,7 +447,8 @@
return service_client.ResponseBody(resp, body)
def update_agent(self, agent_id, agent_info):
- """
+ """Update an agent
+
:param agent_info: Agent update information.
E.g {"admin_state_up": True}
"""
diff --git a/playbooks/dvr-multinode-scenario-pre-run.yaml b/playbooks/dvr-multinode-scenario-pre-run.yaml
new file mode 100644
index 0000000..8afd8a5
--- /dev/null
+++ b/playbooks/dvr-multinode-scenario-pre-run.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+ roles:
+ - multi-node-setup
diff --git a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml b/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
- tasks:
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml b/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml
deleted file mode 100644
index a9ce3e0..0000000
--- a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: primary
- name: neutron-tempest-plugin-dvr-multinode-scenario
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -e
- set -x
- cat > clonemap.yaml << EOF
- clonemap:
- - name: openstack-infra/devstack-gate
- dest: devstack-gate
- EOF
- /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
- git://git.openstack.org \
- openstack-infra/devstack-gate
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- export PYTHONUNBUFFERED=true
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_CONFIGDRIVE=0
- export DEVSTACK_GATE_TEMPEST_REGEX="(neutron_tempest_plugin.scenario)"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin"
- # Test DVR works multinode
- export DEVSTACK_GATE_NEUTRON_DVR=1
- export BRANCH_OVERRIDE=default
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
- export DEVSTACK_GATE_TOPOLOGY="multinode"
- export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
-
- function gate_hook {
- bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenario-ovs
- }
- export -f gate_hook
-
- function post_test_hook {
- bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenario-ovs
- }
- export -f post_test_hook
-
- cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
- ./safe-devstack-vm-gate-wrap.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/roles/multi-node-setup/README.rst b/roles/multi-node-setup/README.rst
new file mode 100644
index 0000000..b57a977
--- /dev/null
+++ b/roles/multi-node-setup/README.rst
@@ -0,0 +1,23 @@
+Set up connection between infra bridge and Neutron external bridge
+
+Network topology used in CI multinode jobs is described In `Devstack documention
+<https://git.openstack.org/cgit/openstack-infra/devstack-gate/tree/multinode_setup_info.txt#n81>`_
+
+In case when DVR is used, there is also additional bridge ``br-infra`` added
+on each node to provide connectivity to floating IPs from main node.
+
+This bridge needs to be connected with bridge used by Neutron as
+external bridge. Typically it is ``br-ex`` and this role adds patch ports
+between those bridges.
+
+**Role Variables**
+
+.. zuul:rolevar:: neutron_external_bridge_name
+ :default: br-ex
+
+ Name of the Neutron external bridge.
+
+.. zuul:rolevar:: infra_bridge_name
+ :default: br-infra
+
+ Name of the infra bridge.
diff --git a/roles/multi-node-setup/defaults/main.yaml b/roles/multi-node-setup/defaults/main.yaml
new file mode 100644
index 0000000..f166fe7
--- /dev/null
+++ b/roles/multi-node-setup/defaults/main.yaml
@@ -0,0 +1,2 @@
+infra_bridge_name: br-infra
+neutron_external_bridge_name: br-ex
diff --git a/roles/multi-node-setup/tasks/main.yaml b/roles/multi-node-setup/tasks/main.yaml
new file mode 100644
index 0000000..043e70f
--- /dev/null
+++ b/roles/multi-node-setup/tasks/main.yaml
@@ -0,0 +1,17 @@
+- name: Ensure the infra bridge exists
+ become: yes
+ openvswitch_bridge:
+ bridge: "{{ infra_bridge_name }}"
+
+- name: Ensure the Neutron external bridge exists
+ become: yes
+ openvswitch_bridge:
+ bridge: "{{ neutron_external_bridge_name }}"
+
+- name: Create patch port between bridges
+ become: yes
+ command: >-
+ ovs-vsctl --may-exist add-port {{ infra_bridge_name }} patch-{{ neutron_external_bridge_name }}
+ -- set interface patch-{{ neutron_external_bridge_name }} type=patch options:peer=patch-{{ infra_bridge_name }}
+ -- --may-exist add-port {{ neutron_external_bridge_name }} patch-{{ infra_bridge_name }}
+ -- set interface patch-{{ infra_bridge_name }} type=patch options:peer=patch-{{ neutron_external_bridge_name }}
diff --git a/tools/customize_ubuntu_image b/tools/customize_ubuntu_image
index 9c3fd07..3697265 100755
--- a/tools/customize_ubuntu_image
+++ b/tools/customize_ubuntu_image
@@ -31,8 +31,11 @@
chown _apt.root -fR "${apt_user_folders[@]}"
# Install desired packages to Ubuntu guest image
- apt-get update -y
- apt-get install -y "${INSTALL_GUEST_PACKAGES[@]}"
+ (
+ DEBIAN_FRONTEND=noninteractive
+ apt-get update -y
+ apt-get install -y "${INSTALL_GUEST_PACKAGES[@]}"
+ )
}
function main {
@@ -64,9 +67,12 @@
bind_dir "${temp_dir}/tmp" "${mount_dir}/var/tmp"
bind_dir "${temp_dir}/apt" "${mount_dir}/var/lib/apt"
- # Replace /etc/resolv.conf symlink to use the same DNS as this host
- sudo rm -f "${mount_dir}/etc/resolv.conf"
- sudo cp /etc/resolv.conf "${mount_dir}/etc/resolv.conf"
+ # Temporarly replace /etc/resolv.conf symlink to use the same DNS as this
+ # host
+ local resolv_file=${mount_dir}/etc/resolv.conf
+ sudo mv -f "${resolv_file}" "${resolv_file}.orig"
+ sudo cp /etc/resolv.conf "${resolv_file}"
+ add_cleanup sudo mv -f "${resolv_file}.orig" "${resolv_file}"
# Makesure /etc/fstab exists and it is readable because it is required by
# /sbin/dhclient-script
diff --git a/tox.ini b/tox.ini
index 5eb8b10..82a473c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,11 +56,8 @@
# E126 continuation line over-indented for hanging indent
# E128 continuation line under-indented for visual indent
# E129 visually indented line with same indent as next logical line
-# E265 block comment should start with '# '
-# H404 multi line docstring should start with a summary
-# H405 multi line docstring summary not separated with an empty line
# N530 direct neutron imports not allowed
-ignore = E125,E126,E128,E129,E265,H404,H405,N530
+ignore = E125,E126,E128,E129,N530
# H106: Don't put vim configuration in source files
# H203: Use assertIs(Not)None to check for None
# H904: Delay string interpolations at logging calls