From 28700a0117a6ac06523bd697011500c9916db5e2 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 6 May 2018 10:01:55 +0300 Subject: [PATCH] Integrate with FWaaS plugable driver FWaaS-v2 configuration & pathes changed. This patch updates the import actions and devstack instructions. Change-Id: Ib3d216c818d0477b3cb6cbe6c4fae10bec94fad9 Depends-On: I4ebd24f1b13eb823c4d63452fd37cace5bcf5481 --- doc/source/devstack.rst | 6 ++++++ vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v1.py | 3 ++- vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v2.py | 3 ++- vmware_nsx/services/fwaas/nsx_v/edge_fwaas_driver.py | 3 ++- vmware_nsx/services/fwaas/nsx_v3/edge_fwaas_driver_base.py | 3 ++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/source/devstack.rst b/doc/source/devstack.rst index 16b21ffccc..6035176229 100644 --- a/doc/source/devstack.rst +++ b/doc/source/devstack.rst @@ -197,6 +197,9 @@ Add neutron-fwaas repo as an external repository and configure following flags i enabled = True driver = vmware_nsxv3_edge_v2 + [service_providers] + service_provider = FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default + LBaaS v2 Driver ~~~~~~~~~~~~~~~ @@ -278,6 +281,9 @@ Add neutron-fwaas repo as an external repository and configure following flags i [DEFAULT] api_extensions_path = $DEST/neutron-fwaas/neutron_fwaas/extensions + [service_providers] + service_provider = FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default + L2GW Driver ~~~~~~~~~~~ diff --git a/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v1.py b/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v1.py index 998142d5c7..288d0c91fa 100644 --- a/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v1.py +++ b/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v1.py @@ -27,7 +27,8 @@ LOG = logging.getLogger(__name__) FWAAS_DRIVER_NAME = 'FwaaS V1 NSX-TV driver' try: - from neutron_fwaas.services.firewall.drivers import fwaas_base + from neutron_fwaas.services.firewall.service_drivers.agents.drivers \ + import fwaas_base except ImportError: # FWaaS project no found from vmware_nsx.services.fwaas.common import fwaas_mocks \ diff --git a/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v2.py b/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v2.py index edb1ca3a3f..ba5e12da21 100644 --- a/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v2.py +++ b/vmware_nsx/services/fwaas/nsx_tv/edge_fwaas_driver_v2.py @@ -26,7 +26,8 @@ LOG = logging.getLogger(__name__) FWAAS_DRIVER_NAME = 'FwaaS V2 NSX-TV driver' try: - from neutron_fwaas.services.firewall.drivers import fwaas_base_v2 + from neutron_fwaas.services.firewall.service_drivers.agents.drivers \ + import fwaas_base_v2 except ImportError: # FWaaS project no found from vmware_nsx.services.fwaas.common import fwaas_mocks \ diff --git a/vmware_nsx/services/fwaas/nsx_v/edge_fwaas_driver.py b/vmware_nsx/services/fwaas/nsx_v/edge_fwaas_driver.py index 14f5771160..562efb297b 100644 --- a/vmware_nsx/services/fwaas/nsx_v/edge_fwaas_driver.py +++ b/vmware_nsx/services/fwaas/nsx_v/edge_fwaas_driver.py @@ -28,7 +28,8 @@ FWAAS_DRIVER_NAME = 'Fwaas V1 NSX-V driver' RULE_NAME_PREFIX = 'Fwaas-' try: - from neutron_fwaas.services.firewall.drivers import fwaas_base + from neutron_fwaas.services.firewall.service_drivers.agents.drivers \ + import fwaas_base except ImportError: # FWaaS project no found from vmware_nsx.services.fwaas.common import fwaas_mocks \ diff --git a/vmware_nsx/services/fwaas/nsx_v3/edge_fwaas_driver_base.py b/vmware_nsx/services/fwaas/nsx_v3/edge_fwaas_driver_base.py index eb5eee63a8..13240cc50b 100644 --- a/vmware_nsx/services/fwaas/nsx_v3/edge_fwaas_driver_base.py +++ b/vmware_nsx/services/fwaas/nsx_v3/edge_fwaas_driver_base.py @@ -30,7 +30,8 @@ RULE_NAME_PREFIX = 'Fwaas-' DEFAULT_RULE_NAME = 'Default LR Layer3 Rule' try: - from neutron_fwaas.services.firewall.drivers import fwaas_base + from neutron_fwaas.services.firewall.service_drivers.agents.drivers \ + import fwaas_base except ImportError: # FWaaS project no found from vmware_nsx.services.fwaas.common import fwaas_mocks \