Skip to content

Commit

Permalink
fix: Removed unneeded code, functions and files.
Browse files Browse the repository at this point in the history
     Added QoS checks on NX-OS and IOS-XR.
     Fixed modify_dscp function.
  • Loading branch information
jrouliez committed Feb 22, 2024
2 parents e666b7b + 5182d70 commit 1c63db8
Show file tree
Hide file tree
Showing 235 changed files with 79 additions and 61 deletions.
3 changes: 3 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
["@semantic-release/git", {
"assets": "mdd/package-meta-data.xml",
"message": "chore(release): Update NSO package version to ${nextRelease.version} [skip ci]"
}],
["semantic-release-pypi", {
"repoUrl": "https://upload.pypi.org/legacy/"
}]
]
}
1 change: 0 additions & 1 deletion env/bin/python

This file was deleted.

1 change: 0 additions & 1 deletion env/bin/python3

This file was deleted.

1 change: 0 additions & 1 deletion env/bin/python3.10

This file was deleted.

1 change: 0 additions & 1 deletion env/lib64

This file was deleted.

3 changes: 0 additions & 3 deletions env/pyvenv.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion mdd/package-meta-data.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ncs-package xmlns="http://tail-f.com/ns/ncs-packages">
<name>mdd</name>
<package-version>2.82.0</package-version>
<package-version>2.82.1</package-version>
<description>Translates OpenConfig models to NSO devices and augments OpenConfig models with custom configurations.</description>
<ncs-min-version>5.5</ncs-min-version>
<component>
Expand Down
10 changes: 10 additions & 0 deletions mdd/python/translation/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,13 @@ def verify_ipv4(ip: str) -> bool:
return False
except ValueError:
return False


def is_qos_configured(nso_props):
if (len(nso_props.service.oc_qos__qos.classifiers.classifier) > 0 or
len(nso_props.service.oc_qos__qos.forwarding_groups.forwarding_group) > 0 or
len(nso_props.service.oc_qos__qos.interfaces.interface) > 0 or
len(nso_props.service.oc_qos__qos.scheduler_policies.scheduler_policy)):
return True

return False
7 changes: 7 additions & 0 deletions mdd/python/translation/openconfig_nx/nx_main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# -*- mode: python; python-indent: 4 -*-
from translation.common import is_oc_routing_policy_configured
from translation.openconfig_nx.nx_system import nx_system_program_service
from translation.common import is_qos_configured


def check_nx_features(self, nso_props) -> None:
"""
Expand Down Expand Up @@ -33,3 +35,8 @@ def check_nx_features(self, nso_props) -> None:

# OpenConfig System
nx_system_program_service(self, nso_props)

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

4 changes: 1 addition & 3 deletions mdd/python/translation/openconfig_xe/xe_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,9 @@ def check_xe_features(oc_self, nso_props) -> None:
# OpenConfig System
xe_system_program_service(oc_self, nso_props)

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

def clean_xe_cdb(nso_props) -> None:
"""
Expand Down Expand Up @@ -83,4 +81,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

1 change: 0 additions & 1 deletion mdd/python/translation/openconfig_xe/xe_qos.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# -*- mode: python; python-indent: 4 -*-
from translation.openconfig_xe.common import xe_system_get_interface_ip_address
from translation.common import get_interface_type_and_number

