summaryrefslogtreecommitdiff
path: root/cloudinit/net
diff options
context:
space:
mode:
authorMina Galić <me+git@igalic.co>2022-09-30 19:07:19 +0100
committerGitHub <noreply@github.com>2022-09-30 12:07:19 -0600
commitdd7c312b9e00e9e09f12c58f27f2f1de36a3943c (patch)
treec75843cb1cd2d4c45831fd3449a8cf8970aa821e /cloudinit/net
parent3a279a983c9d0da4bc73c74ef151f718a6234c5c (diff)
downloadcloud-init-git-dd7c312b9e00e9e09f12c58f27f2f1de36a3943c.tar.gz
style: prefer absolute imports over relative imports
Sponsored by: FreeBSD Foundation
Diffstat (limited to 'cloudinit/net')
-rw-r--r--cloudinit/net/bsd.py3
-rw-r--r--cloudinit/net/cmdline.py3
-rw-r--r--cloudinit/net/eni.py4
-rw-r--r--cloudinit/net/netplan.py5
-rw-r--r--cloudinit/net/network_manager.py4
-rw-r--r--cloudinit/net/networkd.py3
-rw-r--r--cloudinit/net/renderers.py2
-rw-r--r--cloudinit/net/sysconfig.py3
8 files changed, 9 insertions, 18 deletions
diff --git a/cloudinit/net/bsd.py b/cloudinit/net/bsd.py
index e0f18366..e8778d27 100644
--- a/cloudinit/net/bsd.py
+++ b/cloudinit/net/bsd.py
@@ -7,10 +7,9 @@ from cloudinit import log as logging
from cloudinit import net, subp, util
from cloudinit.distros import bsd_utils
from cloudinit.distros.parsers.resolv_conf import ResolvConf
+from cloudinit.net import renderer
from cloudinit.net.network_state import NetworkState
-from . import renderer
-
LOG = logging.getLogger(__name__)
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index eab86d9f..5df2f214 100644
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -15,8 +15,7 @@ import os
import shlex
from cloudinit import util
-
-from . import get_devicelist, read_sys_net_safe
+from cloudinit.net import get_devicelist, read_sys_net_safe
_OPEN_ISCSI_INTERFACE_FILE = "/run/initramfs/open-iscsi.interface"
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index ea0b8e4a..53bd35ca 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -8,11 +8,9 @@ from typing import Optional
from cloudinit import log as logging
from cloudinit import subp, util
-from cloudinit.net import subnet_is_ipv6
+from cloudinit.net import ParserError, renderer, subnet_is_ipv6
from cloudinit.net.network_state import NetworkState
-from . import ParserError, renderer
-
LOG = logging.getLogger(__name__)
NET_CONFIG_COMMANDS = [
diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
index 7b91077d..32fb031c 100644
--- a/cloudinit/net/netplan.py
+++ b/cloudinit/net/netplan.py
@@ -11,11 +11,10 @@ from cloudinit.net import (
IPV6_DYNAMIC_TYPES,
SYS_CLASS_NET,
get_devicelist,
+ renderer,
subnet_is_ipv6,
)
-
-from . import renderer
-from .network_state import NET_CONFIG_TO_V2, NetworkState
+from cloudinit.net.network_state import NET_CONFIG_TO_V2, NetworkState
KNOWN_SNAPD_CONFIG = b"""\
# This is the initial network config.
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
index 8053511c..53763d15 100644
--- a/cloudinit/net/network_manager.py
+++ b/cloudinit/net/network_manager.py
@@ -15,11 +15,9 @@ from typing import Optional
from cloudinit import log as logging
from cloudinit import subp, util
-from cloudinit.net import is_ipv6_address, subnet_is_ipv6
+from cloudinit.net import is_ipv6_address, renderer, subnet_is_ipv6
from cloudinit.net.network_state import NetworkState
-from . import renderer
-
NM_RUN_DIR = "/etc/NetworkManager"
NM_LIB_DIR = "/usr/lib/NetworkManager"
NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
diff --git a/cloudinit/net/networkd.py b/cloudinit/net/networkd.py
index 004b028c..3591513f 100644
--- a/cloudinit/net/networkd.py
+++ b/cloudinit/net/networkd.py
@@ -12,10 +12,9 @@ from typing import Optional
from cloudinit import log as logging
from cloudinit import subp, util
+from cloudinit.net import renderer
from cloudinit.net.network_state import NetworkState
-from . import renderer
-
LOG = logging.getLogger(__name__)
diff --git a/cloudinit/net/renderers.py b/cloudinit/net/renderers.py
index 7edc34b5..fcf7feba 100644
--- a/cloudinit/net/renderers.py
+++ b/cloudinit/net/renderers.py
@@ -2,7 +2,7 @@
from typing import List, Tuple, Type
-from . import (
+from cloudinit.net import (
RendererNotFoundError,
eni,
freebsd,
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index 67a8bad5..453c0522 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -13,12 +13,11 @@ from cloudinit.net import (
IPV6_DYNAMIC_TYPES,
is_ipv6_address,
net_prefix_to_ipv4_mask,
+ renderer,
subnet_is_ipv6,
)
from cloudinit.net.network_state import NetworkState
-from . import renderer
-
LOG = logging.getLogger(__name__)
KNOWN_DISTROS = [
"almalinux",