Set Octavia as the reference LBaaSv2 driver
Requires skipping some of the pool tests as they are taking too long. We will need to revisit those and find a way to re-enable them. Sets up a minimal set of "happy path" tests for neutron gate Depends-On: Ifce40b0af9da715d44bab8ec437f844ccf638f52 Depends-On: I0434b8ced144ab08413b91569bd008295ef1784e Change-Id: I8e72a63f3ac9d3b605779b49112a1f9924845c5c Implements: blueprint lbaas-ref-octavia
This commit is contained in:
Michael Johnson
parent
10c4a1e4b4
commit
70c601b1fb
|
|
@ -72,6 +72,7 @@ Vagrant.configure(2) do |config|
|
|||
|
||||
git clone https://git.openstack.org/openstack-dev/devstack
|
||||
git clone https://git.openstack.org/openstack/neutron-lbaas
|
||||
git clone https://github.com/openstack/octavia
|
||||
|
||||
cd neutron-lbaas/devstack/samples
|
||||
cp local.* webserver.sh ~/devstack
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ RECLONE=True
|
|||
# Load the external LBaaS plugin.
|
||||
|
||||
enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
|
||||
enable_plugin octavia https://github.com/openstack/octavia
|
||||
|
||||
LIBS_FROM_GIT+=python-neutronclient
|
||||
DATABASE_PASSWORD=password
|
||||
|
|
@ -47,6 +48,8 @@ ENABLED_SERVICES+=,q-svc,q-agt,q-dhcp,q-l3,q-meta
|
|||
ENABLED_SERVICES+=,q-lbaasv2
|
||||
# Cinder
|
||||
ENABLED_SERVICES+=,c-api,c-vol,c-sch
|
||||
# Octavia
|
||||
ENABLED_SERVICES+=,octavia,o-cw,o-hk,o-hm,o-api
|
||||
|
||||
# enable DVR
|
||||
|
||||
|
|
|
|||
|
|
@ -71,14 +71,31 @@ if is_service_enabled nova; then
|
|||
|
||||
fi
|
||||
|
||||
function wait_for_lb_active {
|
||||
echo "Waiting for $1 to become ACTIVE..."
|
||||
status=$(neutron lbaas-loadbalancer-show $1 | awk '/provisioning_status/ {print $4}')
|
||||
while [ "$status" != "ACTIVE" ]
|
||||
do
|
||||
sleep 2
|
||||
status=$(neutron lbaas-loadbalancer-show $1 | awk '/provisioning_status/ {print $4}')
|
||||
if [ $status == "ERROR" ]
|
||||
then
|
||||
echo "$1 ERRORED. Exiting."
|
||||
exit 1;
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
if is_service_enabled q-lbaasv2; then
|
||||
|
||||
neutron lbaas-loadbalancer-create --name lb1 ${SUBNET_NAME}
|
||||
sleep 10
|
||||
wait_for_lb_active "lb1"
|
||||
neutron lbaas-listener-create --loadbalancer lb1 --protocol HTTP --protocol-port 80 --name listener1
|
||||
sleep 10
|
||||
neutron lbaas-pool-create --lb-algorithm ROUND_ROBIN --listener listener1 --protocol HTTP --name pool1
|
||||
sleep 10
|
||||
neutron lbaas-member-create --subnet ${SUBNET_NAME} --address ${IP1} --protocol-port 80 pool1
|
||||
sleep 10
|
||||
neutron lbaas-member-create --subnet ${SUBNET_NAME} --address ${IP2} --protocol-port 80 pool1
|
||||
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas
|
|||
NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/neutron_lbaas.conf
|
||||
|
||||
NEUTRON_LBAAS_SERVICE_PROVIDERV1=${NEUTRON_LBAAS_SERVICE_PROVIDERV1:-"LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"}
|
||||
NEUTRON_LBAAS_SERVICE_PROVIDERV2=${NEUTRON_LBAAS_SERVICE_PROVIDERV2:-"LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"}
|
||||
NEUTRON_LBAAS_SERVICE_PROVIDERV2=${NEUTRON_LBAAS_SERVICE_PROVIDERV2:-"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default"}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ fi
|
|||
export DEVSTACK_LOCAL_CONFIG+="
|
||||
enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
|
||||
enable_plugin barbican https://git.openstack.org/openstack/barbican
|
||||
enable_plugin octavia https://git.openstack.org/openstack/octavia
|
||||
IMAGE_URLS+=\",http://g8de985af226d635b09bbb525b05dc4af.cdn.hpcloudsvc.com/amphora/amphora-x64-haproxy.qcow2\"
|
||||
"
|
||||
|
||||
if [ "$testenv" != "apiv1" ]; then
|
||||
|
|
@ -27,7 +29,10 @@ if [ "$testenv" != "apiv1" ]; then
|
|||
ENABLED_SERVICES+="q-lbaasv2,-q-lbaas"
|
||||
ENABLED_SERVICES+=",-c-api,-c-bak,-c-sch,-c-vol,-cinder"
|
||||
ENABLED_SERVICES+=",-s-account,-s-container,-s-object,-s-proxy"
|
||||
ENABLED_SERVICES+=",octavia,o-cw,o-hk,o-hm,o-api"
|
||||
export ENABLED_SERVICES
|
||||
VOLUME_BACKING_FILE_SIZE=24G
|
||||
export VOLUME_BACKING_FILE_SIZE
|
||||
fi
|
||||
|
||||
$GATE_DEST/devstack-gate/devstack-vm-gate.sh
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ set -xe
|
|||
NEUTRON_LBAAS_DIR="$BASE/new/neutron-lbaas"
|
||||
TEMPEST_CONFIG_DIR="$BASE/new/tempest/etc"
|
||||
SCRIPTS_DIR="/usr/os-testr-env/bin"
|
||||
OCTAVIA_DIR="$BASE/new/octavia"
|
||||
|
||||
LBAAS_VERSION=$1
|
||||
LBAAS_TEST=$2
|
||||
|
|
@ -20,8 +21,14 @@ else
|
|||
test_subset="load_balancers"
|
||||
;;
|
||||
minimal)
|
||||
# Temporarily just do LBs until we pick a representative subset
|
||||
test_subset="load_balancers"
|
||||
# Temporarily just do the happy path
|
||||
test_subset="neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_create_load_balancer "
|
||||
test_subset+="neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_get_load_balancer_stats "
|
||||
test_subset+="neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_get_load_balancer_status_tree "
|
||||
test_subset+="neutron_lbaas.tests.tempest.v2.api.test_listeners_non_admin.ListenersTestJSON.test_create_listener "
|
||||
test_subset+="neutron_lbaas.tests.tempest.v2.api.test_pools_non_admin.TestPools.test_create_pool "
|
||||
test_subset+="neutron_lbaas.tests.tempest.v2.api.test_members_non_admin.MemberTestJSON.test_add_member "
|
||||
test_subset+="neutron_lbaas.tests.tempest.v2.api.test_health_monitors_non_admin.TestHealthMonitors.test_create_health_monitor"
|
||||
;;
|
||||
healthmonitor)
|
||||
test_subset="health_monitor"
|
||||
|
|
@ -65,6 +72,7 @@ owner=tempest
|
|||
# Set owner permissions according to job's requirements.
|
||||
cd $NEUTRON_LBAAS_DIR
|
||||
sudo chown -R $owner:stack $NEUTRON_LBAAS_DIR
|
||||
sudo chown -R $owner:stack $OCTAVIA_DIR
|
||||
|
||||
sudo_env=" OS_TESTR_CONCURRENCY=1"
|
||||
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertIn(new_pool, pools)
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_list_pools_two(self):
|
||||
"""Test get pools with two pools"""
|
||||
|
|
@ -127,6 +128,7 @@ class TestPools(base.BaseTestCase):
|
|||
tenant_id=tenant_id,
|
||||
lb_algorithm='ROUND_ROBIN')
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_create_pool_missing_tenant_field(self):
|
||||
"""Test create pool with a missing required tenant field"""
|
||||
|
|
@ -139,6 +141,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(tenant_id, pool_tenant)
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_create_pool_missing_protocol_field(self):
|
||||
"""Test create pool with a missing required protocol field"""
|
||||
|
|
@ -154,6 +157,7 @@ class TestPools(base.BaseTestCase):
|
|||
listener_id=listener_id,
|
||||
lb_algorithm='ROUND_ROBIN')
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_create_pool_missing_lb_algorithm_field(self):
|
||||
"""Test create pool with a missing required lb algorithm field"""
|
||||
|
|
@ -178,6 +182,7 @@ class TestPools(base.BaseTestCase):
|
|||
lb_algorithm='ROUND_ROBIN',
|
||||
protocol='HTTP')
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_create_pool_missing_description_field(self):
|
||||
"""Test create pool with missing description field"""
|
||||
|
|
@ -188,6 +193,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(desc, "")
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_create_pool_missing_name_field(self):
|
||||
"""Test create pool with a missing name field"""
|
||||
|
|
@ -198,6 +204,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(name, "")
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_create_pool_missing_admin_state_up_field(self):
|
||||
"""Test create pool with a missing admin_state_up field"""
|
||||
|
|
@ -208,6 +215,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(state, True)
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_create_pool_missing_session_pers_field(self):
|
||||
"""Test create pool with a missing session_pers field"""
|
||||
|
|
@ -258,6 +266,7 @@ class TestPools(base.BaseTestCase):
|
|||
protocol='HTTP',
|
||||
listener_id="$@5$%$7863")
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_create_pool_invalid_tenant_id_field(self):
|
||||
"""Test create pool with invalid tenant_id field"""
|
||||
|
|
@ -441,6 +450,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(desc, pool.get('description'))
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_pool_missing_name(self):
|
||||
"""Test update pool with missing name"""
|
||||
|
|
@ -452,6 +462,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(name, pool.get('name'))
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_pool_missing_description(self):
|
||||
"""Test update pool with missing description"""
|
||||
|
|
@ -463,6 +474,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(desc, pool.get('description'))
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_pool_missing_admin_state_up(self):
|
||||
"""Test update pool with missing admin state up field"""
|
||||
|
|
@ -474,6 +486,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(admin, pool.get('admin_state_up'))
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_pool_missing_session_persistence(self):
|
||||
"""Test update pool with missing session persistence"""
|
||||
|
|
@ -504,6 +517,7 @@ class TestPools(base.BaseTestCase):
|
|||
description='d' * 256)
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_update_pool_invalid_admin_state_up(self):
|
||||
"""Test update pool with an invalid admin_state_up"""
|
||||
|
|
@ -512,6 +526,7 @@ class TestPools(base.BaseTestCase):
|
|||
new_pool.get('id'), admin_state_up='hello')
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_update_pool_invalid_session_persistence(self):
|
||||
"""Test update pool with an invalid session pers. field"""
|
||||
|
|
@ -521,6 +536,7 @@ class TestPools(base.BaseTestCase):
|
|||
session_persistence={'type': 'Hello'})
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_pool_empty_name(self):
|
||||
"""Test update pool with empty name"""
|
||||
|
|
@ -530,6 +546,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(pool.get('name'), "")
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_pool_empty_description(self):
|
||||
"""Test update pool with empty description"""
|
||||
|
|
@ -540,6 +557,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertEqual(pool.get('description'), "")
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_update_pool_empty_admin_state_up(self):
|
||||
"""Test update pool with empty admin state up"""
|
||||
|
|
@ -548,6 +566,7 @@ class TestPools(base.BaseTestCase):
|
|||
new_pool.get('id'), admin_state_up="")
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_update_pool_empty_session_persistence(self):
|
||||
"""Test update pool with empty session persistence field"""
|
||||
|
|
@ -557,6 +576,7 @@ class TestPools(base.BaseTestCase):
|
|||
session_persistence="")
|
||||
self.pools_client.delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_update_pool_invalid_attribute(self):
|
||||
"""Test update pool with an invalid attribute"""
|
||||
|
|
@ -565,6 +585,7 @@ class TestPools(base.BaseTestCase):
|
|||
new_pool.get('id'), lb_algorithm='ROUNDED')
|
||||
self._delete_pool(new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='negative')
|
||||
def test_update_pool_incorrect_attribute(self):
|
||||
"""Test update a pool with an extra, incorrect field"""
|
||||
|
|
@ -583,6 +604,7 @@ class TestPools(base.BaseTestCase):
|
|||
self.assertRaises(ex.NotFound, self.pools_client.get_pool,
|
||||
new_pool.get('id'))
|
||||
|
||||
@decorators.skip_because(bug="1497471")
|
||||
@test.attr(type='smoke')
|
||||
def test_delete_invalid_pool(self):
|
||||
"""Test delete pool that doesn't exist"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue