feat: XE to OC QoS #271

jrouliez · 2024-02-12T19:44:31Z

New feat: XE to OC QoS

…ven-devops/nso-oc-services into oc_to_xe_qos_class_map

stmosher · 2024-02-21T17:44:52Z

mdd/python/translation/openconfig_xe/xe_main.py

@@ -40,6 +40,11 @@ def check_xe_features(oc_self, nso_props) -> None:
    # OpenConfig System
    xe_system_program_service(oc_self, nso_props)

+<<<<<<< HEAD


remove this

stmosher · 2024-02-21T17:45:02Z

mdd/python/translation/openconfig_xe/xe_main.py

+    # OpenConfig QoS
+    if nso_props.service.oc_qos__qos:
+        xe_qos_program_service(oc_self, nso_props)
+=======


remove this

Do we need to remove this?
# OpenConfig QoS
if nso_props.service.oc_qos__qos:
xe_qos_program_service(oc_self, nso_props)

Just line 47

stmosher · 2024-02-21T17:45:42Z

mdd/python/translation/openconfig_xe/xe_main.py

@@ -78,3 +83,4 @@ def clean_xe_cdb(nso_props) -> None:
    device.ios__ntp.trusted_key.delete()
    device.ios__router.bgp.delete()
    device.ios__router.ospf.delete()
+>>>>>>> main


remove this

stmosher · 2024-02-21T17:47:03Z

Please remove the "env" folder

stmosher · 2024-02-21T17:48:12Z

mdd/python/translation/openconfig_xe/xe_qos.py

@@ -0,0 +1,280 @@
+# -*- mode: python; python-indent: 4 -*-
+from translation.openconfig_xe.common import xe_system_get_interface_ip_address


xe_system_get_interface_ip_address isn't used in the file

stmosher · 2024-02-21T17:52:52Z

Add lines to xr_main.py and nx_main.py to raise errors if OC QoS configurations are sent for XR and NX devices.

stmosher · 2024-02-21T19:28:03Z

package_nso_to_oc/xe/xe_qos.py

