annet 0.13.4__py3-none-any.whl → 0.13.6__py3-none-any.whl

annet/adapters/netbox/common/manufacturer.py

@@ -19,15 +19,12 @@ _VENDORS = {
 }
 
 
-def _vendor_to_hw(vendor):
-    return HardwareView(_VENDORS.get(vendor.lower(), vendor), None)
-
-
-def get_hw(manufacturer: str, model: str):
+def get_hw(manufacturer: str, model: str, platform_name: str):
     # by some reason Netbox calls Mellanox SN as MSN, so we fix them here
     if manufacturer == "Mellanox" and model.startswith("MSN"):
         model = model.replace("MSN", "SN", 1)
-    hw = _vendor_to_hw(manufacturer + " " + model)
+    vendor = manufacturer + " " + model
+    hw = HardwareView(_VENDORS.get(vendor.lower(), vendor), platform_name)
     if not hw:
         raise ValueError(f"unsupported manufacturer {manufacturer}")
     return hw

annet/adapters/netbox/common/models.py

@@ -80,6 +80,17 @@ class InterfaceType:
     label: str
 
 
+@dataclass
+class InterfaceMode:
+    value: str
+    label: str
+
+
+@dataclass
+class InterfaceVlan(Entity):
+    vid: int
+
+
 @dataclass
 class Interface(Entity):
     device: Entity
@@ -87,6 +98,9 @@ class Interface(Entity):
     description: str
     type: InterfaceType
     connected_endpoints: Optional[list[InterfaceConnectedEndpoint]]
+    mode: Optional[InterfaceMode]
+    untagged_vlan: Optional[InterfaceVlan]
+    tagged_vlans: Optional[List[InterfaceVlan]]
     display: str = ""
     ip_addresses: List[IpAddress] = field(default_factory=list)
 

annet/adapters/netbox/v24/storage.py

@@ -44,6 +44,9 @@ def extend_device(
 ) -> models.NetboxDevice:
     manufacturer = device.device_type.manufacturer.name
     model = device.device_type.model
+    platform_name = ""
+    if device.platform:
+        platform_name = device.platform.name
 
     return models.NetboxDevice(
         url=device.url,
@@ -71,7 +74,7 @@ def extend_device(
 
         fqdn=device.name,
         hostname=device.name,
-        hw=get_hw(manufacturer, model),
+        hw=get_hw(manufacturer, model, platform_name),
         breed=get_breed(manufacturer, model),
         interfaces=[],
         neighbours_ids=[],

annet/adapters/netbox/v37/storage.py

@@ -42,6 +42,9 @@ def extend_device(
         neighbours: Optional[List[models.NetboxDevice]],
         storage: Storage,
 ) -> models.NetboxDevice:
+    platform_name: str = ""
+    if device.platform:
+        platform_name = device.platform.name
     return extend_device_base(
         device=device,
         interfaces=interfaces,
@@ -52,6 +55,7 @@ def extend_device(
         hw=get_hw(
             device.device_type.manufacturer.name,
             device.device_type.model,
+            platform_name,
         ),
         neighbours=neighbours,
         storage=storage,

{annet-0.13.4.dist-info → annet-0.13.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.13.4
+Version: 0.13.6
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.13.4.dist-info → annet-0.13.6.dist-info}/RECORD

@@ -26,15 +26,15 @@ annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 annet/adapters/netbox/provider.py,sha256=OM7Hq2vnMHNVBfubJvx2qJlMYm3VvKhomdLMNO8YnLQ,1024
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
-annet/adapters/netbox/common/manufacturer.py,sha256=UH_tEKT3GXC8WSm15q0xxXRE7aj0b0icgwmR--PRWBs,1771
-annet/adapters/netbox/common/models.py,sha256=rmFQ93NUCnFM-p58aS4sjiOaTuYR0Xz65soiW7IQfDk,2516
+annet/adapters/netbox/common/manufacturer.py,sha256=van_-9-3cnBadZkF3Srae_m8cUSjf8KQCCCHFcdeQyo,1758
+annet/adapters/netbox/common/models.py,sha256=zxAADsHld1r0z3RswEt6bYQrJUYHyI_1hBSB-GbPvIM,2760
 annet/adapters/netbox/common/query.py,sha256=OgUuF-bvshpoBUkrOs0tsMUAhjTsttzx3VV30ryFl0Y,577
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=rl_0pr3VzmOy6PDZIUMkKSBfJh90gD9TFL3yBhK_8ME,337
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v24/storage.py,sha256=uDcAuabORu8ag3OXDHXKDK469Pd-kNXpUI_Cg-hgW_k,5919
+annet/adapters/netbox/v24/storage.py,sha256=ogCu5XXIpcpPtuz7dWfDFIbqtz8k5G96PL6mhAQWwBU,6026
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v37/storage.py,sha256=9CxLr2tMWvGA1BLtjd5TTp2qEUQ_aYJq0eZSe-S242E,7372
+annet/adapters/netbox/v37/storage.py,sha256=XIP11yp_ypi2lEQdtqNXGkzUYNxFCfDsmUM5pnoMFPU,7496
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
@@ -124,10 +124,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.13.4.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.13.4.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.13.4.dist-info/METADATA,sha256=Ug49vbZb6q3AP41fId0L8o2hCst2KTJ9V4l2MgYF2rA,694
-annet-0.13.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.13.4.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.13.4.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.13.4.dist-info/RECORD,,
+annet-0.13.6.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.13.6.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.13.6.dist-info/METADATA,sha256=o_MGhpo38KbBhndlGER9EnhCvJdLWy1uZbsDNr78ODU,694
+annet-0.13.6.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+annet-0.13.6.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.13.6.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.13.6.dist-info/RECORD,,

{annet-0.13.4.dist-info → annet-0.13.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any