adjust usage of dataclass after mving in cc-utils

Author: TuanAnh17N

osid_extension/__main__.py

@@ -20,7 +20,6 @@
 import oci.model
 import ocm
 import tarutil
-import unixutil.model as um
 
 import consts
 import ctx_util
@@ -64,7 +63,7 @@ def handle_termination_signal(*args):
 
 
 def determine_os_status(
-    osid: um.OperatingSystemId,
+    osid: dso.model.OperatingSystemId,
     eol_client: eol.EolClient,
 ) -> tuple[dso.model.OsStatus, str | None, datetime.datetime | None]:
     '''
@@ -126,7 +125,7 @@ def determine_osid(
     artefact: dso.model.ComponentArtefactId,
     oci_client: oci.client.Client,
     lookup: cnudie.retrieve.ComponentDescriptorLookupById,
-) -> um.OperatingSystemId | None:
+) -> dso.model.OperatingSystemId | None:
 
     resource_node = k8s.util.get_ocm_node(
         component_descriptor_lookup=lookup,
@@ -152,7 +151,7 @@ def determine_osid(
 def base_image_osid(
     oci_client: oci.client.Client,
     resource: ocm.Resource,
-) -> um.OperatingSystemId:
+) -> dso.model.OperatingSystemId:
     image_reference = resource.access.imageReference
 
     manifest = oci_client.manifest(
@@ -187,7 +186,7 @@ def base_image_osid(
 def create_artefact_metadata(
     artefact: dso.model.ComponentArtefactId,
     osid_finding_config: odg.findings.Finding,
-    osid: um.OperatingSystemId | None,
+    osid: dso.model.OperatingSystemId | None,
     eol_client: eol.EolClient,
     time_now: datetime.datetime | None = None,
 ) -> collections.abc.Generator[dso.model.ArtefactMetadata, None, None]:

osid_extension/scan.py

@@ -3,9 +3,9 @@
 
 import dacite
 
-import version
+import dso.model
 
-import unixutil.model as um
+import version
 
 
 def _parse_os_release(
@@ -62,7 +62,7 @@ def _parse_debian_version(
 
 def determine_osinfo(
     tarfh: tarfile.TarFile
-) -> um.OperatingSystemId | None:
+) -> dso.model.OperatingSystemId | None:
     '''
     tries to determine the operating system identification, roughly as specified by
         https://www.freedesktop.org/software/systemd/man/os-release.html
@@ -133,6 +133,6 @@ def determine_osinfo(
         return None
 
     return dacite.from_dict(
-        data_class=um.OperatingSystemId,
+        data_class=dso.model.OperatingSystemId,
         data=os_info,
     )

osid_extension/util.py

@@ -2,7 +2,7 @@
 
 import awesomeversion
 
-import unixutil.model as um
+import dso.model
 
 import osinfo.model
 
@@ -11,7 +11,7 @@
 
 
 def find_branch_info(
-    osid: um.OperatingSystemId,
+    osid: dso.model.OperatingSystemId,
     os_infos: list[osinfo.model.OsReleaseInfo],
 ) -> osinfo.model.OsReleaseInfo | None:
     os_version = osid.VERSION_ID
@@ -42,7 +42,7 @@ def version_candidates():
 
 
 def branch_reached_eol(
-    osid: um.OperatingSystemId,
+    osid: dso.model.OperatingSystemId,
     os_infos: list[osinfo.model.OsReleaseInfo],
 ) -> bool:
     if not osid.ID:
@@ -57,7 +57,7 @@ def branch_reached_eol(
 
 
 def update_available(
-    osid: um.OperatingSystemId,
+    osid: dso.model.OperatingSystemId,
     os_infos: list[osinfo.model.OsReleaseInfo],
     ignore_if_patchlevel_is_next_to_greatest=False,
 ) -> bool: