mreg-cli 1.4.0__tar.gz → 1.4.2__tar.gz

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## Unreleased -->
 
+## [1.4.2](https://github.com/unioslo/mreg-cli/releases/tag/1.4.2) - 2025-08-15
+
+### Fixed
+
+- `host info` for hosts with A(AAA)-records that point to networks not managed by MREG.
+- `network community_host_add` raising a 404 error for hosts with IPs in networks not managed by MREG.
+
+## [1.4.1](https://github.com/unioslo/mreg-cli/releases/tag/1.4.1) - 2025-08-06
+
+### Changed
+
+- `ptr add -force` now allows adding PTR records for IPs that are not in a network managed by MREG.
+
 ## [1.4.0](https://github.com/unioslo/mreg-cli/releases/tag/1.4.0) - 2025-06-20
 
 ### Added

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.4.0
+Version: 1.4.2
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/ci/testsuite-result.json

@@ -23044,7 +23044,7 @@
     "command_issued": "dhcp assoc foo aa:bb:cc:dd:ee:ff # should fail, two IPs of same type",
     "ok": [],
     "warning": [
-      "Host foo.example.org has multiple IPs, cannot determine which one to use."
+      "Host foo.example.org has multiple IPs, cannot determine which one to use: 10.0.0.5, 10.0.0.6."
     ],
     "error": [],
     "output": [],