dscp_dict = {8:'cs1', 10:'af11', 12:'af12', 14:'af13', 16:'cs2', 18:'af21', 20:'af22',
Expand Down
5 changes: 5 additions & 0 deletions mdd/python/translation/openconfig_xr/xr_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from translation.openconfig_xr.xr_acls import xr_acls_lines_program_service
from translation.openconfig_xr.xr_acls import xr_acls_ntp_program_service
from translation.openconfig_xr.xr_network_instances import xr_network_instances_program_service
from translation.common import is_qos_configured


def check_xr_features(oc_self, nso_props) -> None:
Expand Down Expand Up @@ -41,6 +42,10 @@ def check_xr_features(oc_self, nso_props) -> None:
# OpenConfig System
xr_system_program_service(oc_self, nso_props)

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


def clean_xr_cdb(nso_props) -> None:
"""
Expand Down
Empty file modified mdd/src/Makefile
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/if-type-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-acl-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-bgp-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-cgmp-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-if-ethernet-mdd-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-if-ip-mdd-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-if-tunnel-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-local-routing-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-network-instance-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-ospfv2-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-packet-match-types-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-pim-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-routing-policy-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-spanning-tree-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/openconfig-system-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/extensions/system-ext-sub-nat.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/ietf/iana-if-type.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/ietf/ietf-interfaces.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/ietf/ietf-yang-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/mdd.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/acl/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/acl/openconfig-acl.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/acl/openconfig-packet-match-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/acl/openconfig-packet-match.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-common.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-ethernet.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-ipv4.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-ipv6.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-mpls.yang
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-pf.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/aft/openconfig-aft.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bfd/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bfd/openconfig-bfd.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-common.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-errors.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-global.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-neighbor.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-peer-group.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-policy.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/bgp/openconfig-bgp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/catalog/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/catalog/openconfig-catalog-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/catalog/openconfig-module-catalog.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/extensions/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/firewall/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-8021x.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-aggregate.yang
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-ethernet.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-ip-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-ip.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-poe.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-sdn-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-tunnel.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-if-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/interfaces/openconfig-interfaces.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/openconfig-isis-lsdb-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/openconfig-isis-lsp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/openconfig-isis-policy.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/openconfig-isis-routing.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/openconfig-isis-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/isis/openconfig-isis.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/lacp/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/lacp/openconfig-lacp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/lldp/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/lldp/openconfig-lldp-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/lldp/openconfig-lldp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/local-routing/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/macsec/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/macsec/openconfig-macsec-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/macsec/openconfig-macsec.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-igp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-ldp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-rsvp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-sr.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-static.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-te.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/mpls/openconfig-mpls.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/multicast/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/multicast/openconfig-igmp-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/multicast/openconfig-igmp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/multicast/openconfig-pim-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/multicast/openconfig-pim.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/network-instance/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/network-instance/openconfig-evpn.yang
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/openconfig-extensions.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/openflow/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/openflow/openconfig-openflow-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/openflow/openconfig-openflow.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/optical-transport/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospf-policy.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospf-types.yang
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospfv2-area.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospfv2-common.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospfv2-global.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospfv2-lsdb.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/ospf/openconfig-ospfv2.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/p4rt/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/p4rt/openconfig-p4rt.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform-cpu.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform-ext.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform-fan.yang
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform-port.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform-psu.yang
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/platform/openconfig-platform.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/policy-forwarding/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/policy/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/policy/openconfig-policy-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/policy/openconfig-routing-policy.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/probes/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/probes/openconfig-probes-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/probes/openconfig-probes.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/qos/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/qos/openconfig-qos-elements.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/qos/openconfig-qos-interfaces.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/qos/openconfig-qos-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/qos/openconfig-qos.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/relay-agent/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/relay-agent/openconfig-relay-agent.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/rib/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/rib/openconfig-rib-bgp-attributes.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/rib/openconfig-rib-bgp-ext.yang
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/rib/openconfig-rib-bgp-tables.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/rib/openconfig-rib-bgp-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/rib/openconfig-rib-bgp.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/sampling/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/sampling/openconfig-sampling-sflow.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/segment-routing/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/stp/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/stp/openconfig-spanning-tree-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/stp/openconfig-spanning-tree.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-aaa-radius.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-aaa-tacacs.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-aaa-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-aaa.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-alarm-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-alarms.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-license.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-messages.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-procmon.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-system-grpc.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-system-logging.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-system-terminal.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/system/openconfig-system.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/telemetry/.spec.yml
100755 → 100644
Empty file.
Empty file.
Empty file modified mdd/src/yang/openconfig/telemetry/openconfig-telemetry.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/types/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/types/openconfig-inet-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/types/openconfig-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/types/openconfig-yang-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/vlan/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/vlan/openconfig-vlan-types.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/vlan/openconfig-vlan.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/.spec.yml
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/README.md
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/openconfig-access-points.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/openconfig-ap-interfaces.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/openconfig-ap-manager.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/openconfig-wifi-mac.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/openconfig-wifi-phy.yang
100755 → 100644
Empty file.
Empty file modified mdd/src/yang/openconfig/wifi/openconfig-wifi-types.yang
100755 → 100644
Empty file.
Empty file modified package_nso_to_oc/main.py
100755 → 100644
Empty file.
Empty file modified package_nso_to_oc/xe/xe_acls.py
100755 → 100644
Empty file.
11 changes: 9 additions & 2 deletions package_nso_to_oc/xe/xe_qos.py
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ def set_qos_class_map_ip(config_leftover, class_map_index, class_map, openconfig
"openconfig-qos:conditions": {
"openconfig-qos:ipv4": {
"openconfig-qos:config": {
"openconfig-qos:dscp-set": modify_dscp(class_map["match"]["ip"]["dscp"]),
"openconfig-qos:dscp-set": modify_dscp_list(class_map["match"]["ip"]["dscp"]),
"openconfig-qos:protocol": 4
}
}
Expand Down Expand Up @@ -1343,7 +1343,7 @@ def set_qos_class_map(config_leftover, class_map_index, class_map, openconfig_cl
"openconfig-qos:conditions": {
"openconfig-qos:ipv4": {
"openconfig-qos:config": {
"openconfig-qos:dscp-set": modify_dscp(class_map["match"]["dscp"])
"openconfig-qos:dscp-set": modify_dscp_list(class_map["match"]["dscp"])
}
}
},
Expand All @@ -1360,6 +1360,13 @@ def set_qos_class_map(config_leftover, class_map_index, class_map, openconfig_cl


def modify_dscp(dscp_list):
dscp = dscp_list[0]
if type(dscp) is int and (dscp % 2) != 0:
return dscp
return dscp_dict.get(dscp, 'default')


def modify_dscp_list(dscp_list):
new_dscp_list = []
for dscp in dscp_list:
if type(dscp) is int and (dscp % 2) != 0:
Expand Down
Empty file modified package_nso_to_oc/xr/xr_acls.py
100755 → 100644
Empty file.
30 changes: 28 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
[build-system]
requires = ["setuptools","packaging"]
requires = ["setuptools", "packaging"]
build-backend = "setuptools.build_meta"

[project]
name = "nso-oc"
description = "Cisco NSO OpenConfig Tools"
dynamic = ["version"]
readme = "./package_nso_to_oc/README.md"
license = {file = "LICENSE"}
dependencies = ["urllib3"]
classifiers = [
"License :: Other/Proprietary License",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3",
]

[project.scripts]
"nso-oc" = "package_nso_to_oc.main:main"

[project.urls]
"homepage" = "https://github.com/model-driven-devops/nso-oc-services"

[tool.setuptools.packages.find]
where = ["."]
include = ["package_nso_to_oc", "package_nso_to_oc.*"]

[tool.setuptools.package-dir]
package_nso_to_oc = "package_nso_to_oc"

# TODO: setuptools claims the [tool.distutils] table is experimental and likely to change
# Place the <package>.egg-info directory at the root of the bundle to match prior behavior
[tool.distutils.egg_info]
egg_base = "."

30 changes: 0 additions & 30 deletions setup.py

This file was deleted.

10 changes: 5 additions & 5 deletions test/inventory_nx/nso.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
all:
vars:
mdd_model_repos:
nso_installer_file: https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
nso_installer_file: https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
nso_ned_files:
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
nso_default_ned: cisco-ios-cli-6.93
nso_ned_dict:
ios: "cisco-ios-cli-6.93"
Expand Down
10 changes: 5 additions & 5 deletions test/inventory_xe/nso.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
all:
vars:
mdd_model_repos:
nso_installer_file: https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
nso_installer_file: https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
nso_ned_files:
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
nso_default_ned: cisco-ios-cli-6.93
nso_ned_dict:
ios: "cisco-ios-cli-6.93"
Expand Down
10 changes: 5 additions & 5 deletions test/inventory_xr/nso.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
all:
vars:
mdd_model_repos:
nso_installer_file: https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
nso_installer_file: https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
nso_ned_files:
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
- https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
- https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
nso_default_ned: cisco-ios-cli-6.93
nso_ned_dict:
ios: "cisco-ios-cli-6.93"
Expand Down

0 comments on commit 1c63db8

Please sign in to comment.