openstack/neutron-fwaas
Code Issues Proposed changes

Revert "Set NETWORK_API_EXTENSIONS in fwaas devstack plugin"

Browse Source 
This reverts commit 8bf87a0b05.

Becauase setting NETWORK_API_EXTENSIONS unconditionally
interferes other subprojects.  (networking-midonet gate is
broken due to this.)

We can't hardcode the list of extensions here because a devstack
plugin can be used with other devstack plugins.  This stuff
actually belongs to gate, where we know our exact configuration,
thus the list of extensions.

Also, skip fwaas v2 tempest tests for now.
(Otherwise v1 tempest job would fail.)

Closes-Bug: #1643844
Change-Id: I300e1eee1314440c22e2b30b683969b83e84ea5f
This commit is contained in:
YAMAMOTO Takashi 2016-11-22 12:19:26 +00:00
parent 7880f27d15
commit 642e09d411
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -39,17 +39,13 @@ function install_fwaas() {
}
function configure_fwaas_v1() {
echo_summary "Configuring q-fwaas for FWaaS v1"
neutron_fwaas_configure_driver fwaas
iniset_multiline $Q_L3_CONF_FILE fwaas agent_version v1
NETWORK_API_EXTENSIONS+=,fwaas,fwaasrouterinsertion
}
function configure_fwaas_v2() {
echo_summary "Configuring q-fwaas for FWaaS v2"
neutron_fwaas_configure_driver fwaas_v2
iniset_multiline $Q_L3_CONF_FILE fwaas agent_version v2
NETWORK_API_EXTENSIONS+=,fwaas_v2
}
function init_fwaas() {
@ -104,10 +100,13 @@ if is_service_enabled q-svc && ( is_service_enabled q-fwaas || is_service_enable
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured
if is_service_enabled q-fwaas-v1; then
echo_summary "Configuring q-fwaas for FWaaS v1"
configure_fwaas_v1
elif is_service_enabled q-fwaas-v2; then
echo_summary "Configuring q-fwaas for FWaaS v2"
configure_fwaas_v2
else
echo_summary "Configuring q-fwaas for FWaaS v1"
configure_fwaas_v1
fi

10
devstack/settings
View File

@ -1,13 +1,3 @@
FWAAS_DRIVER=${FWAAS_DRIVER:-iptables}
FWAAS_PLUGIN_V1=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}
FWAAS_PLUGIN_V2=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin_v2.FirewallPluginV2}
NETWORK_API_EXTENSIONS=agent,binding,dhcp_agent_scheduler,external-net
NETWORK_API_EXTENSIONS+=,ext-gw-mode,extra_dhcp_opts,quotas,router
NETWORK_API_EXTENSIONS+=,security-group,subnet_allocation
NETWORK_API_EXTENSIONS+=,network-ip-availability,auto-allocated-topology
NETWORK_API_EXTENSIONS+=,timestamp_core,tag,service-type,rbac-policies
NETWORK_API_EXTENSIONS+=,standard-attr-description
NETWORK_API_EXTENSIONS+=,pagination
NETWORK_API_EXTENSIONS+=,sorting
NETWORK_API_EXTENSIONS+=,project-id

1
neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py
View File

@ -55,6 +55,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
@classmethod
def resource_setup(cls):
raise cls.skipException("bug 1643844")
super(FWaaSv2ExtensionTestJSON, cls).resource_setup()
if not test.is_extension_enabled('fwaas_v2', 'network'):
msg = "FWaaS v2 Extension not enabled."