Merge branch 'dev' into v0.8.1

- Added quickpath syntax [netgrph ip1 ip2]
- Added -allpaths and -singlepath options
- Most pathfinding bugs resolved
- Merged prod and dev test suite
- Improved debugging support

README.md

@@ -457,7 +457,8 @@ tool that is reliable enough.
 NetGrph was developed on Ubuntu 14.04 LTS, tested on 16.04, and should be
 compatible with other versions of linux. I highly recommend using Ubuntu at this
 early stage for better support. I also plan to create an ansible build script in
-the next few months.
+the next few months. It also works just find on MacOS but there are no Ansible or
+install instructions for that OS.
 
 ## Installation
 

docs/TODO

@@ -1,24 +1,14 @@
 
 
-NetDB:
-- Add CIDR scope usage reporting
-- Add more extensive device reporting
-
-Reporting:
-  - No name, no root, no router report
 
 Other:
 - Add VRF to -rpath
-- Add master -path to netgrph
-- Add tabular output option
+- Add distance option for traversals
 - built-in paging support
-- Group report takes up entire console
 
 Maintenance:
 - Add switch skip on certain neighbors
-- Rewrite nglib.net_update using Bolt as Pythonic
 - Emulate dict with ngtree
 - Rewrite py2neo cypher queries with py2neo v3.0
 - Change py2neo to use bolt driver by default
 
-

netgrph.py

@@ -120,6 +120,7 @@ def check_path(singlepath):
         singlepath = True
     return singlepath
 
+
 # Alternate Config File
 if args.conf:
     config_file = args.conf
@@ -155,37 +156,37 @@ def check_path(singlepath):
 
 ## Pathfinding
 if args.fpath:
-    nglib.query.path.get_fw_path(args.fpath, args.search)
+    nglib.query.path.get_fw_path(args.fpath, args.search, dict())
 
 # Quick Path
 elif args.qpath:
     rtype = "QTREE"
     if args.output:
         rtype = args.output
-    nglib.query.path.get_full_path(args.search, args.qpath, rtype=rtype, \
-        onepath=check_path(False))   
+    nglib.query.path.get_full_path(args.search, args.qpath, \
+        {"onepath": check_path(False)}, rtype=rtype)
 
 elif args.spath:
     rtype = "TREE"
 
     if args.output:
         rtype = args.output
-    nglib.query.path.get_switched_path(args.spath, args.search, rtype=rtype, \
-        onepath=check_path(False))
+    nglib.query.path.get_switched_path(args.spath, args.search, \
+        {"onepath": check_path(False)}, rtype=rtype)
 
 elif args.rpath:
     rtype = "TREE"
     if args.output:
         rtype = args.output
-    nglib.query.path.get_routed_path(args.rpath, args.search, rtype=rtype, \
-        onepath=check_path(False))
+    nglib.query.path.get_routed_path(args.rpath, args.search, \
+        {"onepath":check_path(False)}, rtype=rtype)
 
 elif args.path:
     rtype = "TREE"
     if args.output:
         rtype = args.output
-    nglib.query.path.get_full_path(args.path, args.search, rtype=rtype, \
-        onepath=check_path(True))
+    nglib.query.path.get_full_path(args.path, args.search, \
+        {"onepath": check_path(False)}, rtype=rtype)
 
 ## Individual Queries
 elif args.dev:

nglib/ngtree/export.py

@@ -124,4 +124,5 @@ def strip_ngtree(ngtree, top=True):
         elif top:
             newtree[en] = ngtree[en]
 
-    return newtree
+    return newtree
+

nglib/query/__init__.py

@@ -177,7 +177,7 @@ def get_filter_dict(group=None, nFilter=None):
         gFilter = nFilter
     else:
         raise Exception("Must pass in group or filter")
-    
+
     # Split all VRFs by spaces
     vrfFilters = gFilter.rsplit()
 

nglib/query/net.py

@@ -41,12 +41,13 @@
 logger = logging.getLogger(__name__)
 
 
-def get_net(ip, rtype="TREE", days=7):
+def get_net(ip, rtype="TREE", days=7, verbose=True):
     """Find a network and return text output"""
 
     rtypes = ('TREE', 'JSON', 'YAML', 'NGTREE')
 
-    logger.info("Query: Looking up %s for %s", ip, nglib.user)
+    if verbose:
+        logger.info("Query: Looking up %s for %s", ip, nglib.user)
 
     if rtype in rtypes:
         net = nglib.query.net.find_cidr(ip)
@@ -294,8 +295,8 @@ def find_cidr(ip):
     if len(networks) > 1:
         for r in networks.records:
             if ipaddress.ip_address(ip) in ipaddress.ip_network(r.cidr):
-                if nglib.verbose:
-                    print(ip + " in " + r.cidr)
+                if nglib.verbose>1:
+                    print("find_cidr", ip + " in " + r.cidr)
                 mostSpecific = compare_cidr(mostSpecific, r.cidr)