From a1d65ba210ee6c2ebba5e4dd31c9843c3e7ad8f8 Mon Sep 17 00:00:00 2001 From: elajkat Date: Tue, 4 Feb 2020 14:06:33 +0100 Subject: [PATCH] Remove duplicate QoS backend support table Remove the duplicated QoS supported rules and directions from contributor/internals/quality_of_service page as the table is already in admin/config-qos page. Change-Id: I927b90877afb8bfeedb9b9ed0327650780972852 --- doc/source/admin/config-qos.rst | 32 ++++++++++++----- .../internals/quality_of_service.rst | 35 +++---------------- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/doc/source/admin/config-qos.rst b/doc/source/admin/config-qos.rst index e3dd22aaf57..d9600578a7c 100644 --- a/doc/source/admin/config-qos.rst +++ b/doc/source/admin/config-qos.rst @@ -49,20 +49,34 @@ traffic directions (from the VM point of view). .. table:: **Networking back ends, supported rules, and traffic direction** - ==================== =================== ================ =================== - Rule \\ back end Open vSwitch SR-IOV Linux bridge - ==================== =================== ================ =================== - Bandwidth limit Egress \\ Ingress Egress (1) Egress \\ Ingress - Minimum bandwidth Egress (2) Egress - - DSCP marking Egress - Egress - ==================== =================== ================ =================== + ==================== ======================= ======================= =================== + Rule \\ back end Open vSwitch SR-IOV Linux bridge + ==================== ======================= ======================= =================== + Bandwidth limit Egress \\ Ingress Egress (1) Egress \\ Ingress + Minimum bandwidth Egress \\ Ingress (2) Egress \\ Ingress (2) - + DSCP marking Egress - Egress + ==================== ======================= ======================= =================== .. note:: (1) Max burst parameter is skipped because it is not supported by the IP tool. - (2) Only for physical bridges (tenant networks, provider networks), tunneled - traffic is not shaped yet. + (2) Placement based enforcement works for both egress and ingress directions, + but dataplane enforcement depends on the backend. + +.. table:: **Neutron backends, supported directions and enforcement types for Minimum Bandwidth rule** + + ============================ ==================== ==================== ============== + Enforcement type \ Backend Open vSwitch SR-IOV Linux Bridge + ============================ ==================== ==================== ============== + Dataplane - Egress (1) - + Placement Egress/Ingress (2) Egress/Ingress (2) - + ============================ ==================== ==================== ============== + +.. note:: + + (1) Since Newton + (2) Since Stein In the most simple case, the property can be represented by a simple Python list defined on the class. diff --git a/doc/source/contributor/internals/quality_of_service.rst b/doc/source/contributor/internals/quality_of_service.rst index 889ad8cc869..b17039cbb55 100644 --- a/doc/source/contributor/internals/quality_of_service.rst +++ b/doc/source/contributor/internals/quality_of_service.rst @@ -295,37 +295,10 @@ interface: * SR-IOV (QosSRIOVAgentDriver); * Linux bridge (QosLinuxbridgeAgentDriver). -Table of Neutron backends, supported rules and traffic direction (from the VM -point of view) -:: - - +----------------------+--------------------+--------------------+--------------------+ - | Rule \ Backend | Open vSwitch | SR-IOV | Linux Bridge | - +----------------------+--------------------+--------------------+--------------------+ - | Bandwidth Limit | Egress/Ingress | Egress (1) | Egress/Ingress | - +----------------------+--------------------+--------------------+--------------------+ - | Minimum Bandwidth | Egress/Ingress (2) | Egress/Ingress (2) | - | - +----------------------+--------------------+--------------------+--------------------+ - | DSCP Marking | Egress | - | Egress | - +----------------------+--------------------+--------------------+--------------------+ - - (1) Max burst parameter is skipped because it's not supported by ip tool. - (2) Placement based enforcement works for both egress and ingress directions, - but dataplane enforcement depends on the backend. - -Table of Neutron backends, supported directions and enforcement types for -Minimum Bandwidth rule -:: - - +----------------------------+----------------+----------------+----------------+ - | Enforcement type \ Backend | Open vSwitch | SR-IOV | Linux Bridge | - +----------------------------+----------------+----------------+----------------+ - | Dataplane | - | Egress | - | - | | | (Newton+) | | - +----------------------------+----------------+----------------+----------------+ - | Placement | Egress/Ingress | Egress/Ingress | - | - | | (Stein+) | (Stein+) | | - +----------------------------+----------------+----------------+----------------+ +For the Networking back ends, QoS supported rules, and traffic directions +(from the VM point of view), please see the table: +`Networking back ends, supported rules, and traffic direction +<../../admin/config-qos.html#id1>`_. Open vSwitch