From b0eaf6e1534b472f45923267ab38bbee5c04fa83 Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Fri, 12 Aug 2022 10:56:18 +0200
Subject: [PATCH] Add DSCP mark 44

Added a new DSCP mark value: 44. This new mark value was included
recently in the RFC5865 [1].

[1]https://www.rfc-editor.org/rfc/rfc5865.html

Change-Id: Ieba8835cbb5a71e83791324ed1fcbb983afe19fa
Closes-Bug: #1987378
---
 api-ref/source/v2/qos.inc                     | 12 ++++++--
 ...ype-details-bandwidth_limit-response.json} |  0
 ...le_type-details-dscp_marking-response.json | 29 +++++++++++++++++++
 neutron_lib/constants.py                      |  2 +-
 .../qos-dscp-mark-44-56934a357af4b1ee.yaml    |  5 ++++
 5 files changed, 44 insertions(+), 4 deletions(-)
 rename api-ref/source/v2/samples/qos/{rule_type-details-response.json => rule_type-details-bandwidth_limit-response.json} (100%)
 create mode 100644 api-ref/source/v2/samples/qos/rule_type-details-dscp_marking-response.json
 create mode 100644 releasenotes/notes/qos-dscp-mark-44-56934a357af4b1ee.yaml

diff --git a/api-ref/source/v2/qos.inc b/api-ref/source/v2/qos.inc
index 6b1a896c7..4463a2ff6 100644
--- a/api-ref/source/v2/qos.inc
+++ b/api-ref/source/v2/qos.inc
@@ -88,10 +88,16 @@ Response Parameters
    - type: qos-rule-type
    - drivers: qos-backend-drivers
 
-Response Example
-----------------
+Response Example (type "bandwidth_limit")
+-----------------------------------------
 
-.. literalinclude:: samples/qos/rule_type-details-response.json
+.. literalinclude:: samples/qos/rule_type-details-bandwidth_limit-response.json
+   :language: javascript
+
+Response Example (type "dscp_marking")
+--------------------------------------
+
+.. literalinclude:: samples/qos/rule_type-details-dscp_marking-response.json
    :language: javascript
 
 ==================
diff --git a/api-ref/source/v2/samples/qos/rule_type-details-response.json b/api-ref/source/v2/samples/qos/rule_type-details-bandwidth_limit-response.json
similarity index 100%
rename from api-ref/source/v2/samples/qos/rule_type-details-response.json
rename to api-ref/source/v2/samples/qos/rule_type-details-bandwidth_limit-response.json
diff --git a/api-ref/source/v2/samples/qos/rule_type-details-dscp_marking-response.json b/api-ref/source/v2/samples/qos/rule_type-details-dscp_marking-response.json
new file mode 100644
index 000000000..6fe956993
--- /dev/null
+++ b/api-ref/source/v2/samples/qos/rule_type-details-dscp_marking-response.json
@@ -0,0 +1,29 @@
+{
+    "drivers": [
+        {
+            "name": "openvswitch",
+            "supported_parameters": [
+                {
+                    "parameter_name": "dscp_mark",
+                    "parameter_type": "choices",
+                    "parameter_values": [
+                        0, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 44, 46, 48, 56
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "linuxbridge",
+            "supported_parameters": [
+                {
+                    "parameter_name": "dscp_mark",
+                    "parameter_type": "choices",
+                    "parameter_values": [
+                        0, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 44, 46, 48, 56
+                    ]
+                }
+            ]
+        }
+    ],
+    "type": "dscp_marking"
+}
diff --git a/neutron_lib/constants.py b/neutron_lib/constants.py
index ff52f64b1..08e0ad8e3 100644
--- a/neutron_lib/constants.py
+++ b/neutron_lib/constants.py
@@ -357,7 +357,7 @@ DNS_LABEL_REGEX = "^([a-z0-9-]{1,%d}|%s)$" % (
 PORT_MAX = 2**16 - 1
 
 VALID_DSCP_MARKS = [0, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34,
-                    36, 38, 40, 46, 48, 56]
+                    36, 38, 40, 44, 46, 48, 56]
 
 INGRESS_DIRECTION = 'ingress'
 EGRESS_DIRECTION = 'egress'
diff --git a/releasenotes/notes/qos-dscp-mark-44-56934a357af4b1ee.yaml b/releasenotes/notes/qos-dscp-mark-44-56934a357af4b1ee.yaml
new file mode 100644
index 000000000..ebde7562e
--- /dev/null
+++ b/releasenotes/notes/qos-dscp-mark-44-56934a357af4b1ee.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Added a new DSCP mark value: 44. This new mark value was included
+    recently in the `RFC5865 <https://www.rfc-editor.org/rfc/rfc5865.html>`_.