+                                                            "openconfig-qos:conditions": {
+                                                                "openconfig-qos:ipv4": {
+                                                                    "openconfig-qos:config": {
+                                                                        "openconfig-qos:dscp": modify_dscp(class_map["match"]["ip"]["dscp"]),


function modify_dscp returns a list. "openconfig-qos:dscp" should be a string

stmosher · 2024-02-21T19:28:19Z

package_nso_to_oc/xe/xe_qos.py

+                                                            "openconfig-qos:conditions": {
+                                                                "openconfig-qos:ipv4": {
+                                                                    "openconfig-qos:config": {
+                                                                        "openconfig-qos:dscp": modify_dscp(class_map["match"]["dscp"])


function modify_dscp returns a list. "openconfig-qos:dscp" should be a string

stmosher · 2024-02-21T20:12:53Z

mdd/python/translation/openconfig_xe/xe_qos.py

+            device_cdb.ios__class_map.create(c_map.name)
+            for t_map in c_map.terms.term:
+                pmap_cmap[t_map.actions.config.target_group] = c_map.name
+                # Configure "match ip dscp"


"ip dscp" or "dscp" (for IPv4 and IPv6) should be based on the c_map.type. The c_map.type will determine the availability of "t_map.conditions.[ ipv4, ipv6, etc...]"

Do you mean:
if type: ETHERNET ---> use 'dscp'
if type: IPv4 ---> use 'ip dscp'
or something else?

In this code:
for c_map in nso_props.service.oc_qos__qos.classifiers.classifier:
pmap_cmap = {}
# Configure class-map
if device_cdb.ios__class_map.exists(c_map.name) and c_map.name != 'class-default':
del device_cdb.ios__class_map[c_map.name]
elif c_map.name == 'class-default':
for t_map in c_map.terms.term:
pmap_cmap[t_map.actions.config.target_group] = c_map.name
else:
device_cdb.ios__class_map.create(c_map.name)
for t_map in c_map.terms.term:
pmap_cmap[t_map.actions.config.target_group] = c_map.name
# Configure "match ip dscp"
if t_map.conditions.ipv4.config.protocol == 4:
# Configure multiple dscp statements
if t_map.conditions.ipv4.config.dscp_set:

The code is already looking into IPv4 terms (if t_map.conditions.ipv4.config.protocol == 4:) to determine if the term is using IPv4, but the term could be IPv6. For instance if c_map.type == "IPv6" (or something like that), then the term would be t_map.conditions.ipv6....

Added QoS checks on NX-OS and IOS-XR. Fixed modify_dscp function.

stmosher · 2024-02-26T17:40:36Z

package_nso_to_oc/xe/xe_qos.py

+    if "cir" in cd_new_police:
+        cir = cd_new_police["cir"]
+
+    return cir


cir needs to be an integer

stmosher · 2024-02-26T17:43:13Z

package_nso_to_oc/xe/xe_qos.py

+    if "bc" in cd_new_police:
+        bc = cd_new_police["bc"]
+
+    return bc


bc needs to be an integer

stmosher · 2024-02-26T17:43:52Z

package_nso_to_oc/xe/xe_qos.py

+    if "pir" in cd_new_police:
+        pir = cd_new_police["pir"]
+
+    return pir


pir needs to be an integer

stmosher · 2024-02-26T17:44:18Z

package_nso_to_oc/xe/xe_qos.py

+    if "pir-be" in cd_new_police and "be" in cd_new_police["pir-be"]:
+        be = cd_new_police["pir-be"]["be"]
+
+    return be


be needs to be an integer

stmosher · 2024-02-26T17:44:48Z

package_nso_to_oc/xe/xe_qos.py

+    if "cir" in cm_new_police:
+        cir = cm_new_police["cir"]
+
+    return cir


cir needs to be an integer

stmosher · 2024-02-26T17:44:56Z

package_nso_to_oc/xe/xe_qos.py

+    if "bc" in cm_new_police:
+        bc = cm_new_police["bc"]
+
+    return bc


bc needs to be an integer

stmosher · 2024-02-26T17:45:06Z

package_nso_to_oc/xe/xe_qos.py

+    if "pir" in cm_new_police:
+        pir = cm_new_police["pir"]
+
+    return pir


pir needs to be an integer

stmosher · 2024-02-26T17:45:14Z

package_nso_to_oc/xe/xe_qos.py

+    if "pir-be" in cm_new_police and "be" in cm_new_police["pir-be"]:
+        be = cm_new_police["pir-be"]["be"]
+
+    return be


be needs to be an integer

stmosher · 2024-02-26T19:05:48Z

package_nso_to_oc/xe/xe_qos.py

+                },
+                "openconfig-qos:two-rate-three-color": {
+                    "openconfig-qos:config": {
+                        "openconfig-qos:cir": set_qos_cir_percent(cm_new_percent),


change to cir-pct

stmosher · 2024-02-26T19:06:03Z

package_nso_to_oc/xe/xe_qos.py

+                    "openconfig-qos:config": {
+                        "openconfig-qos:cir": set_qos_cir_percent(cm_new_percent),
+                        "openconfig-qos:bc": set_qos_bc_percent(cm_new_percent),
+                        "openconfig-qos:pir": set_qos_pir_percent(cm_new_percent),


change to pir-pct

stmosher · 2024-02-26T19:13:50Z

package_nso_to_oc/xe/xe_qos.py

+
+    openconfig_class_map.append({
+        "openconfig-qos:name": "class-default",
+        "openconfig-qos:config": {"openconfig-qos:name:": "class-default"},


"openconfig-qos:name"

stmosher · 2024-02-26T19:14:13Z

package_nso_to_oc/xe/xe_qos.py

+    if len(class_map["match"]["ip"]["dscp"]) == 1:
+        openconfig_class_map.append({
+            "openconfig-qos:name": class_map["name"],
+            "openconfig-qos:config": {"openconfig-qos:name:": class_map["name"],


"openconfig-qos:name"

stmosher · 2024-02-26T19:14:28Z

package_nso_to_oc/xe/xe_qos.py

+        openconfig_class_map.append({
+            "openconfig-qos:name": class_map["name"],
+            "openconfig-qos:config": {"openconfig-qos:name:": class_map["name"],
+                                    "openconfig-qos:type:": "IPV4"},


"openconfig-qos:type"

stmosher · 2024-02-26T19:14:53Z

package_nso_to_oc/xe/xe_qos.py

+        openconfig_class_map.append({
+            "openconfig-qos:name": class_map["name"],
+            "openconfig-qos:config": {"openconfig-qos:name:": class_map["name"],
+                                    "openconfig-qos:type:": "IPV4"},


"openconfig-qos:type"

stmosher · 2024-02-26T19:15:02Z

package_nso_to_oc/xe/xe_qos.py

+    elif len(class_map["match"]["ip"]["dscp"]) > 1:
+        openconfig_class_map.append({
+            "openconfig-qos:name": class_map["name"],
+            "openconfig-qos:config": {"openconfig-qos:name:": class_map["name"],


"openconfig-qos:name"

stmosher · 2024-02-26T19:15:23Z

package_nso_to_oc/xe/xe_qos.py

+    if len(class_map["match"]["dscp"]) == 1:
+        openconfig_class_map.append({
+            "openconfig-qos:name": class_map["name"],
+            "openconfig-qos:config": {"openconfig-qos:name:": class_map["name"]


"openconfig-qos:name"

stmosher · 2024-02-26T19:15:48Z

package_nso_to_oc/xe/xe_qos.py

+    elif len(class_map["match"]["dscp"]) > 1:
+        openconfig_class_map.append({
+        "openconfig-qos:name": class_map["name"],
+        "openconfig-qos:config": {"openconfig-qos:name:": class_map["name"]


"openconfig-qos:name"

stmosher · 2024-02-27T16:59:17Z

test/tests/xe/xe_qos.yml

+                            openconfig-qos:ipv4:
+                              openconfig-qos:config:
+                                openconfig-qos:dscp-set: 
+                                  - '13'


stmosher · 2024-02-27T16:59:42Z

test/tests/xe/xe_qos.yml

+                              openconfig-qos:config:
+                                openconfig-qos:dscp-set: 
+                                  - '13'
+                                  - '15'


stmosher · 2024-02-27T19:23:52Z

package_nso_to_oc/xe/xe_qos.py

+                },
+                "openconfig-qos:one-rate-two-color": {
+                    "openconfig-qos:config": {
+                        "openconfig-qos:cir": policy_map["class-default"]["class"][0]["priority"]["kilo-bits"],


cir needs to be in bps

stmosher · 2024-02-27T19:24:23Z

package_nso_to_oc/xe/xe_qos.py

+                },
+                "openconfig-qos:one-rate-two-color": {
+                    "openconfig-qos:config": {
+                        "openconfig-qos:cir": class_name["priority"]["kilo-bits"],


cir needs to be in bps

stmosher · 2024-02-27T19:35:33Z

mdd/python/translation/openconfig_nx/nx_main.py

+
+    # Openconfig QoS
+    if is_qos_configured(nso_props):
+        raise NotImplementedError('openconfig-qos has not yet been implemented for XR')


This is the exception for NX

stmosher · 2024-02-27T19:39:01Z

package_nso_to_oc/xe/xe_acls.py

What happened to xe_acls.py's code?

stmosher · 2024-02-27T19:39:28Z

package_nso_to_oc/xr/xr_acls.py

What happened to xr_acls.py's code?

stmosher · 2024-02-27T20:27:14Z

package_nso_to_oc/xe/xe_qos.py

+    return violate_percent, drop
+
+
+def set_qos_interface(config_leftover, openconfig_interface, interface, interface_list, intf_to_sched_list, openconfig_scheduler):


Only interfaces with QoS policies should be added here. This is adding all.

jrouliez added 12 commits June 6, 2023 19:36

feat: OC to XE QoS Class-map

735f3dc

Merge branch 'main' into oc_to_xe_qos_class_map

181edb3

feat: OC to XE QoS Policy-map, One rate two color, Two rate three color.

fc3ee6d

Merge branch 'main' into oc_to_xe_qos_class_map

caeb439

Merge branch 'oc_to_xe_qos_class_map' of https://github.com/model-dri…

0d66255

…ven-devops/nso-oc-services into oc_to_xe_qos_class_map

feat: OC to XE QoS Two rate three color.

0efb147

feat: OC to XE QoS main updates

a8cbd76

feat: update to support mutiple class-maps in policy-maps

a34d8de

fix: update classifier object to account for 'class-default'.

2e25df8

feat: XE to OC QoS

c3dc49c

feat: XE to OC - Update test file

cbe3dd1

feat: IOS-XE QoS to OC - Fixes and refactoring.

e666b7b

jrouliez changed the title ~~XE to OC QoS~~ feat: XE to OC QoS Feb 12, 2024

stmosher reviewed Feb 21, 2024

View reviewed changes

fix: Removed unneeded code, functions and files.

1c63db8

Added QoS checks on NX-OS and IOS-XR. Fixed modify_dscp function.

jrouliez force-pushed the xe_to_oc_qos branch from 7887a97 to 1c63db8 Compare February 22, 2024 20:55

stmosher reviewed Feb 26, 2024

View reviewed changes

package_nso_to_oc/xe/xe_qos.py

if "cir" in cd_new_police:

cir = cd_new_police["cir"]

return cir

Copy link

stmosher Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cir needs to be an integer

stmosher reviewed Feb 26, 2024

View reviewed changes

package_nso_to_oc/xe/xe_qos.py

if "bc" in cd_new_police:

bc = cd_new_police["bc"]

return bc

Copy link

stmosher Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bc needs to be an integer

stmosher reviewed Feb 26, 2024

View reviewed changes

package_nso_to_oc/xe/xe_qos.py

if "pir" in cd_new_police:

pir = cd_new_police["pir"]

return pir

Copy link

stmosher Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pir needs to be an integer

stmosher reviewed Feb 26, 2024

View reviewed changes

package_nso_to_oc/xe/xe_qos.py

if "cir" in cm_new_police:

cir = cm_new_police["cir"]

return cir

Copy link

stmosher Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cir needs to be an integer

stmosher reviewed Feb 26, 2024

View reviewed changes

package_nso_to_oc/xe/xe_qos.py

if "bc" in cm_new_police:

bc = cm_new_police["bc"]

return bc

Copy link

stmosher Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bc needs to be an integer

stmosher reviewed Feb 26, 2024

View reviewed changes

package_nso_to_oc/xe/xe_qos.py

if "pir" in cm_new_police:

pir = cm_new_police["pir"]

return pir

Copy link

stmosher Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pir needs to be an integer

stmosher reviewed Feb 26, 2024

View reviewed changes

stmosher reviewed Feb 27, 2024

View reviewed changes

test/tests/xe/xe_qos.yml

openconfig-qos:ipv4:

openconfig-qos:config:

openconfig-qos:dscp-set:

- '13'

Copy link

stmosher Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

12 DSCP

stmosher reviewed Feb 27, 2024

View reviewed changes

test/tests/xe/xe_qos.yml

openconfig-qos:config:

openconfig-qos:dscp-set:

- '13'

- '15'

Copy link

stmosher Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

14 DSCP

stmosher reviewed Feb 27, 2024

View reviewed changes

package_nso_to_oc/xe/xe_acls.py

Copy link

stmosher Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened to xe_acls.py's code?

stmosher reviewed Feb 27, 2024

View reviewed changes

package_nso_to_oc/xr/xr_acls.py

Copy link

stmosher Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened to xr_acls.py's code?

stmosher reviewed Feb 27, 2024

View reviewed changes

		@@ -0,0 +1,280 @@
		# -- mode: python; python-indent: 4 --
		from translation.openconfig_xe.common import xe_system_get_interface_ip_address

		return violate_percent, drop


		def set_qos_interface(config_leftover, openconfig_interface, interface, interface_list, intf_to_sched_list, openconfig_scheduler):

feat: XE to OC QoS #271

Are you sure you want to change the base?

feat: XE to OC QoS #271

Conversation

jrouliez commented Feb 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrouliez Feb 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stmosher commented Feb 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stmosher commented Feb 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrouliez Feb 22, 2024 •

edited

Loading