openstack/python-neutronclient
Code Issues Proposed changes

Move advanced service functional tests to functional-adv-svcs

Browse Source 
Previously FWaaSv1 readonly functional tests are run as part of
not functional-adv-svcs but functional tests for base neutron.

Change-Id: I19ae76a05e9c261591c5a77bfaac55c4865a400d
This commit is contained in:
Akihiro Motoki 2016-08-25 15:54:22 +09:00
parent 3a76631e48
commit a20f9c5555
5 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
neutronclient/tests/functional/adv-svcs/test_readonly_neutron_fwaas.py Normal file
View File

@ -0,0 +1,37 @@
# 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 neutronclient.tests.functional import base
class SimpleReadOnlyNeutronClientTest(base.ClientTestBase):
"""Tests for FWaaS v1 based client commands that are read only"""
def test_neutron_firewall_list(self):
firewall_list = self.parser.listing(self.neutron
('firewall-list'))
self.assertTableStruct(firewall_list, ['id', 'name',
'firewall_policy_id'])
def test_neutron_firewall_policy_list(self):
firewall_policy = self.parser.listing(self.neutron
('firewall-policy-list'))
self.assertTableStruct(firewall_policy, ['id', 'name',
'firewall_rules'])
def test_neutron_firewall_rule_list(self):
firewall_rule = self.parser.listing(self.neutron
('firewall-rule-list'))
self.assertTableStruct(firewall_rule, ['id', 'name',
'firewall_policy_id',
'summary', 'enabled'])

19
neutronclient/tests/functional/core/test_readonly_neutron.py
View File

@ -103,25 +103,6 @@ class SimpleReadOnlyNeutronClientTest(base.ClientTestBase):
self.assertTableStruct(subnet_list, ['id', 'name', 'cidr',
'allocation_pools'])
def test_neutron_firewall_list(self):
firewall_list = self.parser.listing(self.neutron
('firewall-list'))
self.assertTableStruct(firewall_list, ['id', 'name',
'firewall_policy_id'])
def test_neutron_firewall_policy_list(self):
firewall_policy = self.parser.listing(self.neutron
('firewall-policy-list'))
self.assertTableStruct(firewall_policy, ['id', 'name',
'firewall_rules'])
def test_neutron_firewall_rule_list(self):
firewall_rule = self.parser.listing(self.neutron
('firewall-rule-list'))
self.assertTableStruct(firewall_rule, ['id', 'name',
'firewall_policy_id',
'summary', 'enabled'])
def test_neutron_help(self):
help_text = self.neutron('help')
lines = help_text.split('\n')

2
neutronclient/tests/functional/hooks/fwaas
View File

@ -1,2 +1,2 @@
enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas
enable_service q-fwaas
enable_service q-fwaas

8
neutronclient/tests/functional/hooks/gate_hook.sh
View File

@ -19,14 +19,10 @@ ${config}
"
}
if [ "$VENV" == "functional" ]
then
load_rc_hook fwaas
fi
if [ "$VENV" == "functional-adv-svcs" ]
then
export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas"
load_rc_hook fwaas
load_rc_hook vpnaas
fi
$BASE/new/devstack-gate/devstack-vm-gate.sh

1
neutronclient/tests/functional/hooks/vpnaas Normal file
View File

@ -0,0 +1 @@
enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas