Remove dead code

Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
canonical · May 26, 2024 · 8e1268b · 8e1268b
1 parent 19cb8cf
commit 8e1268b
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 37 deletions.
diff --git a/cloudinit/analyze/show.py b/cloudinit/analyze/show.py
@@ -45,9 +45,6 @@
     "%T": "total_time",
 }
 
-formatting_help = " ".join(
-    ["{0}: {1}".format(k.replace("%", "%%"), v) for k, v in format_key.items()]
-)
 SUCCESS_CODE = "successful"
 FAIL_CODE = "failure"
 CONTAINER_CODE = "container"
@@ -257,21 +254,15 @@ def gather_timestamps_using_systemd():
 
 def generate_records(
     events,
-    blame_sort=False,
     print_format="(%n) %d seconds in %I%D",
-    dump_files=False,
-    log_datafiles=False,
 ):
     """
     Take in raw events and create parent-child dependencies between events
     in order to order events in chronological order.
 
     :param events: JSONs from dump that represents events taken from logs
-    :param blame_sort: whether to sort by timestamp or by time taken.
     :param print_format: formatting to represent event, time stamp,
     and time taken by the event in one line
-    :param dump_files: whether to dump files into JSONs
-    :param log_datafiles: whether or not to log events generated
 
     :return: boot records ordered chronologically
     """

diff --git a/cloudinit/apport.py b/cloudinit/apport.py
@@ -68,10 +68,6 @@
     "Other",
 ]
 
-# Potentially clear text collected logs
-CLOUDINIT_LOG = "/var/log/cloud-init.log"
-CLOUDINIT_OUTPUT_LOG = "/var/log/cloud-init-output.log"
-
 
 def _get_user_data_file() -> str:
     paths = read_cfg_paths()

diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
@@ -45,8 +45,6 @@
 OMNIBUS_URL_RETRIES = 5
 
 CHEF_VALIDATION_PEM_PATH = "/etc/chef/validation.pem"
