Merge "Use the new services names for sfc"

doc/source/app-opendaylight.rst

@@ -115,8 +115,8 @@ The following config needs to be added to the above described
  neutron_plugin_base:
   - router
   - metering
-  - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-  - networking_sfc.services.sfc.plugin.SfcPlugin
+  - flow_classifier
+  - sfc
 
 When using this configuration, networking-sfc will be deployed and SFC features
 will be activated in ODL. A SFC topology could be then set up through the

doc/source/app-openvswitch-sfc.rst

@@ -55,8 +55,8 @@ Set the following user variables in your
   neutron_plugin_base:
    - router
    - metering
-   - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-   - networking_sfc.services.sfc.plugin.SfcPlugin
+   - flow_classifier
+   - sfc
 
   # Typically this would be defined by the os-neutron-install
   # playbook. The provider_networks library would parse the

releasenotes/notes/neutron-opendaylight-sfc-support-8b249b8f8efbc087.yaml

@@ -0,0 +1,29 @@
+---
+features:
+  - |
+    The Neutron Service Function Chaining Extension (SFC) can optionally be deployed and
+    configured by defining the following service plugins:
+
+    * ``flow_classifier``
+    * ``sfc``
+
+    .. code-block:: yaml
+
+      neutron_plugin_base:
+      - router
+      - metering
+      - flow_classifier
+      - sfc
+
+    For more information about SFC in Neutron, refer to the following:
+
+    * `Service Function Chaining Extension for OpenStack Networking
+      <https://docs.openstack.org/networking-sfc/latest/>`_
+
+upgrade:
+  - |
+    The plugin names for the classifier and sfc changed:
+
+    * networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin => flow_classifier
+
+    * networking_sfc.services.sfc.plugin.SfcPlugin => sfc

tasks/providers/opendaylight_config.yml

@@ -17,7 +17,7 @@
   set_fact:
     neutron_optional_combined_pip_packages: |-
       {% set packages = neutron_optional_opendaylight_pip_packages %}
-      {% if 'networking_sfc.services.sfc.plugin.SfcPlugin' in neutron_plugin_base %}
+      {% if 'sfc' in neutron_plugin_base %}
       {% set _ = packages.extend(neutron_optional_sfc_pip_packages) %}
       {% endif %}
       {{ packages }}

tasks/providers/setup_ovs_opendaylight.yml

@@ -48,5 +48,5 @@
 - name: Set the of-tunnel to true
   command: "ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
   when:
-    - neutron_plugin_base == 'networking_sfc.services.sfc.plugin.SfcPlugin'
+    - neutron_plugin_base == 'sfc'
 

templates/neutron.conf.j2

@@ -269,7 +269,7 @@ transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_
 [oslo_concurrency]
 lock_path = {{ neutron_lock_path }}
 
-{% if neutron_services['neutron-server']['group'] in group_names and 'networking_sfc.services.sfc.plugin.SfcPlugin' in neutron_plugin_base %}
+{% if neutron_services['neutron-server']['group'] in group_names and 'sfc' in neutron_plugin_base %}
 # ODL-SFC
 [sfc]
 drivers = {{ (neutron_plugin_type == 'ml2.opendaylight') | ternary('odl_v2', 'ovs') }}

templates/plugins/ml2/openvswitch_agent.ini.j2

@@ -19,7 +19,7 @@ enable_distributed_routing = {{ neutron_plugins[neutron_plugin_type].router_dist
 {% if 'qos' in neutron_plugin_base                                          %}
 {% set _ = ovs_agent_extensions.append("qos")                               %}
 {% endif                                                                    %}
-{% if 'networking_sfc.services.sfc.plugin.SfcPlugin' in neutron_plugin_base %}
+{% if 'sfc' in neutron_plugin_base %}
 {% set _ = ovs_agent_extensions.append("sfc")                               %}
 {% endif                                                                    %}
 extensions = {{ ovs_agent_extensions | join(',') }}

tests/neutron-overrides-odl-sfc.yml

@@ -28,8 +28,8 @@ neutron_opendaylight_conf_ini_overrides:
 neutron_plugin_base:
   - router
   - metering
-  - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-  - networking_sfc.services.sfc.plugin.SfcPlugin
+  - sfc
+  - flow_classifier
 
 tempest_run: yes
 

tests/neutron-overrides-ovs-sfc.yml

@@ -24,8 +24,8 @@ group: "physical_host"
 neutron_plugin_base:
   - router
   - metering
-  - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-  - networking_sfc.services.sfc.plugin.SfcPlugin
+  - sfc
+  - flow_classifier
 
 tempest_run: yes
 

vars/main.yml

@@ -191,7 +191,7 @@ neutron_tunnel_types: "{{ neutron_ml2_drivers_type.split(',') | difference(_neut
 # OpenDaylight
 opendaylight_extra_features: |-
   {%- set features = ['odl-netvirt-openstack'] -%}
-  {%- if 'networking_sfc.services.sfc.plugin.SfcPlugin' in neutron_plugin_base -%}
+  {%- if 'sfc' in neutron_plugin_base -%}
     {%- set features = ['odl-netvirt-sfc'] -%}
   {%- endif -%}
   {{ features }}
@@ -285,7 +285,7 @@ neutron_port_forwarding: "{{ ('port_forwarding' in neutron_plugin_base) | ternar
 ### Service Function Chaining
 ###
 
-neutron_sfc: "{{ ('networking_sfc.services.sfc.plugin.SfcPlugin' in neutron_plugin_base) | ternary('True', 'False') }}"
+neutron_sfc: "{{ ('sfc' in neutron_plugin_base) | ternary('True', 'False') }}"
 
 ###
 ### Services info