Replace own utility to wrap IPv6 address

The same functionality is provided by oslo.utils since 3.29.0 .

Change-Id: Idfd26053ecb687cc99dafbc614ea5134ce3ebb54
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

ironic_python_agent/ironic_api_client.py

@@ -17,12 +17,12 @@ import time
 
 from oslo_config import cfg
 from oslo_log import log
+from oslo_utils import netutils
 import requests
 import tenacity
 
 from ironic_python_agent import encoding
 from ironic_python_agent import errors
-from ironic_python_agent import netutils
 from ironic_python_agent import utils
 from ironic_python_agent import version
 
@@ -319,5 +319,5 @@ class APIClient(object):
 
     def _get_agent_url(self, advertise_address, advertise_protocol='http'):
         return '{}://{}:{}'.format(advertise_protocol,
-                                   netutils.wrap_ipv6(advertise_address[0]),
+                                   netutils.escape_ipv6(advertise_address[0]),
                                    advertise_address[1])

ironic_python_agent/netutils.py

@@ -356,12 +356,6 @@ def get_interface_driver(interface_name):
                   interface_name)
 
 
-def wrap_ipv6(ip):
-    if netutils.is_valid_ipv6(ip):
-        return "[%s]" % ip
-    return ip
-
-
 def get_wildcard_address():
     if netutils.is_ipv6_enabled():
         return "::"

ironic_python_agent/tests/unit/test_netutils.py

@@ -390,14 +390,6 @@ class TestNetutils(base.IronicAgentTest):
         sock1.close.assert_called_once_with()
         sock2.close.assert_called_once_with()
 
-    def test_wrap_ipv6(self):
-        res = netutils.wrap_ipv6('1:2::3:4')
-        self.assertEqual('[1:2::3:4]', res)
-
-    def test_wrap_ipv6_with_ipv4(self):
-        res = netutils.wrap_ipv6('1.2.3.4')
-        self.assertEqual('1.2.3.4', res)
-
     @mock.patch('fcntl.ioctl', autospec=True)
     @mock.patch('socket.socket', autospec=socket_socket_sig)
     def test_get_mac_addr_normal(self, mock_socket, mock_ioctl):