From c3b8afc47abc99ffadaf15808647d4abb9e76166 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 20 Feb 2024 14:19:34 +0900
Subject: [PATCH] is_valid_ip_address: Catch non-string values early

The is_valid_ipvN methods from oslo.utils raises an exception for
non-string values, because of the change in netaddr 1.0.0. This adds
a wrapper logic to retain the previous behavior, which is preferred by
manila.

Change-Id: If1297e4d54fd645969ca79690a1c558c9efdbc8d
---
 manila/utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manila/utils.py b/manila/utils.py
index e24e8a1eaa..75f4fd1e6a 100644
--- a/manila/utils.py
+++ b/manila/utils.py
@@ -390,6 +390,9 @@ def is_valid_ip_address(ip_address, ip_version):
         raise exception.ManilaException(
             _("Provided improper IP version '%s'.") % ip_version)
 
+    if not isinstance(ip_address, str):
+        return False
+
     if 4 in ip_version:
         if netutils.is_valid_ipv4(ip_address):
             return True