Skip to content

Commit b6b6589

Browse files
authored
Updated ODL version check w carbon and nitrogen.
1 parent 45bfcd4 commit b6b6589

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

pathman_sr.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
- Added static netconf mappings for users ho give up on netconf
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
55+
20171013, Niklas - ver 5.9j - Updated odl version lis and checks
5556
"""
5657
__author__ = 'niklas'
5758

@@ -69,7 +70,7 @@
6970

7071
#==============================================================
7172

72-
version = '5.9i'
73+
version = '5.9j'
7374

7475
# Defaults overridden by pathman_ini.py
7576
odl_ip = '127.0.0.1'
@@ -111,11 +112,13 @@
111112
string = "bgpls://IsisLevel2:1/type=node&as=65504&domain=505290270&router=0000.0000.0029"
112113

113114
odl_version_list = [
114-
{'boron':{'name': "openconfig-interfaces", 'revision': "2016-04-12"}},
115-
{'beryllium':{'name':"odl-rsvp-parser-spi-cfg", 'revision':"2015-08-26"}},
116-
{'lithium':{'name':"aaa-authn-model", 'revision':"2014-10-29"}},
117-
{'helium':{'name':"opendaylight-topology", 'revision':"2013-10-30"}},
118-
]
115+
{'nitrogen': {'name': 'odl-bmp-monitor-config', 'revision': '2017-05-17'}},
116+
{'carbon': {'name': "aaa-encrypt-service-config", 'revision': "2016-09-15"}},
117+
{'boron': {'name': "openconfig-interfaces", 'revision': "2016-04-12"}},
118+
{'beryllium': {'name': "odl-rsvp-parser-spi-cfg", 'revision':"2015-08-26"}},
119+
{'lithium': {'name': "aaa-authn-model", 'revision': "2014-10-29"}},
120+
{'helium': {'name': "opendaylight-topology", 'revision': "2013-10-30"}},
121+
]
119122

120123
lsp07_xml = '''<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">
121124
<node>{pcc}</node>
@@ -347,7 +350,7 @@ def netconf_list(dummy=None):
347350

348351
odl_version = version_check()
349352

350-
if odl_version in ['beryllium', 'boron']:
353+
if odl_version in ['beryllium', 'boron', 'carbon', 'nitrogen']:
351354
url = get_node_topo
352355
else:
353356
url = get_nodes

0 commit comments

Comments
 (0)