Skip to content

Commit 1c63db8

Browse files
committed
fix: Removed unneeded code, functions and files.
Added QoS checks on NX-OS and IOS-XR. Fixed modify_dscp function.
2 parents e666b7b + 5182d70 commit 1c63db8

235 files changed

Lines changed: 79 additions & 61 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.releaserc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
["@semantic-release/git", {
1414
"assets": "mdd/package-meta-data.xml",
1515
"message": "chore(release): Update NSO package version to ${nextRelease.version} [skip ci]"
16+
}],
17+
["semantic-release-pypi", {
18+
"repoUrl": "https://upload.pypi.org/legacy/"
1619
}]
1720
]
1821
}

env/bin/python

Lines changed: 0 additions & 1 deletion
This file was deleted.

env/bin/python3

Lines changed: 0 additions & 1 deletion
This file was deleted.

env/bin/python3.10

Lines changed: 0 additions & 1 deletion
This file was deleted.

env/lib64

Lines changed: 0 additions & 1 deletion
This file was deleted.

env/pyvenv.cfg

Lines changed: 0 additions & 3 deletions
This file was deleted.

mdd/package-meta-data.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ncs-package xmlns="http://tail-f.com/ns/ncs-packages">
22
<name>mdd</name>
3-
<package-version>2.82.0</package-version>
3+
<package-version>2.82.1</package-version>
44
<description>Translates OpenConfig models to NSO devices and augments OpenConfig models with custom configurations.</description>
55
<ncs-min-version>5.5</ncs-min-version>
66
<component>

mdd/python/translation/common.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,13 @@ def verify_ipv4(ip: str) -> bool:
7777
return False
7878
except ValueError:
7979
return False
80+
81+
82+
def is_qos_configured(nso_props):
83+
if (len(nso_props.service.oc_qos__qos.classifiers.classifier) > 0 or
84+
len(nso_props.service.oc_qos__qos.forwarding_groups.forwarding_group) > 0 or
85+
len(nso_props.service.oc_qos__qos.interfaces.interface) > 0 or
86+
len(nso_props.service.oc_qos__qos.scheduler_policies.scheduler_policy)):
87+
return True
88+
89+
return False

mdd/python/translation/openconfig_nx/nx_main.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# -*- mode: python; python-indent: 4 -*-
22
from translation.common import is_oc_routing_policy_configured
33
from translation.openconfig_nx.nx_system import nx_system_program_service
4+
from translation.common import is_qos_configured
5+
46

57
def check_nx_features(self, nso_props) -> None:
68
"""
@@ -33,3 +35,8 @@ def check_nx_features(self, nso_props) -> None:
3335

3436
# OpenConfig System
3537
nx_system_program_service(self, nso_props)
38+
39+
# Openconfig QoS
40+
if is_qos_configured(nso_props):
41+
raise NotImplementedError('openconfig-qos has not yet been implemented for XR')
42+

mdd/python/translation/openconfig_xe/xe_main.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ def check_xe_features(oc_self, nso_props) -> None:
4040
# OpenConfig System
4141
xe_system_program_service(oc_self, nso_props)
4242

43-
<<<<<<< HEAD
4443
# OpenConfig QoS
4544
if nso_props.service.oc_qos__qos:
4645
xe_qos_program_service(oc_self, nso_props)
47-
=======
4846

4947
def clean_xe_cdb(nso_props) -> None:
5048
"""
@@ -83,4 +81,4 @@ def clean_xe_cdb(nso_props) -> None:
8381
device.ios__ntp.trusted_key.delete()
8482
device.ios__router.bgp.delete()
8583
device.ios__router.ospf.delete()
86-
>>>>>>> main
84+

0 commit comments

Comments
 (0)