Skip to content

Commit 0841635

Browse files
committed
as defined in RFC 8664, Rename SR-ERO suboject from sid-type to nai-type
https://git.opendaylight.org/gerrit/gitweb?p=bgpcep.git;a=commit;h=5b4952979cb5107a3333027849fec04254385641 this is starting ODL Aluminium 13.0 https://git.opendaylight.org/gerrit/c/bgpcep/+/91507 Update to RFC 8664 (PCEP Segment Routing) As per RFC 8664, this commit introduces following changes: - Add Flags N & X to SR PCE Capability - Add Ipv6 Local Nai Type and rename SID Type to NAI Type (NT) in odl-pcep-segment-routing-yang - Change IANA type (=36) for SR-ERO and SR-RRO to be the default value in pcep-segment-routing-app-config.yang instead of Legacy Type values - Update yang model revision - Turn IANA Type as the defaut for Segement Routing parser registration - Mark deprecated all IANA Type configuration (this will be removed in next release after Aluminium) - Add extra verifications to AbstractSrSubobjectParser Java Class and support for Ipv6Local NAI - Update accordingly Segment Routing Junit Tests JIRA: BGPCEP-882
1 parent ffac184 commit 0841635

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

pathman_sr.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
20161226, Niklas - ver 5.9h - Multi area/level fix for bgp-ls and sid bug.
5454
20170202, Niklas - ver 5.9i - Refactored sid_list to sid_saves to avoid duplicate use
5555
20171013, Niklas - ver 5.9j - Updated odl version lis and checks
56+
20212210, Abbed Sedkaoui - 5.9k - Rename odl module Stateful07 -> Stateful
57+
20212210, Abbed Sedkaoui - 5.9i - Rename SR-ERO suboject from sid-type to nai-type
5658
"""
5759
__author__ = 'niklas'
5860

@@ -225,7 +227,7 @@
225227

226228
ero_sr_xml = '''<subobject>
227229
<loose>false</loose>
228-
<sid-type xmlns="urn:opendaylight:params:xml:ns:yang:pcep:segment:routing">ipv4-node-id</sid-type>
230+
<nai-type xmlns="urn:opendaylight:params:xml:ns:yang:pcep:segment:routing">ipv4-node-id</nai-type>
229231
<m-flag xmlns="urn:opendaylight:params:xml:ns:yang:pcep:segment:routing">true</m-flag>
230232
<sid xmlns="urn:opendaylight:params:xml:ns:yang:pcep:segment:routing">{sid}</sid>
231233
<ip-address xmlns="urn:opendaylight:params:xml:ns:yang:pcep:segment:routing">{hop}</ip-address>
@@ -804,11 +806,11 @@ def list_pcep_lsp(node_list, debug):
804806
for nexthop in route_obj:
805807
if 'ip-prefix' in nexthop.keys():
806808
ip_hoplist.append(nexthop['ip-prefix']['ip-prefix'])
807-
if 'odl-pcep-segment-routing:sid-type' in nexthop.keys():
808-
if nexthop['odl-pcep-segment-routing:sid-type'] == 'ipv4-node-id':
809+
if 'odl-pcep-segment-routing:nai-type' in nexthop.keys():
810+
if nexthop['odl-pcep-segment-routing:nai-type'] == 'ipv4-node-id':
809811
ip_hoplist.append(nexthop['odl-pcep-segment-routing:ip-address'])
810812
sid_list.append(nexthop['odl-pcep-segment-routing:sid'])
811-
elif nexthop['odl-pcep-segment-routing:sid-type'] == 'ipv4-adjacency':
813+
elif nexthop['odl-pcep-segment-routing:nai-type'] == 'ipv4-adjacency':
812814
ip_hoplist.append(nexthop['odl-pcep-segment-routing:remote-ip-address'])
813815
sid_list.append(nexthop['odl-pcep-segment-routing:sid'])
814816

0 commit comments

Comments
 (0)