From f67cd31860c8f262a8b2328a7efbc60ddcd8bb03 Mon Sep 17 00:00:00 2001
From: Yun Li <yunli1@microsoft.com>
Date: Thu, 13 Jul 2023 15:50:11 +0000
Subject: [PATCH] Rename some variables to be more readable

---
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index c0b20af7b28a..fd63f2cb12bc 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -491,32 +491,32 @@ def _do_clean(feat, current_version, last_version):
     REPO = "repo"
     _, image_info, err = _run_command("docker images |grep {} |grep -v latest |awk '{{print $1,$2,$3}}'".format(feat))
     if image_info:
-        version_dict = {}
-        version_dict_default = {}
+        remote_image_version_dict = {}
+        local_image_version_dict = {}
         for info in image_info.split("\n"):
             rep, version, image_id = info.split()
             if len(rep.split("/")) == 1:
-                version_dict_default[version] = {IMAGE_ID: image_id, REPO: rep}
+                local_image_version_dict[version] = {IMAGE_ID: image_id, REPO: rep}
             else:
-                version_dict[version] = {IMAGE_ID: image_id, REPO: rep}
+                remote_image_version_dict[version] = {IMAGE_ID: image_id, REPO: rep}
 
-        if current_version in version_dict:
-            image_prefix = version_dict[current_version][REPO]
-            del version_dict[current_version]
+        if current_version in remote_image_version_dict:
+            image_prefix = remote_image_version_dict[current_version][REPO]
+            del remote_image_version_dict[current_version]
         else:
             out = "Current version {} doesn't exist.".format(current_version)
             ret = 0
             return ret, out, err
-        # should be only one item in version_dict_default
-        for k, v in version_dict_default.items():
+        # should be only one item in local_image_version_dict
+        for k, v in local_image_version_dict.items():
             local_version, local_repo, local_image_id = k, v[REPO], v[IMAGE_ID]
             # if there is a kube image with same version, need to remove the kube version
             # and tag the local version to kube version for fallback preparation
             # and remove the local version
-            # if there is no kube image with same version, just remove the local version
-            if local_version in version_dict:
+            if local_version in remote_image_version_dict:
                 tag_res, _, err = _run_command("docker rmi {}:{} && docker tag {} {}:{} && docker rmi {}:{}".format(
                 image_prefix, local_version, local_image_id, image_prefix, local_version, local_repo, local_version))
+            # if there is no kube image with same version, just remove the local version
             else:
                 tag_res, _, err = _run_command("docker rmi {}:{}".format(local_repo, local_version))
             if tag_res == 0:
@@ -527,12 +527,12 @@ def _do_clean(feat, current_version, last_version):
                 err = "Failed to tag {} local version images. Err: {}".format(feat, err)
             return ret, out, err
 
-        if last_version in version_dict:
-            del version_dict[last_version]
+        if last_version in remote_image_version_dict:
+            del remote_image_version_dict[last_version]
 
-        versions = [item[IMAGE_ID] for item in version_dict.values()]
-        if versions:
-            clean_res, _, err = _run_command("docker rmi {} --force".format(" ".join(versions)))
+        image_id_remove_list = [item[IMAGE_ID] for item in remote_image_version_dict.values()]
+        if image_id_remove_list:
+            clean_res, _, err = _run_command("docker rmi {} --force".format(" ".join(image_id_remove_list)))
         else:
             clean_res = 0
         if clean_res == 0: