annet 2.5.2__tar.gz → 2.5.4__tar.gz

{annet-2.5.2/annet.egg-info → annet-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 2.5.2
+Version: 2.5.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.2.2; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.3.0; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

{annet-2.5.2 → annet-2.5.4}/annet/adapters/netbox/common/models.py

@@ -19,6 +19,11 @@ class Entity(DumpableView):
         return self.name
 
 
+@dataclass
+class EntityWithSlug(Entity):
+    slug: str
+
+
 @dataclass
 class Label:
     value: str
@@ -82,7 +87,7 @@ class IpAddress(DumpableView, Generic[_PrefixT]):
     family: IpFamily
     address: str
     status: Label
-    tags: List[Entity]
+    tags: List[EntityWithSlug]
     created: datetime
     last_updated: datetime
     prefix: Optional[_PrefixT] = None
@@ -135,12 +140,14 @@ class Interface(Entity, Generic[_IpAddressT]):
     mode: Optional[InterfaceMode]
     untagged_vlan: Optional[InterfaceVlan]
     tagged_vlans: Optional[List[InterfaceVlan]]
+    tags: List[EntityWithSlug]
     display: str = ""
     ip_addresses: List[_IpAddressT] = field(default_factory=list)
     vrf: Optional[Entity] = None
     mtu: int | None = None
     lag: Entity | None = None
     lag_min_links: int | None = None
+    speed: int | None = None
 
     def add_addr(self, address_mask: str, vrf: str | None) -> None:
         for existing_addr in self.ip_addresses:
@@ -186,10 +193,11 @@ class NetboxDevice(Entity, Generic[_InterfaceT]):
     primary_ip: Optional[DeviceIp]
     primary_ip4: Optional[DeviceIp]
     primary_ip6: Optional[DeviceIp]
-    tags: List[Entity]
+    tags: List[EntityWithSlug]
     custom_fields: Dict[str, Any]
     created: datetime
     last_updated: datetime
+    cluster: Optional[Entity]
 
     fqdn: str
     hostname: str

{annet-2.5.2 → annet-2.5.4}/annet/adapters/netbox/common/storage_base.py

@@ -161,6 +161,7 @@ class BaseNetboxStorage(
             return self._id_devices[obj_id]
 
         device = self.netbox.get_device(obj_id)
+        self._fill_device_interfaces([device])
         self._record_device(device)
         return device
 

{annet-2.5.2 → annet-2.5.4}/annet/rulebook/b4com/iface.py

@@ -13,6 +13,16 @@ def mtu(rule, key, diff, **kwargs):
         yield from common.default(rule, key, diff, **kwargs)
 
 
+def description(rule, key, diff, **kwargs):
+    """
+    Удаляем description без указания значения
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "no description", None)
+    elif diff[Op.ADDED]:
+        yield from common.default(rule, key, diff, **kwargs)
+
+
 def sflow(rule, key, diff, **kwargs):
     """
     Команда sflow sampling-rate * direction ingress max-header-size *

{annet-2.5.2 → annet-2.5.4}/annet/rulebook/texts/b4com.order

@@ -6,3 +6,14 @@
 # Фичи должны быть включены прежде всего
 feature
 # Далее нужно будет указать команды и их порядок
+interface *
+    description
+    ip vrf forwarding
+    ipv6 address
+    mtu
+    lldp-agent
+        set lldp
+        lldp tlv
+        dcbx
+        exit
+    sflow

{annet-2.5.2 → annet-2.5.4}/annet/rulebook/texts/b4com.rul

@@ -13,7 +13,10 @@
 # Physical
 sflow *
 
-interface */(ce|xe)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+interface */(ce|xe|eth)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+    description *                 %logic=b4com.iface.description
+    ip vrf forwarding *
+    ip address *
     ipv6 address *
     mtu *                         %logic=b4com.iface.mtu
     sflow *                       %logic=b4com.iface.sflow

{annet-2.5.2 → annet-2.5.4/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 2.5.2
+Version: 2.5.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.2.2; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.3.0; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

{annet-2.5.2 → annet-2.5.4}/annet.egg-info/requires.txt

@@ -13,4 +13,4 @@ adaptix==3.0.0b7
 dataclass-rest==0.4
 
 [netbox]
-annetbox[sync]>=0.2.2
+annetbox[sync]>=0.3.0

{annet-2.5.2 → annet-2.5.4}/setup.py

@@ -44,7 +44,7 @@ if __name__ == "__main__":
           ],
         },
         extras_require={
-            "netbox": ["annetbox[sync]>=0.2.2"],
+            "netbox": ["annetbox[sync]>=0.3.0"],
         },
         python_requires=">=3.10",
         install_requires=requirements(),