Merge pull request #5 from CiscoDevNet/bgp-rib

Bgp rib

Author: nikmon2

README.md

@@ -180,6 +180,9 @@ Go here for [details](https://github.com/CiscoDevNet/pathman-sr/tree/master/dClo
 ## To use with Docker
 Go here for [details](https://github.com/CiscoDevNet/pathman-sr/tree/master/docker)
 
+## For Tools to help you get PCEP, BGP-LS and Netconf setup
+Go here for [details](https://github.com/CiscoDevNet/pathman-sr/tree/master/tools)
+
 
 
 

netconf.py

@@ -0,0 +1,94 @@
+#! /usr/bin/env python2.7
+"""
+    * Copyright (c) 2016 by Cisco Systems, Inc.
+    * All rights reserved.
+
+    odl_test.py
+    - get a quick check on PCEP, BGP and Netconf from your ODL controller
+
+    Niklas Montin, 20161212, niklas@cisco.com
+
+    """
+import argparse
+import sys
+import json
+import logging
+from pathman_sr import LOGGING
+from netconf import pcep_test, bgp_test, netconf_test, controller
+
+version = '1.0'
+
+
+def nprint(mydict):
+    print json.dumps(mydict, sort_keys=True,indent=4, separators=(',', ': '))
+
+
+def print_pcep(name=None):
+    reply = pcep_test(name)
+    nprint(reply)
+
+
+def print_bgp(name=None, address=None):
+    reply = bgp_test(name, address)
+    nprint(reply)
+
+
+def print_netconf(name=None):
+    reply = netconf_test(name)
+    nprint(reply)
+
+
+if __name__ == '__main__':
+    LOGGING['root']['handlers'] = ['console','logtofile']
+    logging.config.dictConfig(LOGGING)
+    logging.info("This is initializing the automation log")
+
+    logging.captureWarnings(True)
+
+    p = argparse.ArgumentParser(
+        prog=sys.argv[0],
+        description='Test BGP, PCEP and Netconf output ODL Controller',
+        version=version,
+        epilog='Copyright (c) 2017 by Cisco Systems, Inc. All Rights Reserved'
+        )
+
+    subp = p.add_subparsers(help='commands', dest='command')
+
+    pcep_p = subp.add_parser("pcep", help='print pcep output')
+    pcep_p.add_argument('--address', type=str, help='address of node to list')
+
+    bgp_p = subp.add_parser("bgp", help='print bgp output')
+    bgp_p.add_argument('--name', type=str, help='name of node to list')
+    bgp_p.add_argument('--address', type=str, help='address of node to list')
+
+    netconf_p = subp.add_parser("netconf", help='list netconf nodes')
+    netconf_p.add_argument('--name', type=str, help='name of node to list')
+
+    p.add_argument('--controller_ip', default=controller['odl_ip'], type=str, help='ODL Controller ip address')
+    p.add_argument('--controller_port', default=controller['odl_port'], type=str, help='ODL port')
+    p.add_argument('--user', default=controller['any_user'], type=str, help='ODL user')
+    p.add_argument('--password', default=controller['any_pass'], type=str, help='ODL password')
+
+    ns = p.parse_args()
+    logging.info("Parser: %s" % ns)
+
+    if ns.controller_ip:
+        controller['odl_ip'] = ns.controller_ip
+    if ns.controller_port:
+        controller['odl_port'] = ns.controller_port
+    if ns.user:
+        controller['any_user'] = ns.user
+        # odl_user = ns.user
+    if ns.password:
+        controller['any_pass'] = ns.password
+
+    if ns.command == 'pcep':
+        print_pcep(ns.address)
+
+    elif ns.command == 'bgp':
+        print_bgp(ns.name, ns.address)
+
+    elif ns.command == 'netconf':
+        print_netconf(ns.name)
+
+# Bye bye

odl_test.py

@@ -16,9 +16,15 @@
     log_level - controls the the logging depth, chnage to 'DEBUG' for more detail
     odl_user - username for odl controller restconf access
     odl_password - password for odl controller restconf access
+
+    Updated:
+    - 20161204, Niklas, Added MyBGP to get SIDs from bgp-rib
     
     
     """
+
+sid_saves = 'static_sids.json'
+
 #odl_ip = '127.0.0.1'
 odl_ip = '198.18.1.80'
 odl_port = '8181'
@@ -28,3 +34,123 @@
 log_level = 'INFO'
 odl_user = 'admin'
 odl_password = 'admin'
+
+import requests, json, logging
+
+class MyBGP(object):
+
+    def __init__(self, method='http', controller_ip=odl_ip, controller_port=odl_port, user=odl_user, passw=odl_password):
+        '''note to self: add dict for item type
+            self.dict['flavor']['list']
+            self.dict['images']['index']
+            '''
+        temp_dict = {'list':[], 'index':[]}
+        self.token = ''
+        self.ip = controller_ip
+        self.user = user
+        self.password = passw
+        self.dicts = {  'nodes':{'list':[], 'index':[]},
+                        'prefixes':{'list':[], 'index':[]},
+                        'links':{'list':[], 'index':[]},
+
+        }
+        url = '{}://{}:{}/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-linkstate:linkstate-address-family/bgp-linkstate:linkstate-subsequent-address-family/linkstate-routes'
+        self.url = url.format(method, controller_ip, controller_port)
+        self.creds = {'username':user,'password':passw}
+        self.status = 0
+        self.error = ""
+
+        result = self._get_url(self.url, headers={'content-type': 'application/json'})
+        if result:
+            linkstate = result.json()
+            for link in linkstate[u'bgp-linkstate:linkstate-routes']['linkstate-route']:
+                if 'node-descriptors' in link.keys():
+                    self.dicts['nodes']['list'].append(link)
+                elif 'prefix-descriptors' in link.keys():
+                    if 'sr-prefix' in link['attributes']['prefix-attributes'].keys():
+                        self.dicts['prefixes']['list'].append(link)
+                elif 'link-descriptors' in link.keys():
+                    self.dicts['links']['list'].append(link)
+                else:
+                    logging.error('unexpected item: {}'.format(link))
+
+            self.dicts['nodes']['index'] = [node['attributes'].get('node-attributes', {}).get('ipv4-router-id', '0.0.0.0') for node in self.dicts['nodes']['list']]
+            self.dicts['prefixes']['index'] = [prefix['prefix-descriptors']['ip-reachability-information'] for prefix in self.dicts['prefixes']['list']]
+            self.dicts['links']['index'] = [link['link-descriptors']['ipv4-interface-address'] for link in self.dicts['links']['list']]
+
+        else:
+            logging.info('Nothing retrieved')
+
+    def _get_url(self, url, headers):
+        '''common get function'''
+        try:
+            response =  requests.get(url, headers = headers, auth=(self.user,self.password), verify=False)
+            logging.info("status code: %s"% response.status_code)
+            if response.status_code in [200, 202, 204]:
+                return response
+            else:
+                logging.error("Error code: %s, %s" %(response.status_code, response.text))
+
+        except requests.exceptions.ConnectionError, e:
+            logging.error('Connection Error to %s: %s' % (self.ip, e.message))
+
+        return
+
+    def _delete_url(self, url, headers):
+        try:
+            response =  requests.delete(url, headers = headers)
+            logging.info("status code: %s"% response.status_code)
+            if response.status_code in [200, 202, 204]:
+                return response
+            else:
+                logging.error("Error code: %s, %s" %(response.status_code, response.text))
+        except requests.exceptions.ConnectionError, e:
+            logging.error('Connection Error to %s: %s' % (self.ip, e.message))
+        return
+
+    def _post_url(self, url, data, headers):
+        try:
+            response =  requests.post(url, data=data, headers = headers)
+            return response
+        except requests.exceptions.ConnectionError, e:
+            logging.error('Connection Error to %s: %s' % (self.ip, e.message))
+            return
+
+    def item_details(self, item, name):
+        '''get details for a service'''
+        try:
+            index = self.dicts[item]['index'].index(name)
+            return self.dicts[item]['list'][index]
+        except ValueError:
+            return
+
+    def get_sr_info_old(self):
+        sr_info = {}
+        for node in self.dicts['nodes']['list']:
+            base = node['attributes']['node-attributes']['sr-capabilities']['local-label']
+            loopback = node['attributes']['node-attributes']['ipv4-router-id']
+            prefix = self.item_details('prefixes', loopback + '/32')
+            label = prefix['attributes']['prefix-attributes']['sr-prefix']['local-label']
+            sr_info.update({loopback: int(base) + int(label)})
+        return sr_info
+
+    def get_sr_info(self):
+        sr_info = {}
+        for node in self.dicts['nodes']['list']:
+            base = node['attributes'].get('node-attributes', {}).get('sr-capabilities', {}).get('local-label',)
+            if base:
+                loopback = node['attributes'].get('node-attributes', {}).get('ipv4-router-id', )
+                if loopback:
+                    prefix = self.item_details('prefixes', loopback + '/32')
+
+                    if any(x in prefix['attributes']['prefix-attributes']['sr-prefix'].keys() for x in ['local-label', 'sid']):
+                        if 'local-label' in prefix['attributes']['prefix-attributes']['sr-prefix'].keys():
+                            label = prefix['attributes']['prefix-attributes']['sr-prefix']['local-label']
+                        else:
+                            label = prefix['attributes']['prefix-attributes']['sr-prefix']['sid']
+                        sr_info.update({loopback: int(base) + int(label)})
+                    else:
+                        logging.error('no sid info')
+        return sr_info
+
+# Bye bye

pathman_ini.py

@@ -47,7 +47,11 @@
     20160912, Niklas - ver 5.9c - Fixed Boron version check from false positives
     20160919, Niklas - ver 5.9d - getTopo reply format changed
     20160924, Niklas - ver 5.9e - Updated metrics selection
-    20161226, Niklas - ver 5.9f - Updates from branches; multi-area/level and sid fix
+    20161204, Niklas - Ver 5.9f - Added BGP-RIB support to retrieve SIDs. Requires XRv 6.1.x, or higher.
+    20161210, Niklas - ver 5.9g - Added Netconf-modules for users to add their nodes to netconf
+                                - Added static netconf mappings for users ho give up on netconf
+    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
     """
 __author__ = 'niklas'
 
@@ -64,7 +68,9 @@
 
 
 #==============================================================
-version = '5.9f'
+
+version = '5.9i'
+
 # Defaults overridden by pathman_ini.py
 odl_ip = '127.0.0.1'
 odl_port = '8181'
@@ -301,6 +307,24 @@ def formatTime(self, record, datefmt=None):
 }
 
 
+def dict_to_file(mdict, file):
+    with open(file,'w') as f:
+        f.write(json.dumps(mdict))
+    logging.info("writing %s" % mdict)
+
+
+def file_to_dict(file):
+    mdict = {}
+    if os.path.exists(file):
+        with open(file,'r') as f:
+            string = f.read()
+        user_files = json.loads(string)
+        logging.info("reading %s" % user_files)
+        for item in user_files:
+            mdict.update({item:user_files[item]})
+    return mdict
+
+
 def version_check():
     """modified from odl_gateway"""
     url = get_version
@@ -368,18 +392,19 @@ def get_config(url_list, match):
             try:
                 sid = get_config([get_node_isis_config, get_node_ospf_config], 'prefix-sid')
                 rid = get_config([get_node_bgp_config], 'router-id')
-                logging.info('rid: %s, sid: %s' %(rid, sid))
+                logging.info('rid: %s, sid: %s' % (rid, sid))
 
                 if sid != -1:
-                    node_configs.update({node:sid})
+                    node_configs.update({node: sid})
                     logging.info("got netconf data for: %s" % node)
                     if rid != -1:
-                        rid_dict.update({rid:sid})
+                        rid_dict.update({rid: sid})
                         logging.info("router-id: %s" % rid)
                     else:
-                        logging.error("No rid for: %s" % node)
+                        logging.info("No sid for: %s" % node)
                 else:
-                    logging.info("No sid for: %s" % node)
+                    logging.error("No rid for: %s" % node)
+
             except:
                 logging.error("failure to get netconf data for: %s" % node)
     return node_configs, rid_dict
@@ -408,25 +433,41 @@ def keyd_dict_walker(mdict, key):
 def node_sr_update(node_list):
     def update(node, temp_sid):
         if 'value' in temp_sid.keys():
-            node_list[node_list.index(node)] = node._replace(sid = temp_sid['value'])
-            logging.info("SR sid updated for: %s" % node.name)
+            node_list[node_list.index(node)] = node._replace(sid=temp_sid['value'])
+            logging.info("SR sid updated for: %s from netconf" % node.name)
         elif 'sid-value' in temp_sid.keys():
-            node_list[node_list.index(node)] = node._replace(sid = temp_sid['sid-value'])
-            logging.info("SR sid updated for: %s" % node.name)
-        else:
-            logging.error("No sid value for: %s - %s" % (node.name,temp_sid))
-
-    node_configs, rid_dict = get_netconf()
-    for node in node_list:
-        temp_sid = node_configs.get(node.name,{})
-        rid_sid = rid_dict.get(node.loopback,{})
-
-        if len(temp_sid) >0:
-            update(node, temp_sid)
-        elif len(rid_sid) >0:
-            update(node, rid_sid)
+            node_list[node_list.index(node)] = node._replace(sid=temp_sid['sid-value'])
+            logging.info("SR sid updated for: %s from netconf" % node.name)
         else:
-            logging.error("No sid for: %s" % node.name)
+            logging.error("No sid value for: %s - %s" % (node.name, temp_sid))
+
+        # BGP Check
+    bgp_rib = MyBGP()
+    sid_dict = bgp_rib.get_sr_info()
+    my_local_sids = file_to_dict(sid_saves)
+    # sid_dict = {}
+    if len(sid_dict) > 0:
+        for node in node_list:
+            if node.loopback in sid_dict.keys():
+                node_list[node_list.index(node)] = node._replace(sid=sid_dict[node.loopback])
+                logging.info('SR sid updated for: {} from bgp'.format(node.name))
+            else:
+                logging.error('No BGP SID for: {}'.format(node.name))
+    else:
+        node_configs, rid_dict = get_netconf()
+        for node in node_list:
+            temp_sid = node_configs.get(node.name,{})
+            rid_sid = rid_dict.get(node.loopback,{})
+
+            if len(temp_sid) >0:
+                update(node, temp_sid)
+            elif len(rid_sid) >0:
+                update(node, rid_sid)
+            elif my_local_sids.get(node.loopback):
+                node_list[node_list.index(node)] = node._replace(sid=my_local_sids[node.loopback]['sid'])
+                logging.info('SR sid updated for: {} from static'.format(node.name))
+            else:
+                logging.error("No sid for: %s" % node.name)
 
     return node_list
 
@@ -1107,14 +1148,14 @@ def sort_paths(pathlist, metriclist, type):
 
 def postUrl(url, data):
     import requests
-    response = requests.post(url, data=data, auth = (odl_user, odl_password),headers= {'Content-Type': 'application/json'})
+    response = requests.post(url, data=data, auth=(odl_user, odl_password), headers={'Content-Type': 'application/json'})
     # print response.text
     return response.json()
 
 def postXml(url, data):
     """ post our lsp creation commands """
     import requests
-    response = requests.post(url, data=data, auth = (odl_user, odl_password),headers= {'Content-Type': 'application/xml'})
+    response = requests.post(url, data=data, auth=(odl_user, odl_password), headers={'Content-Type': 'application/xml'})
     # print response.text
 
     return response.json()