umnetdb-utils 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

umnetdb_utils/base.py

@@ -45,7 +45,7 @@ class UMnetdbBase:
             val = self._env.get(var, getenv(var))
 
             if not val:
-                raise ValueError(f"Undefined environment variable {val} in {url}")
+                raise ValueError(f"Undefined environment variable {var} in {url}")
             url = re.sub(r"{" + var + "}", val, url)
 
         return url
@@ -92,8 +92,9 @@ class UMnetdbBase:
           ex: "node_ip nip"
         :joins: a list of strings representing join statements. Include the actual 'join' part!
           ex: ["join node n on nip.mac = n.mac", "join device d on d.ip = n.switch"]
-        :where: A list of 'where' statements without the 'where'. The list of statements are
-          "anded". If you need "or", embed it in one of your list items
+        :where: For a single where statement, provide a string. For multiple provide a list. 
+           The list of statements are "anded". If you need "or", embed it in one of your list items
+           DO NOT provide the keyword 'where' - it is auto-added.
           ex: ["node_ip.ip = '1.2.3.4'", "node.switch = '10.233.0.5'"]
         :order_by: A string representing a column name (or names) to order by
         :group_by: A string representing a column name (or names) to group by
@@ -115,9 +116,12 @@ class UMnetdbBase:
                 sql += f"{j}\n"
 
         # Next are the filters. They are 'anded'
-        if where:
+        if where and isinstance(where, list):
+            
             sql += "where\n"
             sql += " and\n".join(where) + "\n"
+        elif where:
+            sql += f"where {where}\n"
 
         # Finally the other options
         if order_by:
@@ -151,4 +155,19 @@ class UMnetdbBase:
         elif rows:
             return rows
         else:
-            return []
+            return []
+        
+    def execute(self, sql:str, rows_as_dict:bool=True, fetch_one:bool=False):
+        """
+        Executes a sqlalchemy command and gives all the results. Does not open a session - you must
+        open one yourself
+        """
+        result = self.session.execute(text(sql))
+
+        if rows_as_dict:
+            result = result.mappings()
+
+        if fetch_one:
+            return result.fetchone()
+        
+        return result.fetchall()

umnetdb_utils/umnetdb.py

@@ -1,5 +1,7 @@
 
 from typing import List
+import logging
+
 
 from sqlalchemy import text
 from .base import UMnetdbBase
@@ -9,7 +11,7 @@ class UMnetdb(UMnetdbBase):
 
     URL="postgresql+psycopg://{UMNETDB_USER}:{UMNETDB_PASSWORD}@wintermute.umnet.umich.edu/umnetdb"
 