@@ -23070,15 +23070,15 @@
           "ipaddresses": [
             {
               "macaddress": "",
-              "created_at": "2025-06-19T13:09:08.251883+02:00",
-              "updated_at": "2025-06-19T13:09:08.251892+02:00",
+              "created_at": "2025-08-13T10:41:00.041467+02:00",
+              "updated_at": "2025-08-13T10:41:00.041474+02:00",
               "ipaddress": "10.0.0.5",
               "host": 18
             },
             {
               "macaddress": "",
-              "created_at": "2025-06-19T13:09:08.382145+02:00",
-              "updated_at": "2025-06-19T13:09:08.382151+02:00",
+              "created_at": "2025-08-13T10:41:00.185731+02:00",
+              "updated_at": "2025-08-13T10:41:00.185738+02:00",
               "ipaddress": "10.0.0.6",
               "host": 18
             }
@@ -23087,8 +23087,8 @@
           "mxs": [],
           "txts": [
             {
-              "created_at": "2025-06-19T13:09:07.019259+02:00",
-              "updated_at": "2025-06-19T13:09:07.019265+02:00",
+              "created_at": "2025-08-13T10:40:58.935125+02:00",
+              "updated_at": "2025-08-13T10:40:58.935130+02:00",
               "txt": "v=spf1 -all",
               "host": 18
             }
@@ -23103,8 +23103,8 @@
           "loc": null,
           "bacnetid": null,
           "communities": [],
-          "created_at": "2025-06-19T13:09:07.017552+02:00",
-          "updated_at": "2025-06-19T13:09:07.017559+02:00",
+          "created_at": "2025-08-13T10:40:58.933270+02:00",
+          "updated_at": "2025-08-13T10:40:58.933280+02:00",
           "name": "foo.example.org",
           "contact": "",
           "ttl": null,
@@ -23513,7 +23513,7 @@
     "command_issued": "dhcp assoc foo aa:bb:cc:dd:ee:ff # should fail, the host has two IPs of different types on different VLANs.",
     "ok": [],
     "warning": [
-      "Host foo.example.org has multiple IPs, cannot determine which one to use."
+      "Host foo.example.org has multiple IPs, cannot determine which one to use: 10.0.0.5, 2001:db9::5."
     ],
     "error": [],
     "output": [],
@@ -23539,15 +23539,15 @@
           "ipaddresses": [
             {
               "macaddress": "",
-              "created_at": "2025-06-19T13:09:08.251883+02:00",
-              "updated_at": "2025-06-19T13:09:08.251892+02:00",
+              "created_at": "2025-08-13T10:41:00.041467+02:00",
+              "updated_at": "2025-08-13T10:41:00.041474+02:00",
               "ipaddress": "10.0.0.5",
               "host": 18
             },
             {
               "macaddress": "",
-              "created_at": "2025-06-19T13:09:08.758513+02:00",
-              "updated_at": "2025-06-19T13:09:08.758520+02:00",
+              "created_at": "2025-08-13T10:41:00.786601+02:00",
+              "updated_at": "2025-08-13T10:41:00.786608+02:00",
               "ipaddress": "2001:db9::5",
               "host": 18
             }
@@ -23556,8 +23556,8 @@
           "mxs": [],
           "txts": [
             {
-              "created_at": "2025-06-19T13:09:07.019259+02:00",
-              "updated_at": "2025-06-19T13:09:07.019265+02:00",
+              "created_at": "2025-08-13T10:40:58.935125+02:00",
+              "updated_at": "2025-08-13T10:40:58.935130+02:00",
               "txt": "v=spf1 -all",
               "host": 18
             }
@@ -23572,8 +23572,8 @@
           "loc": null,
           "bacnetid": null,
           "communities": [],
-          "created_at": "2025-06-19T13:09:07.017552+02:00",
-          "updated_at": "2025-06-19T13:09:07.017559+02:00",
+          "created_at": "2025-08-13T10:40:58.933270+02:00",
+          "updated_at": "2025-08-13T10:40:58.933280+02:00",
           "name": "foo.example.org",
           "contact": "",
           "ttl": null,
@@ -23590,8 +23590,8 @@
           "excluded_ranges": [],
           "policy": null,
           "communities": [],
-          "created_at": "2025-06-19T13:09:06.902388+02:00",
-          "updated_at": "2025-06-19T13:09:06.902398+02:00",
+          "created_at": "2025-08-13T10:40:58.822374+02:00",
+          "updated_at": "2025-08-13T10:40:58.822385+02:00",
           "network": "10.0.0.0/24",
           "description": "foo",
           "vlan": 1234,
@@ -23611,8 +23611,8 @@
           "excluded_ranges": [],
           "policy": null,
           "communities": [],
-          "created_at": "2025-06-19T13:09:08.663889+02:00",
-          "updated_at": "2025-06-19T13:09:08.663898+02:00",
+          "created_at": "2025-08-13T10:41:00.673383+02:00",
+          "updated_at": "2025-08-13T10:41:00.673397+02:00",
           "network": "2001:db9::/64",
           "description": "notfoo_ipv6",
           "vlan": 1235,

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/mreg_cli/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.0'
-__version_tuple__ = version_tuple = (1, 4, 0)
+__version__ = version = '1.4.2'
+__version_tuple__ = version_tuple = (1, 4, 2)

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/mreg_cli/api/models.py

@@ -24,6 +24,7 @@ from mreg_cli.api.endpoints import Endpoint
 from mreg_cli.api.fields import HostName, MacAddress, NameList
 from mreg_cli.api.history import HistoryItem, HistoryResource
 from mreg_cli.exceptions import (
+    APINotOk,
     CreateError,
     DeleteError,
     EntityAlreadyExists,
@@ -1615,6 +1616,39 @@ class Network(FrozenModelWithTimestamps, APIMixin):
         """Return the endpoint for the class."""
         return Endpoint.Networks
 
+    @classmethod
+    def dummy_network_from_ip(cls, ip: IPAddress) -> Self:
+        """Create a Network object for an unknown network given an IP.
+
+        NOTE: Does not perform any API calls. This is purely to work around
+        the fact that MREG supports creating IP addresses for networks that
+        are not registered in MREG.
+        """
+        if ip.is_ipv4():
+            network_addr = "0.0.0.0/24"
+            description = "Unknown IPv4 network"
+        else:
+            network_addr = "::/64"
+            description = "Unknown IPv6 network"
+
+        return cls(
+            id=0,
+            excluded_ranges=[],
+            network=network_addr,
+            description=description,
+            vlan=None,
+            dns_delegated=False,
+            category="",
+            location="",
+            frozen=False,
+            reserved=0,
+            policy=None,
+            communities=[],
+            # epoch time
+            created_at=datetime.fromtimestamp(0),
+            updated_at=datetime.fromtimestamp(0),
+        )
+
     @classmethod
     def get_by_any_means(cls, identifier: str) -> Self | None:
         """Get a network by the given identifier.
@@ -2412,14 +2446,18 @@ class IPAddress(FrozenModelWithTimestamps, WithHost, APIMixin):
         """Return True if the IP address is IPv6."""
         return self.ipaddress.version == 6
 
-    def network(self) -> Network:
+    def network(self) -> Network | None:
         """Return the network of the IP address."""
-        data = get(Endpoint.NetworksByIP.with_id(str(self.ipaddress)))
-        return Network.model_validate(data.json())
+        try:
+            return get_typed(Endpoint.NetworksByIP.with_id(str(self.ipaddress)), Network)
+        except APINotOk:
+            return None
 
     def vlan(self) -> int | None:
         """Return the VLAN of the IP address."""
-        return self.network().vlan
+        if net := self.network():
+            return net.vlan
+        return None
 
     def associate_mac(self, mac: MacAddress, force: bool = False) -> IPAddress:
         """Associate a MAC address with the IP address.
@@ -3394,14 +3432,32 @@ class Host(FrozenModelWithTimestamps, WithTTL, WithHistory, APIMixin):
         ipv6s = self.ipv6_addresses()
 
         if len(ipv4s) == 1 and len(ipv6s) == 1:
-            vlan4 = ipv4s[0].network().vlan
-            vlan6 = ipv6s[0].network().vlan
-
-            if vlan4 == vlan6:
-                return ipv4s[0]
+            ipv4_address = ipv4s[0]
+            ipv6_address = ipv6s[0]
+            ipv4_network = ipv4_address.network()
+            ipv6_network = ipv6_address.network()
+
+            if ipv4_network and ipv6_network:
+                if ipv4_network.vlan == ipv6_network.vlan:
+                    return ipv4_address
+            elif ipv4_network:  # only IPv4 is in mreg
+                logger.warning(
+                    "Host '%s' has IPv6 address not in MREG: %s",
+                    self.name,
+                    str(ipv6_address.ipaddress),
+                )
+                return ipv4_address
+            elif ipv6_network:  # only IPv6 is in mreg
+                logger.warning(
+                    "Host '%s' has IPv4 address not in MREG: %s",
+                    self.name,
+                    str(ipv4_address.ipaddress),
+                )
+                return ipv6_address
 
+        ips = ", ".join(str(ip.ipaddress) for ip in self.ipaddresses)
         raise EntityOwnershipMismatch(
-            f"Host {self} has multiple IPs, cannot determine which one to use."
+            f"Host {self} has multiple IPs, cannot determine which one to use: {ips}."
         )
 
     def has_ptr_override(self, arg_ip: IP_AddressT) -> bool:
@@ -3554,12 +3610,18 @@ class Host(FrozenModelWithTimestamps, WithTTL, WithHistory, APIMixin):
     def networks(self) -> dict[Network, list[IPAddress]]:
         """Return a dict of unique networks and a list of associated IP addresses for the host.
 
+        Does not return networks that are not registered in MREG.
+
         :returns: A dictionary of networks and the associated IP addresses.
         """
         ret_dict: dict[Network, list[IPAddress]] = {}
 
         for ip in self.ipaddresses:
             network = ip.network()
+            if not network:
+                # If network is not in MREG, we create a placeholder network
+                network = Network.dummy_network_from_ip(ip)
+
             if network not in ret_dict:
                 ret_dict[network] = []
 

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/mreg_cli/commands/host_submodules/rr.py

@@ -534,15 +534,14 @@ def ptr_add(args: argparse.Namespace) -> None:
     if existing_ptrs:
         raise EntityAlreadyExists(f"{ip} already exists in a PTR record.")
 
-    if host.zone is None and not args.force:
-        raise ForceMissing(f"{host} isn't in a zone controlled by MREG, must force")
-
     network = Network.get_by_ip(ip)
-    if not network:
-        raise EntityNotFound(f"{ip} isn't in a network controlled by MREG")
-
-    if network.is_reserved_ip(ip) and not args.force:
-        raise ForceMissing("Address is reserved. Requires force")
+    if not args.force:
+        if host.zone is None:
+            raise ForceMissing(f"{host} isn't in a zone controlled by MREG, must force")
+        elif not network:
+            raise ForceMissing(f"{ip} isn't in a network controlled by MREG, must force")
+        elif network and network.is_reserved_ip(ip):
+            raise ForceMissing(f"{ip} is reserved, must force")
 
     PTR_override.create({"host": host.id, "ipaddress": str(ip)})
     OutputManager().add_ok(f"Added PTR record {ip} to {host.name}.")

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/mreg_cli/commands/network.py

@@ -1223,7 +1223,10 @@ def community_host_add(args: argparse.Namespace) -> None:
 
     h = Host.get_by_any_means_or_raise(host)
     ipaddr = _check_host_ip(h, ip)
-    net = ipaddr.network()
+
+    if not (net := ipaddr.network()):
+        raise EntityNotFound(f"{h.name!r} is not in a network controlled by MREG.")
+
     com = net.get_community_or_raise(community)
 
     com.add_host(h, ipaddress=ipaddr.ipaddress)

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/mreg_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.4.0
+Version: 1.4.2
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>

{mreg_cli-1.4.0 → mreg_cli-1.4.2}/tests/api/test_models.py

@@ -6,7 +6,7 @@ from typing import Any, Callable
 
 import pytest
 
-from mreg_cli.api.models import IPNetMode, Network, NetworkOrIP
+from mreg_cli.api.models import IPAddress, IPNetMode, Network, NetworkOrIP
 from mreg_cli.exceptions import (
     InputFailure,
     InvalidIPAddress,
@@ -135,3 +135,84 @@ def test_network_ip_network(inp: str, expect: IP_NetworkT) -> None:
     assert network.ip_network == expect
     assert network.broadcast_address == expect.broadcast_address
     assert network.network_address == expect.network_address
+
+
+@pytest.mark.parametrize(
+    "inp",
+    [
+        "192.168.0.1",
+        "0.0.0.0",
+        "10.0.0.1",
+    ],
+)
+def test_network_dummy_network_from_ip_v4(inp: str) -> None:
+    """Test creating a dummy network from an IPv4 address."""
+    _test_network_dummy_network(IPv4Address(inp), expected_version=4)
+
+
+@pytest.mark.parametrize(
+    "inp",
+    [
+        "2001:db8::1",
+        "::1",
+        "fe80::1",
+    ],
+)
+def test_network_dummy_network_from_ip_v6(inp: str) -> None:
+    """Test creating a dummy network from an IPv6 address."""
+    _test_network_dummy_network(IPv6Address(inp), expected_version=6)
+
+
+def _test_network_dummy_network(inp: IPv4Address | IPv6Address, expected_version: int) -> None:
+    """Helper function to test creating a dummy network from an IP address."""  # noqa: D401
+    ip = _get_mreg_ipaddress(inp)
+    network = Network.dummy_network_from_ip(ip)
+    assert isinstance(network, Network)
+    assert network.ip_network.version == expected_version
+
+    # Ensure all dummy networks for the given IP type are hashed
+    # the same and equal to each other, so that all dummy networks
+    # of a given IP version are considered the same.
+    network2 = Network.dummy_network_from_ip(ip)
+    assert network == network2
+    assert hash(network) == hash(network2)
+
+
+def _get_mreg_ipaddress(ip: IPv4Address | IPv6Address) -> IPAddress:
+    """Construct an mreg IPAddress object from an IP."""
+    return IPAddress(
+        id=0,
+        host=0,
+        created_at=datetime.now(),
+        updated_at=datetime.now(),
+        ipaddress=ip,
+        # no mac
+    )
+
+
+def test_network_dummy_network_from_ip_identity() -> None:
+    """Test hashing of dummy networks from identical and differenet IP versions."""
+    ipv4_1 = _get_mreg_ipaddress(IPv4Address("192.168.0.1"))
+    ipv4_2 = _get_mreg_ipaddress(IPv4Address("192.168.0.2"))
+    ipv6_1 = _get_mreg_ipaddress(IPv6Address("2001:db8::1"))
+    ipv6_2 = _get_mreg_ipaddress(IPv6Address("2001:db8::2"))
+
+    network_v4_1 = Network.dummy_network_from_ip(ipv4_1)
+    network_v4_2 = Network.dummy_network_from_ip(ipv4_2)
+    network_v6_1 = Network.dummy_network_from_ip(ipv6_1)
+    network_v6_2 = Network.dummy_network_from_ip(ipv6_2)
+
+    assert network_v4_1 == network_v4_2
+    assert hash(network_v4_1) == hash(network_v4_2)
+
+    assert network_v6_1 == network_v6_2
+    assert hash(network_v6_1) == hash(network_v6_2)
+
+    assert network_v4_1 != network_v6_1
+    assert hash(network_v4_1) != hash(network_v6_1)
+
+    # Usage in dicts
+    d = {network_v4_1: "foo", network_v6_1: "bar"}
+    # Use the other two network objects to access the existing entries
+    assert d[network_v4_2] == "foo"
+    assert d[network_v6_2] == "bar"