add oxiApi

oxi/interface/__init__.py

@@ -1,9 +1,10 @@
 from .vrp import Vrp
 from .qtech import Qtech
 from .mikrotik import Mikrotik
-
+from .bdcom import BDcom
 __all__ = [
     'Vrp',
     'Qtech',
-    'Mikrotik'
+    'Mikrotik',
+    'BDcom'
 ]

oxi/interface/bdcom.py

@@ -0,0 +1,5 @@
+from oxi.interface import Qtech
+
+
+class BDcom(Qtech):
+    pass

oxi/interface/mikrotik.py

@@ -0,0 +1,5 @@
+from oxi.interface.base import BaseDevice
+
+
+class Mikrotik(BaseDevice):
+    ...

oxi/interface/qtech.py

@@ -1,6 +1,6 @@
 import re
 
-from oxi.models.base import BaseDevice
+from oxi.interface.base import BaseDevice
 
 
 class Qtech(BaseDevice):

oxi/interface/vrp.py

@@ -1,6 +1,6 @@
 import re
 
-from oxi.models.base import BaseDevice, Vlan
+from oxi.interface.base import BaseDevice, Vlan
 
 
 class Vrp(BaseDevice):

oxi/manager.py

@@ -1,16 +1,30 @@
+import logging
+
 import requests
 from typing import Optional
+
 from settings import settings
 
+log = logging.getLogger()
 
-class OxiManager:
+
+class OxidizedAPI:
     def __init__(
             self,
-            session: Optional[requests.Session] = None
+            session: Optional[requests.Session] = None,
+            username: Optional[str] = None,
+            password: Optional[str] = None,
+            verify: bool = True
     ):
-        self.base_url = settings.oxi_url
+        self.base_url = settings.oxi_url.rstrip('/')
         self._session = session or requests.Session()
-        self._session.auth = (settings.oxi_username, settings.oxi_password)
+        self._session.verify = verify
+        if username and password:
+            self._session.auth = (username, password)
+
+    @property
+    def node(self):
+        return Node(self._session, self.base_url)
 
     def __enter__(self):
         return self
@@ -18,7 +32,7 @@ class OxiManager:
     def __exit__(self, *args):
         self._session.close()
 
-    def get(self, endpoint: str, **kwargs) -> requests.Response:
+    def get(self, endpoint: str, **kwargs) -> dict:
         url = f"{self.base_url}/{endpoint.lstrip('/')}"
         if not url.endswith('.json'):
             url += '.json'
@@ -28,6 +42,68 @@ class OxiManager:
         return result.json()
 
 
-oxi = OxiManager()
+class Node:
-oxi.get('node/show/AKD-MSK30-AGG_S-01')
+    def __init__(self, session: requests.Session, base_url: str):
+        self._session = session
+        self._base_url = base_url
+        self._data = None
 
+    def show(self, name: str) -> 'NodeView':
+        url = f"{self._base_url}/node/show/{name}"
+        if not url.endswith('.json'):
+            url += '.json'
+        self._data = self._session.get(url)
+        return NodeView(
+            session=self._session,
+            base_url=self._base_url,
+            data=self._data.json()
+        )
+
+
+class NodeView:
+    def __init__(self, session: requests.Session, base_url: str, data: dict):
+        self._session = session
+        self._base_url = base_url
+        self._data = data
+
+    @property
+    def ip(self):
+        return self._data.get('ip')
+
+    @property
+    def full_name(self):
+        return self._data.get('full_name')
+
+    @property
+    def group(self):
+        return self._data.get('group')
+
+    @property
+    def model(self):
+        return self._data.get('model')
+
+    @property
+    def config(self):
+        return NodeConfig(self._session, self.full_name, self._base_url)
+
+
+class NodeConfig:
+    def __init__(self, session: requests.Session, full_name: str, base_url: str):
+        self._session = session
+        self._full_name = full_name
+        self._url = f"{base_url}/node/fetch/{full_name}"
+
+    def text(self) -> str:
+        return self._session.get(self._url).text
+
+    def json(self) -> dict:
+        return self._session.get(self._url).json()
+
+    def __str__(self) -> str:
+        return self.text()
+
+
+oxi = OxidizedAPI(username=settings.oxi_username, password=settings.oxi_password, verify=False)
+print(oxi.node.show('Novok_HOME').config)
+mikrotik = oxi.node.show('Novok_HOME').model
+print(mikrotik.model)

oxi/models/mikrotik.py

@@ -1,5 +0,0 @@
-from oxi.models.base import BaseDevice
-
-
-class Mikrotik(BaseDevice):
-    ...

pynet.py

@@ -3,19 +3,16 @@ import pynetbox
 from settings import settings
 
 netbox = pynetbox.api(
-    settings.url,
+    settings.nb_url,
-    token=settings.token)
+    token=settings.nb_token)
 netbox.http_session.verify = False
 
 filters = {
-    "has_primary_ip": "true",  # или True, зависит от API
+    "has_primary_ip": "true",
-    "tenant": "vimpelcom",     # имя или ID арендатора
+    "tenant": "vimpelcom",
-    "role": "Kommutator",      # роль устройства
+    "role": "Kommutator",
 }
 
-# Передаём словарь в filter через **
 devices = netbox.dcim.devices.filter(**filters)
-
-# Вывод результатов
 for device in devices:
     print(f"{device.name} (IP: {device.primary_ip})")

type.py

@@ -0,0 +1,5 @@
+vimpelcomSWType = {
+    "has_primary_ip": "true",
+    "tenant": "vimpelcom",
+    "role": "Kommutator",
+}