-    def get_device_neighbors(
+    def get_neighbors(
         self, device: str, known_devices_only: bool = True
     ) -> List[dict]:
         """
@@ -33,6 +35,11 @@ class UMnetdb(UMnetdbBase):
                 "l.parent",
                 "n_l.parent as remote_parent"
                 ]
+            joins = [
+             "join device n_d on n_d.hostname=n.remote_device",
+             "left outer join lag l on l.device=n.device and l.member=n.port",
+             "left outer join lag n_l on n_l.device=n_d.name and n_l.member=n.remote_port",
+            ]
         else:
             select = [
                 "n.port",
@@ -41,18 +48,65 @@ class UMnetdb(UMnetdbBase):
                 "l.parent",
                 "n_l.parent as remote_parent"
             ]
-        
+            joins = [
+                "left outer join device n_d on n_d.hostname=n.remote_device",
+                "left outer join lag l on l.device=n.device and l.member=n.port",
+                "left outer join lag n_l on n_l.device=n_d.name and n_l.member=n.remote_port",
+            ]
+
         table = "neighbor n"
 
-        joins = [
-             "left outer join device n_d on n_d.hostname=n.remote_device",
-             "left outer join lag l on l.device=n.device and l.member=n.port",
-             "left outer join lag n_l on n_l.device=n_d.name and n_l.member=n.remote_port",
-        ]
+
 
         where = [f"n.device='{device}'"]
 
         query = self._build_select(select, table, joins, where)
         result = self.session.execute(text(query))
 
-        return [dict(zip(result.keys(), r)) for r in result]
+        return [dict(zip(result.keys(), r)) for r in result]
+    
+
+    def get_dlzone(self, zone_name:str) -> List[dict]:
+        """
+        Gets all devices within a DL zone based on walking the 'neighbors'
+        table.
+
+        For each device, the following attributes are returned:
+        "name", "ip", "version", "vendor", "model", "serial"
+        """
+        device_cols = ["name", "ip", "version", "vendor", "model", "serial"]
+
+        # step 1 is to find DLs in the database - we'll seed our zone with them
+        query = self._build_select(select=device_cols, table="device",where=f"name similar to '(d-|dl-){zone_name}-(1|2)'")
+        dls = self.execute(query)
+
+        if not dls:
+            raise ValueError(f"No DLs found in umnetdb for zone {zone_name}")
+
+        devices_by_name = {d['name']:d for d in dls}
+
+        # now we'll look for neighbors on each device within the zone.
+        # Note that outside of the DLs we only expect to find devices that start with
+        # "s-" anything else is considered 'outside the zone'
+        todo = list(devices_by_name.keys())
+        while(len(todo) != 0):
+
+            device = todo.pop()
+
+            # note that by default this method only returns neighbors in the 'device' table,
+            # any others are ignored
+            neighs = self.get_neighbors(device)
+
+            for neigh in neighs:
+                if neigh["remote_device"].startswith("s-"):
+
+                    query = self._build_select(select=device_cols, table="device", where=f"name = '{neigh['remote_device']}'")
+                    neigh_device = self.execute(query, fetch_one=True)
+
+                    if neigh_device["name"] not in devices_by_name:
+                        todo.append(neigh_device["name"])
+
+                    devices_by_name[neigh_device["name"]] = neigh_device
+
+
+        return list(devices_by_name.values())

{umnetdb_utils-0.1.1.dist-info → umnetdb_utils-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umnetdb-utils
-Version: 0.1.1
+Version: 0.1.3
 Summary: Helper classes for querying UMnet databases
 License: MIT
 Author: Amy Liebowitz
@@ -25,7 +25,7 @@ This package is hosted on pypi - you can install it with `pip install umnetdb-ut
 
 ## Database Helper Classes
 As of May 2025 this repo defines db wrapper classes for Equipdb, Netinfo, Netdisco and UMnetdb (populated by agador, hosted on wintermute).
-To use these classes you need to set specific environment variables with the credentials for each db respectively:
+To use these classes you need to provide credentials, either in a config file that you pass into the initializer, in `.env`, or in your environment:
 * Netinfo: `NETINFO_USERNAME`, `NETINFO_PASSSWORD`
 * Netdisco: `NETDISCO_DB_USER`, `NETDISCO_DB_PASSWORD`
 * Equipdb: `EQUIP_DB_USER`, `EQUIP_DB_PASSWORD`

{umnetdb_utils-0.1.1.dist-info → umnetdb_utils-0.1.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 umnetdb_utils/__init__.py,sha256=QJaytbr4ccKESiwaKjpf1b4b8s2cHNfCDdnCOs1tmoI,131
-umnetdb_utils/base.py,sha256=PCtc08eZ1BwExSY1nm-eGWMTd_V56fsZXhXq2D6rU0Q,5231
-umnetdb_utils/umnetdb.py,sha256=2jPsZsJWFtwWKIRqww86B8tRWBQ0cbw3iOk9PwAXaxY,1948
+umnetdb_utils/base.py,sha256=aIcCdeQ2FTrWV4Az_gdPc-aXuEwRjhef1Xj9SVak438,5878
+umnetdb_utils/umnetdb.py,sha256=AWA-UTiWIqi6i2SDkinjQR0ONoRcF0v6MAmiEllo0Z0,4058
 umnetdb_utils/umnetdisco.py,sha256=Z2XwT79jKO_avd3w_z99DDEdAikrfKxYm1JYHRWqvG4,7841
 umnetdb_utils/umnetequip.py,sha256=jOW5kvk0FXtdHv8PA4rYT_PWfLdMiq83Mjwmy-c1DN8,5701
 umnetdb_utils/umnetinfo.py,sha256=MH1YDW4OWtHD46qfYb5Pv40vPSbL0GrMNW5gAhdlihE,18445
 umnetdb_utils/utils.py,sha256=wU6QMYfofj7trX3QeqXty0btbGdhP_RUaSqA7QTflFM,991
-umnetdb_utils-0.1.1.dist-info/METADATA,sha256=T0ycl5URR_p5V8qWkm-IBk1VuDLsvEkwGZbUMYZFm-M,1521
-umnetdb_utils-0.1.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-umnetdb_utils-0.1.1.dist-info/RECORD,,
+umnetdb_utils-0.1.3.dist-info/METADATA,sha256=5Y2fRGaGfuri9u2JMQYV6TiyzbPIug3W6YJbHBCPUHA,1555
+umnetdb_utils-0.1.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+umnetdb_utils-0.1.3.dist-info/RECORD,,