Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

odl-pcep-ietf-stateful07 updated to odl-pcep-ietf-stateful #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

odl-pcep-ietf-stateful07 updated to odl-pcep-ietf-stateful #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pathman_sr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
20161226, Niklas - ver 5.9h - Multi area/level fix for bgp-ls and sid bug.
20170202, Niklas - ver 5.9i - Refactored sid_list to sid_saves to avoid duplicate use
20171013, Niklas - ver 5.9j - Updated odl version lis and checks
20212210, Abbed Sedkaoui - 5.9k - Rename odl module Stateful07 -> Stateful
"""
__author__ = 'niklas'

Expand Down Expand Up @@ -791,10 +792,10 @@ def list_pcep_lsp(node_list, debug):
name = path['name']
ip_hoplist = []
sid_list = []
if 'odl-pcep-ietf-stateful07:lsp' in path['path'][0].keys():
if 'operational' in path['path'][0]['odl-pcep-ietf-stateful07:lsp'].keys():
oper = path['path'][0]['odl-pcep-ietf-stateful07:lsp']['operational']
# if path['path'][0]['odl-pcep-ietf-stateful07:lsp']['operational'] == 'up':
if 'odl-pcep-ietf-stateful:lsp' in path['path'][0].keys():
if 'operational' in path['path'][0]['odl-pcep-ietf-stateful:lsp'].keys():
oper = path['path'][0]['odl-pcep-ietf-stateful:lsp']['operational']
# if path['path'][0]['odl-pcep-ietf-stateful:lsp']['operational'] == 'up':
if oper == 'up' or oper == 'active':
if 'rro' in path['path'][0].keys():
route_obj = path['path'][0]['rro']['subobject']
Expand Down Expand Up @@ -982,7 +983,7 @@ def get_pcep_type(debug):
for node in my_pcep['topology'][0]['node']:
loopback = node['network-topology-pcep:path-computation-client']['ip-address']
pcc = node['node-id']
if 'odl-pcep-ietf-stateful07:stateful' in node['network-topology-pcep:path-computation-client']['stateful-tlv'].keys():
if 'odl-pcep-ietf-stateful:stateful' in node['network-topology-pcep:path-computation-client']['stateful-tlv'].keys():
pcep_type = '07'
else:
pcep_type = '02'
Expand Down