mreg-cli 1.2.0__tar.gz → 1.2.1__tar.gz

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/CHANGELOG.md

@@ -5,7 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<!-- ## [Unreleased] -->
+<!-- ## Unreleased -->
+
+## [1.2.1](https://github.com/unioslo/mreg-cli/releases/tag/1.2.1) - 2024-12-02
+
+### Fixed
+
+- Host lookup with IPv6 addresses raising `ValidationError` when no host can be found with the given address.
+
+### Removed
+
+- Support for fetching hosts that have a valid IP/MAC address as their hostname.
 
 ## [1.2.0](https://github.com/unioslo/mreg-cli/releases/tag/1.2.0) - 2024-11-25
 

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mreg-cli
-Version: 1.2.0
+Version: 1.2.1
 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.2.0 → mreg_cli-1.2.1}/ci/testsuite-result.json

@@ -6,7 +6,6 @@
     "command_issued": "zone create example.org hostmaster@example.org ns1.example.org  # should require force because ns1 is unknown",
     "ok": [],
     "warning": [
-      "Host ns1.example.org not found.",
       "ns1.example.org is not in mreg, must force"
     ],
     "error": [],
@@ -41,9 +40,7 @@
     "ok": [
       "Created zone example.org"
     ],
-    "warning": [
-      "Host ns1.example.org not found."
-    ],
+    "warning": [],
     "error": [],
     "output": [],
     "api_requests": [
@@ -210,10 +207,9 @@
     "command": "zone set_ns example.org ns2.example.org",
     "command_filter": null,
     "command_filter_negate": false,
-    "command_issued": "zone set_ns example.org ns2.example.org # requires force because ns2 is unknown",
+    "command_issued": "zone set_ns example.org ns2.example.org  #  requires force because ns2 is unknown",
     "ok": [],
     "warning": [
-      "Host ns2.example.org not found.",
       "ns2.example.org is not in mreg, must force"
     ],
     "error": [],
@@ -271,9 +267,7 @@
     "ok": [
       "Updated nameservers for example.org"
     ],
-    "warning": [
-      "Host ns2.example.org not found."
-    ],
+    "warning": [],
     "error": [],
     "output": [],
     "api_requests": [
@@ -15283,9 +15277,7 @@
     "ok": [
       "Created zone delegation wut.example.org"
     ],
-    "warning": [
-      "Host ns2.example.org not found."
-    ],
+    "warning": [],
     "error": [],
     "output": [],
     "api_requests": [

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.2.0'
-__version_tuple__ = version_tuple = (1, 2, 0)
+__version__ = version = '1.2.1'
+__version_tuple__ = version_tuple = (1, 2, 1)

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/api/fields.py

@@ -21,25 +21,40 @@ class MACAddressField(FrozenModel):
 
     address: MacAddress
 
-    @classmethod
-    def validate(cls, value: str | MacAddress | Self) -> Self:
-        """Validate a MAC address and return it as a string."""
-        try:
-            return cls.validate_naive(value)
-        except ValueError as e:
-            raise InputFailure(e) from e
-
     # HACK: extremely hacky workaround for our custom exceptions always
     # logging errors/warnings even when caught.
     @classmethod
-    def validate_naive(cls, value: str | MacAddress | Self) -> Self:
+    def validate(cls, value: str | MacAddress | Self) -> Self:
         """Validate but raise built-in exceptions on failure."""
         if isinstance(value, MACAddressField):
-            return cls.validate_naive(value.address)
+            return cls.validate(value.address)
         try:
             return cls(address=value)  # pyright: ignore[reportArgumentType]
         except ValidationError as e:
-            raise ValueError(f"Invalid MAC address '{value}'") from e
+            raise InputFailure(f"Invalid MAC address '{value}'") from e
+
+    @classmethod
+    def parse_or_raise(cls, obj: Any) -> MacAddress:
+        """Parse a MAC address from a string. Returns the MAC address as a string.
+
+        :param obj: The object to parse.
+        :returns: The MAC address as a string.
+        :raises ValueError: If the object is not a valid MAC address.
+        """
+        # Match interface of NetworkOrIP.parse_or_raise
+        return cls.validate(obj).address
+
+    @classmethod
+    def parse(cls, obj: Any) -> MacAddress | None:
+        """Parse a MAC address from a string. Returns None if the MAC address is invalid.
+
+        :param obj: The object to parse.
+        :returns: The MAC address as a string or None if it is invalid.
+        """
+        try:
+            return cls.parse_or_raise(obj)
+        except ValueError:
+            return None
 
     def __str__(self) -> str:
         """Return the MAC address as a string."""

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/api/models.py

@@ -7,9 +7,11 @@ import logging
 import re
 from datetime import date, datetime
 from functools import cached_property
-from typing import Any, Callable, ClassVar, List, Literal, Self, cast, overload
+from typing import Any, Callable, ClassVar, Iterable, List, Literal, Self, cast, overload
 
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field, computed_field, field_validator
+from pydantic import ValidationError as PydanticValidationError
+from pydantic_extra_types.mac_address import MacAddress
 from typing_extensions import Unpack
 
 from mreg_cli.api.abstracts import APIMixin, FrozenModel, FrozenModelWithTimestamps
@@ -75,35 +77,41 @@ class NetworkOrIP(BaseModel):
             return cls.validate(value.ip_or_network)
         try:
             return cls(ip_or_network=value)  # pyright: ignore[reportArgumentType] # validator handles this
-        except ValidationError as e:
+        except PydanticValidationError as e:
             raise InputFailure(f"Invalid IP address or network: {value}") from e
 
     @overload
     @classmethod
-    def parse(cls, value: Any, mode: None = None) -> IP_AddressT | IP_NetworkT: ...
+    def parse_or_raise(cls, value: Any, mode: None = None) -> IP_AddressT | IP_NetworkT: ...
 
     @overload
     @classmethod
-    def parse(cls, value: Any, mode: Literal["ip"]) -> IP_AddressT: ...
+    def parse_or_raise(cls, value: Any, mode: Literal["ip"]) -> IP_AddressT: ...
 
     @overload
     @classmethod
-    def parse(cls, value: Any, mode: Literal["ipv4"]) -> ipaddress.IPv4Address: ...
+    def parse_or_raise(cls, value: Any, mode: Literal["ipv4"]) -> ipaddress.IPv4Address: ...
 
     @overload
     @classmethod
-    def parse(cls, value: Any, mode: Literal["ipv6"]) -> ipaddress.IPv6Address: ...
+    def parse_or_raise(cls, value: Any, mode: Literal["ipv6"]) -> ipaddress.IPv6Address: ...
 
     @overload
     @classmethod
-    def parse(cls, value: Any, mode: Literal["network"]) -> IP_NetworkT: ...
+    def parse_or_raise(cls, value: Any, mode: Literal["network"]) -> IP_NetworkT: ...
 
     @overload
     @classmethod
-    def parse(cls, value: Any, mode: IPNetMode) -> IP_AddressT | IP_NetworkT: ...
+    def parse_or_raise(cls, value: Any, mode: Literal["networkv4"]) -> ipaddress.IPv4Network: ...
+
+    @overload
+    @classmethod
+    def parse_or_raise(cls, value: Any, mode: Literal["networkv6"]) -> ipaddress.IPv6Network: ...
 
     @classmethod
-    def parse(cls, value: Any, mode: IPNetMode | None = None) -> IP_AddressT | IP_NetworkT:
+    def parse_or_raise(
+        cls, value: Any, mode: IPNetMode | None = None
+    ) -> IP_AddressT | IP_NetworkT:
         """Parse a value as an IP address or network.
 
         Optionally specify the mode to validate the input as.
@@ -126,6 +134,49 @@ class NetworkOrIP(BaseModel):
             return func(ipnet)
         return ipnet.ip_or_network
 
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: None = None) -> IP_AddressT | IP_NetworkT | None: ...
+
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: Literal["ip"]) -> IP_AddressT | None: ...
+
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: Literal["ipv4"]) -> ipaddress.IPv4Address | None: ...
+
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: Literal["ipv6"]) -> ipaddress.IPv6Address | None: ...
+
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: Literal["network"]) -> IP_NetworkT | None: ...
+
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: Literal["networkv4"]) -> ipaddress.IPv4Network | None: ...
+
+    @overload
+    @classmethod
+    def parse(cls, value: Any, mode: Literal["networkv6"]) -> ipaddress.IPv6Network | None: ...
+
+    @classmethod
+    def parse(cls, value: Any, mode: IPNetMode | None = None) -> IP_AddressT | IP_NetworkT | None:
+        """Parse a value as an IP address or network, or None if parsing fails.
+
+        Optionally specify the mode to validate the input as.
+
+        :param value:The value to parse.
+        :param mode: The mode to validate the input as.
+        :returns: The parsed value as an IP address or network, or None.
+        """
+        try:
+            return cls.parse_or_raise(value, mode)
+        except ValueError:
+            return None
+
     @field_validator("ip_or_network", mode="before")
     @classmethod
     def validate_ip_or_network(cls, value: Any) -> IP_AddressT | IP_NetworkT:
@@ -1580,7 +1631,7 @@ class Network(FrozenModelWithTimestamps, APIMixin):
     def ip_network(self) -> IP_NetworkT:
         """IP network object for the network."""
         try:
-            return NetworkOrIP.parse(self.network, mode="network")
+            return NetworkOrIP.parse_or_raise(self.network, mode="network")
         except IPNetworkWarning as e:
             logger.error(
                 "Invalid network address %s for network with ID %s", self.network, self.id
@@ -1707,7 +1758,7 @@ class Network(FrozenModelWithTimestamps, APIMixin):
         def fmt(label: str, value: Any) -> None:
             manager.add_line(f"{label:<{padding}}{value}")
 
-        ipnet = NetworkOrIP.parse(self.network, mode="network")
+        ipnet = NetworkOrIP.parse_or_raise(self.network, mode="network")
         reserved_ips = self.get_reserved_ips()
         # Remove network address and broadcast address from reserved IPs
         reserved_ips_filtered = [
@@ -1799,9 +1850,9 @@ class Network(FrozenModelWithTimestamps, APIMixin):
         if isinstance(other, Network):
             other = other.network
         if isinstance(other, str):
-            other = NetworkOrIP.parse(other, mode="network")
+            other = NetworkOrIP.parse_or_raise(other, mode="network")
 
-        self_net = NetworkOrIP.parse(self.network, mode="network")
+        self_net = NetworkOrIP.parse_or_raise(self.network, mode="network")
         return self_net.overlaps(other)
 
     def get_first_available_ip(self) -> IP_AddressT:
@@ -2610,6 +2661,58 @@ class Host(FrozenModelWithTimestamps, WithTTL, WithHistory, APIMixin):
         """Return the endpoint for the class."""
         return Endpoint.Hosts
 
+    @classmethod
+    def get_by_ip(cls, ip: IP_AddressT, inform_as_ptr: bool = True) -> Host | None:
+        """Get a host by IP address.
+
+        :param ip: The IP address to search for.
+        :param check_ptr: If True, check for PTR overrides as well.
+        :returns: The Host object if found, None otherwise.
+        """
+        try:
+            host = cls.get_by_field("ipaddresses__ipaddress", str(ip))
+            if not host:
+                host = cls.get_by_field("ptr_overrides__ipaddress", str(ip))
+                if host and inform_as_ptr:
+                    OutputManager().add_line(f"{ip} is a PTR override for {host.name}")
+            return host
+        except MultipleEntitiesFound as e:
+            raise MultipleEntitiesFound(f"Multiple hosts found with IP address {ip}.") from e
+
+    @classmethod
+    def get_by_ip_or_raise(cls, ip: IP_AddressT, inform_as_ptr: bool = True) -> Host:
+        """Get a host by IP address or raise EntityNotFound.
+
+        :param ip: The IP address to search for.
+        :returns: The Host object if found.
+        :param check_ptr: If True, check for PTR overrides as well.
+        """
+        host = cls.get_by_ip(ip, inform_as_ptr=inform_as_ptr)
+        if not host:
+            raise EntityNotFound(f"Host with IP address {ip} not found.")
+        return host
+
+    @classmethod
+    def get_by_mac(cls, mac: MacAddress) -> Host | None:
+        """Get a host by MAC address.
+
+        :param ip: The MAC address to search for.
+        :returns: The Host object if found, None otherwise.
+        """
+        return cls.get_by_field("ipaddresses__macaddress", str(mac))
+
+    @classmethod
+    def get_by_mac_or_raise(cls, mac: MacAddress) -> Host:
+        """Get a host by MAC address or raise EntityNotFound.
+
+        :param ip: The MAC address to search for.
+        :returns: The Host object if found.
+        """
+        host = cls.get_by_mac(mac)
+        if not host:
+            raise EntityNotFound(f"Host with MAC address {mac} not found.")
+        return host
+
     @classmethod
     def get_by_any_means_or_raise(
         cls, identifier: str | HostT, inform_as_cname: bool = True, inform_as_ptr: bool = True
@@ -2670,56 +2773,31 @@ class Host(FrozenModelWithTimestamps, WithTTL, WithHistory, APIMixin):
 
         :returns: A Host object if the host was found, otherwise None.
         """
-        host = None
         if not isinstance(identifier, HostT):
             if identifier.isdigit():
                 return Host.get_by_id(int(identifier))
 
-            try:
-                ptr = False
-                ipaddress.ip_address(identifier)
-                NetworkOrIP.parse(identifier, mode="ip")
-
-                host = Host.get_by_field("ipaddresses__ipaddress", identifier)
-                if not host:
-                    host = Host.get_by_field("ptr_overrides__ipaddress", identifier)
-                    ptr = True
-
-                if host:
-                    if ptr and inform_as_ptr:
-                        OutputManager().add_line(f"{identifier} is a PTR override for {host.name}")
-                    return host
-            except MultipleEntitiesFound as e:
-                raise MultipleEntitiesFound(
-                    f"Multiple hosts found with IP address or PTR {identifier}."
-                ) from e
-            except ValueError:  # invalid IP
-                pass
+            if ip := NetworkOrIP.parse(identifier, mode="ip"):
+                host = cls.get_by_ip_or_raise(ip, inform_as_ptr=inform_as_ptr)
+                return host
 
-            try:
-                mac = MACAddressField.validate_naive(identifier)
-                return Host.get_by_field("ipaddresses__macaddress", mac.address)
-            except ValueError:
-                pass
+            if mac := MACAddressField.parse(identifier):
+                return cls.get_by_mac_or_raise(mac)
 
             # Let us try to find the host by name...
-            name = HostT(hostname=identifier)
-        else:
-            name = identifier
-
-        host = Host.get_by_field("name", name.hostname)
+            identifier = HostT(hostname=identifier)
 
-        if host:
+        if host := cls.get_by_field("name", identifier.hostname):
             return host
 
-        cname = CNAME.get_by_field("name", name.hostname)
+        cname = CNAME.get_by_field("name", identifier.hostname)
         # If we found a CNAME, get the host it points to. We're not interested in the
         # CNAME itself.
         if cname is not None:
             host = Host.get_by_id(cname.host)
 
             if host and inform_as_cname:
-                OutputManager().add_line(f"{name} is a CNAME for {host.name}")
+                OutputManager().add_line(f"{identifier.hostname} is a CNAME for {host.name}")
 
         return host
 
@@ -2797,7 +2875,7 @@ class Host(FrozenModelWithTimestamps, WithTTL, WithHistory, APIMixin):
         :returns: The IP address object if found, None otherwise.
         """
         if not isinstance(arg_mac, MACAddressField):
-            arg_mac = MACAddressField.validate_naive(arg_mac)
+            arg_mac = MACAddressField.validate(arg_mac)
         return next((ip for ip in self.ipaddresses if ip.macaddress == arg_mac), None)
 
     def ips_with_macaddresses(self) -> list[IPAddress]:
@@ -3522,6 +3600,39 @@ class UserPermission(BaseModel):
     regex: str
     labels: List[str]
 
+    # NOTE: _needs_ to be a computed field in order to use it in
+    # OutputManager.add_formatted_table, since we dump the model to a dict
+    # inside that method.
+    @computed_field
+    @property
+    def labels_str(self) -> str:
+        """Return the labels as a string."""
+        return ", ".join(self.labels)
+
+    @classmethod
+    def output_multiple(cls, permissions: Iterable[Self]) -> None:
+        """Output multiple permissions to the console.
+
+        :param permissions: List of UserPermission records to output.
+        """
+        # NOTE: this is more or less identical to `Permission.output_multiple()`
+        # with the addition of printing labels.
+        # Since UserPermission is a different model from Permission, sharing a
+        # common method is difficult to make type safe without declaring some sort
+        # of protocol class, which seems a bit overkill.
+        manager = OutputManager()
+        manager.add_line("Permissions:")
+        if not permissions:
+            manager.add_line("  None")
+            return
+
+        OutputManager().add_formatted_table(
+            ("IP range", "Group", "Reg.exp.", "Labels"),
+            ("range", "group", "regex", "labels_str"),
+            permissions,
+            indent=2,
+        )
+
 
 class ServerVersion(BaseModel):
     """Model for server version metadata."""
@@ -3657,15 +3768,18 @@ class UserInfo(BaseModel):
                 )
             raise e
 
-    def output(self) -> None:
+    def output(self, django: bool = False) -> None:
         """Output the user information to the console."""
         outputmanager = OutputManager()
         outputmanager.add_line(f"Username: {self.username}")
-        outputmanager.add_line("Django status:")
-        outputmanager.add_line(f"  Superuser: {self.django_status.superuser}")
-        outputmanager.add_line(f"  Staff: {self.django_status.staff}")
-        outputmanager.add_line(f"  Active: {self.django_status.active}")
-        outputmanager.add_line("Mreg status:")
+
+        if django:
+            outputmanager.add_line("Django roles:")
+            outputmanager.add_line(f"  Superuser: {self.django_status.superuser}")
+            outputmanager.add_line(f"  Staff: {self.django_status.staff}")
+            outputmanager.add_line(f"  Active: {self.django_status.active}")
+
+        outputmanager.add_line("Mreg roles:")
         outputmanager.add_line(f"  Superuser: {self.mreg_status.superuser}")
         outputmanager.add_line(f"  Admin: {self.mreg_status.admin}")
         outputmanager.add_line(f"  Group admin: {self.mreg_status.group_admin}")
@@ -3673,15 +3787,9 @@ class UserInfo(BaseModel):
         outputmanager.add_line(f"  Hostpolicy admin: {self.mreg_status.hostpolicy_admin}")
         outputmanager.add_line(f"  DNS wildcard admin: {self.mreg_status.dns_wildcard_admin}")
         outputmanager.add_line(f"  Underscore admin: {self.mreg_status.underscore_admin}")
+
         outputmanager.add_line("Groups:")
         for group in self.groups:
             outputmanager.add_line(f"  {group}")
-        outputmanager.add_line("Permissions:")
-        if not self.permissions:
-            outputmanager.add_line("  None")
-
-        for perm in self.permissions:
-            outputmanager.add_line(f"  Group: {perm.group}")
-            outputmanager.add_line(f"  Range: {perm.range}")
-            outputmanager.add_line(f"  Regex: {perm.regex}")
-            outputmanager.add_line(f"  Labels: {', '.join(perm.labels)}")
+
+        UserPermission.output_multiple(self.permissions)

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/cli.py

@@ -167,7 +167,7 @@ class Command(Completer):
             self.last_errno = e.code
 
         except (CliWarning, CliError) as exc:
-            exc.print_self()
+            exc.print_and_log()
 
         except CliExit:
             # If we have active recordings going on, save them before exiting
@@ -263,7 +263,7 @@ class Command(Completer):
         try:
             cmd = output.from_command(line)
         except (CliWarning, CliError) as exc:
-            exc.print_self()
+            exc.print_and_log()
             return
         # Create and set the corrolation id, using the cleaned command
         # as the suffix. This is used to track the command in the logs

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/commands/help.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+import logging
 from typing import Any
 
 from mreg_cli.__about__ import __version__ as mreg_cli_version
@@ -10,6 +11,7 @@ from mreg_cli.api.models import ServerLibraries, ServerVersion, UserInfo
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.config import MregCliConfig
+from mreg_cli.exceptions import CliError
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
@@ -103,24 +105,32 @@ def versions_help(_: argparse.Namespace) -> None:
     prog="whoami",
     description="Show information about the the current user",
     short_desc="Show self info",
+    flags=[
+        Flag("-django", action="store_true", description="Show Django internal roles"),
+    ],
 )
-def whoami_help(_: argparse.Namespace) -> None:
+def whoami_help(args: argparse.Namespace) -> None:
     """Show information about the current user."""
     try:
-        UserInfo.fetch(ignore_errors=False).output()
+        UserInfo.fetch(ignore_errors=False).output(django=args.django)
     except Exception as e:
-        print("Failed to fetch user info:", e)
+        raise CliError(
+            f"Failed to display user info for current user {MregCliConfig().get_user()!r}: {e}"
+        ) from e
 
 
 @command_registry.register_command(
     prog="whois",
     description="Show information about a user",
     short_desc="Show user info",
-    flags=[Flag("user", description="The user to show information about")],
+    flags=[
+        Flag("user", description="The user to show information about"),
+        Flag("-django", action="store_true", description="Show Django internal roles"),
+    ],
 )
 def whois_help(args: argparse.Namespace) -> None:
     """Show information about a user."""
     try:
-        UserInfo.fetch(ignore_errors=False, user=args.user).output()
+        UserInfo.fetch(ignore_errors=False, user=args.user).output(django=args.django)
     except Exception as e:
-        print("Failed to fetch user info:", e)
+        raise CliError(f"Failed to display user info for {args.user!r}: {e}") from e

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/commands/host_submodules/a_aaaa.py

@@ -49,7 +49,7 @@ def _ip_change(args: argparse.Namespace, ipversion: IP_Version) -> None:
     if args.old == args.new:
         raise EntityAlreadyExists("New and old IP are equal")
 
-    old_ip = NetworkOrIP.parse(args.old, mode="ip")
+    old_ip = NetworkOrIP.parse_or_raise(args.old, mode="ip")
 
     new_ip = NetworkOrIP.validate(args.new)
     if new_ip.is_network():
@@ -88,7 +88,7 @@ def _ip_move(args: argparse.Namespace, ipversion: IP_Version) -> None:
     :param args: argparse.Namespace (ip, fromhost, tohost)
     :param ipversion: 4 or 6
     """
-    ip = NetworkOrIP.parse(args.ip, mode="ip")
+    ip = NetworkOrIP.parse_or_raise(args.ip, mode="ip")
     if ip.version != ipversion:
         raise InputFailure(
             f"IP version {ip.version} does not match the requested version {ipversion}"
@@ -123,7 +123,7 @@ def _ip_remove(args: argparse.Namespace, ipversion: IP_Version) -> None:
     :param args: argparse.Namespace (name, ip)
     """
     host = Host.get_by_any_means_or_raise(args.name)
-    ip = NetworkOrIP.parse(args.ip, mode="ip")
+    ip = NetworkOrIP.parse_or_raise(args.ip, mode="ip")
     if ip.version != ipversion:
         raise InputFailure(
             f"IP version {ip.version} does not match the requested version {ipversion}"

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/commands/host_submodules/rr.py

@@ -474,7 +474,7 @@ def ptr_change(args: argparse.Namespace) -> None:
     if not old_host.ptr_overrides:
         raise EntityNotFound(f"No PTR records for {old_host}")
 
-    ip = NetworkOrIP.parse(args.ip, mode="ip")
+    ip = NetworkOrIP.parse_or_raise(args.ip, mode="ip")
     ptr_override = old_host.get_ptr_override(ip)
     if not ptr_override:
         raise EntityNotFound(f"No PTR record for {old_host} with IP {ip}")
@@ -503,7 +503,7 @@ def ptr_remove(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (ip, name)
     """
     host = Host.get_by_any_means_or_raise(args.name)
-    ip = NetworkOrIP.parse(args.ip, mode="ip")
+    ip = NetworkOrIP.parse_or_raise(args.ip, mode="ip")
     ptr_override = host.get_ptr_override(ip)
     if not ptr_override:
         raise EntityNotFound(f"No PTR record for {host} with IP {ip}")
@@ -529,7 +529,7 @@ def ptr_add(args: argparse.Namespace) -> None:
 
     :param args: argparse.Namespace (ip, name, force)
     """
-    ip = NetworkOrIP.parse(args.ip, mode="ip")
+    ip = NetworkOrIP.parse_or_raise(args.ip, mode="ip")
 
     host = Host.get_by_any_means_or_raise(args.name)
     existing_ptrs = PTR_override.get_list_by_field("ipaddress", str(ip))
@@ -563,7 +563,7 @@ def ptr_show(args: argparse.Namespace) -> None:
 
     :param args: argparse.Namespace (ip)
     """
-    ip = NetworkOrIP.parse(args.ip, mode="ip")
+    ip = NetworkOrIP.parse_or_raise(args.ip, mode="ip")
     host = Host.get_by_any_means_or_raise(str(ip), inform_as_ptr=False)
     if not host.ptr_overrides:
         OutputManager().add_line(f"No PTR records for {host.name.hostname}")

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/commands/network.py

@@ -67,7 +67,7 @@ def create(args: argparse.Namespace) -> None:
     if args.location and not is_valid_location_tag(args.location):
         raise InputFailure("Not a valid location tag")
 
-    arg_network = NetworkOrIP.parse(args.network, mode="network")
+    arg_network = NetworkOrIP.parse_or_raise(args.network, mode="network")
     networks = Network.get_list()
     for network in networks:
         if network.overlaps(arg_network):

{mreg_cli-1.2.0 → mreg_cli-1.2.1}/mreg_cli/commands/permission.py

@@ -56,7 +56,7 @@ def network_list(args: argparse.Namespace) -> None:
     permissions = Permission.get_by_query(query=params, ordering="range,group", limit=None)
 
     if args.range is not None:
-        argnetwork = NetworkOrIP.parse(args.range, mode="network")
+        argnetwork = NetworkOrIP.parse_or_raise(args.range, mode="network")
 
         for permission in permissions:
             permnet = permission.range
@@ -107,7 +107,7 @@ def network_add(args: argparse.Namespace) -> None:
 
     :param args: argparse.Namespace (range, group, regex)
     """
-    NetworkOrIP.parse(args.range, mode="network")
+    NetworkOrIP.parse_or_raise(args.range, mode="network")
 
     query = {
         "range": args.range,