openstack
/
neutron-dynamic-routing
Code Issues Proposed changes

Merge "Use "docker network" in scenario test"

This commit is contained in:
Jenkins 2017-07-11 22:33:29 +00:00 committed by Gerrit Code Review
parent 56d25dcd35 6bd61b89b8
commit 928b053c00
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron_dynamic_routing/tests/contrib/gate_hook.sh
View File

@ -71,13 +71,16 @@ EOF
}
function configure_docker_test_env {
if ! pip freeze | grep ryu > /dev/null
then
sudo pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt ryu
fi
RYU_PATH=`pip show ryu | grep Location | cut -d' ' -f2`/ryu
local docker_pkg
sudo bash -c 'echo "tempest ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers'
bash $RYU_PATH/tests/integrated/common/install_docker_test_pkg.sh --sudo-pip
sudo apt-get update
if apt-cache search docker-engine | grep docker-engine; then
docker_pkg=docker-engine
else
docker_pkg=docker.io
fi
sudo apt-get install -y $docker_pkg
}
function do_devstack_gate {
@ -111,9 +114,7 @@ then
elif [[ "$VENV" == dsvm-api* ]]
then
configure_docker_test_env
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORK_API_EXTENSIONS=all"
$GATE_DEST/devstack-gate/devstack-vm-gate.sh
elif [[ "$VENV" == dsvm-scenario* ]]

1
neutron_dynamic_routing/tests/tempest/scenario/base.py
View File

@ -38,6 +38,7 @@ AS = collections.namedtuple('AS', 'asn, router_id, adv_net')
CHECKTIME = 180
CHECKTIME_INFO = 60
CHECKTIME_INT = 1
BRIDGE_TYPE = ctn_base.BRIDGE_TYPE_DOCKER
def _setup_client_args(auth_provider):

2
neutron_dynamic_routing/tests/tempest/scenario/basic/base.py
View File

@ -74,7 +74,7 @@ class BgpSpeakerBasicTestJSONBase(base.BgpSpeakerScenarioTestJSONBase):
end_ip='192.168.10.254',
self_ip=True,
fixed_ip=cls.public_gw + '/24',
br_type=ctn_base.BRIDGE_TYPE_OVS)
br_type=base.BRIDGE_TYPE)
cls.bridges.append(cls.brdc)
# This is dummy container object for a dr service.
# This keeps data which passes to a quagga container.

2
neutron_dynamic_routing/tests/tempest/scenario/ipv4/test_ipv4.py
View File

@ -82,7 +82,7 @@ class BgpSpeakerIpv4Test(test_base.BgpSpeakerProtoTestBase):
end_ip='192.168.10.254',
self_ip=True,
fixed_ip=cls.public_gw + '/24',
br_type=ctn_base.BRIDGE_TYPE_OVS)
br_type=base.BRIDGE_TYPE)
cls.bridges.append(cls.brdc)
# This is dummy container object for a dr service.
# This keeps data which passes to a quagga container.

2
neutron_dynamic_routing/tests/tempest/scenario/ipv6/test_ipv6.py
View File

@ -82,7 +82,7 @@ class BgpSpeakerIpv6Test(test_base.BgpSpeakerProtoTestBase):
end_ip='2001:db8:a000::fffe',
self_ip=True,
fixed_ip=cls.public_gw + '/64',
br_type=ctn_base.BRIDGE_TYPE_OVS)
br_type=base.BRIDGE_TYPE)
cls.bridges.append(cls.brdc)
# This is dummy container object for a dr service.
# This keeps data which passes to a quagga container.

1
test-requirements.txt
View File

@ -22,3 +22,4 @@ WebTest>=2.0 # MIT
oslotest>=1.10.0 # Apache-2.0
reno!=2.3.1,>=1.8.0 # Apache-2.0
tempest>=14.0.0 # Apache-2.0
ryu>=4.14 # Apache-2.0