-CHEF_ENCRYPTED_DATA_BAG_PATH = "/etc/chef/encrypted_data_bag_secret"
-CHEF_ENVIRONMENT = "_default"
 CHEF_FB_PATH = "/etc/chef/firstboot.json"
 CHEF_RB_TPL_DEFAULTS = {
     # These are ruby symbols...

diff --git a/cloudinit/config/schema.py b/cloudinit/config/schema.py
@@ -101,7 +101,6 @@
 
 {examples}
 """
-SCHEMA_PROPERTY_HEADER = ""
 SCHEMA_PROPERTY_TMPL = "{prefix}* **{prop_name}:** ({prop_type}){description}"
 SCHEMA_LIST_ITEM_TMPL = (
     "{prefix}* Each object in **{prop_name}** list supports "
@@ -110,7 +109,6 @@
 SCHEMA_EXAMPLES_HEADER = ""
 SCHEMA_EXAMPLES_SPACER_TEMPLATE = "\n   # --- Example{example_count} ---\n\n"
 DEPRECATED_KEY = "deprecated"
-DEPRECATED_PREFIX = "DEPRECATED: "
 
 # user-data files typically must begin with a leading '#'
 USERDATA_VALID_HEADERS = sorted(

diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
@@ -27,7 +27,6 @@
 # network: {config: disabled}
 """
 
-NETWORK_CONF_FN = "/etc/network/interfaces.d/50-cloud-init"
 LOCALE_CONF_FN = "/etc/default/locale"
 
 

diff --git a/cloudinit/distros/opensuse.py b/cloudinit/distros/opensuse.py
@@ -26,8 +26,6 @@ class Distro(distros.Distro):
     init_cmd = ["service"]
     locale_conf_fn = "/etc/sysconfig/language"
     network_conf_fn = "/etc/sysconfig/network/config"
-    network_script_tpl = "/etc/sysconfig/network/ifcfg-%s"
-    route_conf_tpl = "/etc/sysconfig/network/ifroute-%s"
     systemd_hostname_conf_fn = "/etc/hostname"
     systemd_locale_conf_fn = "/etc/locale.conf"
     tz_local_fn = "/etc/localtime"

diff --git a/cloudinit/distros/parsers/ifconfig.py b/cloudinit/distros/parsers/ifconfig.py
@@ -14,8 +14,6 @@
 
 LOG = logging.getLogger(__name__)
 
-MAC_RE = r"""([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}"""
-
 
 class Ifstate:
     """

diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
@@ -26,7 +26,6 @@ class Distro(distros.Distro):
     network_conf_fn = "/etc/sysconfig/network"
     hostname_conf_fn = "/etc/sysconfig/network"
     systemd_hostname_conf_fn = "/etc/hostname"
-    network_script_tpl = "/etc/sysconfig/network-scripts/ifcfg-%s"
     tz_local_fn = "/etc/localtime"
     usr_lib_exec = "/usr/libexec"
     # RHEL and derivatives use NetworkManager DHCP client by default.

diff --git a/cloudinit/dmi.py b/cloudinit/dmi.py
@@ -19,7 +19,6 @@
 DMI_SYS_PATH = "/sys/class/dmi/id"
 
 KernelNames = namedtuple("KernelNames", ["linux", "freebsd", "openbsd"])
-KernelNames.__new__.__defaults__ = (None, None, None)
 
 # FreeBSD's kenv(1) and Linux /sys/class/dmi/id/* both use different names from
 # dmidecode. The values are the same, and ultimately what we're interested in.

diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
@@ -721,7 +721,7 @@ def _rename_interfaces(
 
     LOG.debug("Detected interfaces %s", cur_info)
 
-    def update_byname(bymac):
+    def update_byname(cur_info):
         return dict((data["name"], data) for data in cur_info.values())
 
     ops = []

diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
@@ -303,7 +303,6 @@ def get_resource_disk_on_freebsd(port_id) -> Optional[str]:
 
 DS_CFG_PATH = ["datasource", DS_NAME]
 DS_CFG_KEY_PRESERVE_NTFS = "never_destroy_ntfs"
-DEF_EPHEMERAL_LABEL = "Temporary Storage"
 
 # The redacted password fails to meet password complexity requirements
 # so we can safely use this to mask/redact the password in the ovf-env.xml

diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
@@ -19,7 +19,6 @@
 
 # Various defaults/constants...
 DEFAULT_IID = "iid-dsconfigdrive"
-DEFAULT_MODE = "pass"
 DEFAULT_METADATA = {
     "instance-id": DEFAULT_IID,
 }

diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
@@ -29,8 +29,6 @@
 
 LOG = logging.getLogger(__name__)
 
-SKIP_METADATA_URL_CODES = frozenset([uhelp.NOT_FOUND])
-
 STRICT_ID_PATH = ("datasource", "Ec2", "strict_id")
 STRICT_ID_DEFAULT = "warn"
 

diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
@@ -18,7 +18,6 @@
 
 MD_V1_URL = "http://metadata.google.internal/computeMetadata/v1/"
 BUILTIN_DS_CONFIG = {"metadata_url": MD_V1_URL}
-REQUIRED_FIELDS = ("instance-id", "availability-zone", "local-hostname")
 GUEST_ATTRIBUTES_URL = (
     "http://metadata.google.internal/computeMetadata/"
     "v1/instance/guest-attributes"

diff --git a/cloudinit/sources/DataSourceIBMCloud.py b/cloudinit/sources/DataSourceIBMCloud.py
@@ -107,7 +107,6 @@
 
 class Platforms:
     TEMPLATE_LIVE_METADATA = "Template/Live/Metadata"
-    TEMPLATE_LIVE_NODATA = "UNABLE TO BE IDENTIFIED."
     TEMPLATE_PROVISIONING_METADATA = "Template/Provisioning/Metadata"
     TEMPLATE_PROVISIONING_NODATA = "Template/Provisioning/No-Metadata"
     OS_CODE = "OS-Code/Live"

diff --git a/cloudinit/sources/helpers/netlink.py b/cloudinit/sources/helpers/netlink.py
@@ -15,15 +15,11 @@
 
 # http://man7.org/linux/man-pages/man7/netlink.7.html
 RTMGRP_LINK = 1
-NLMSG_NOOP = 1
-NLMSG_ERROR = 2
-NLMSG_DONE = 3
 RTM_NEWLINK = 16
 RTM_DELLINK = 17
 RTM_GETLINK = 18
 RTM_SETLINK = 19
 MAX_SIZE = 65535
-RTA_DATA_OFFSET = 32
 MSG_TYPE_OFFSET = 16
 SELECT_TIMEOUT = 60
 

diff --git a/cloudinit/sources/helpers/vmware/imc/config.py b/cloudinit/sources/helpers/vmware/imc/config.py
@@ -24,7 +24,6 @@ class Config:
     RESETPASS = "PASSWORD|RESET"
     SUFFIX = "DNS|SUFFIX|"
     TIMEZONE = "DATETIME|TIMEZONE"
-    UTC = "DATETIME|UTC"
     POST_GC_STATUS = "MISC|POST-GC-STATUS"
     DEFAULT_RUN_POST_SCRIPT = "MISC|DEFAULT-RUN-POST-CUST-SCRIPT"
     CLOUDINIT_META_DATA = "CLOUDINIT|METADATA"

diff --git a/cloudinit/util.py b/cloudinit/util.py
@@ -1041,7 +1041,7 @@ def load_yaml(blob, default=None, allowed=(dict,)):
     return loaded
 
 
-def read_seeded(base="", ext="", timeout=5, retries=10, file_retries=0):
+def read_seeded(base="", ext="", timeout=5, retries=10):
     if base.find("%s") >= 0:
         ud_url = base.replace("%s", "user-data" + ext)
         vd_url = base.replace("%s", "vendor-data" + ext)