refactor: revert 3 changes per maintainer review to separate PRs

Per paigerube14 review on PR krkn-chaos#1208, move these changes to separate PRs
for easier merge/test:

- client.py: revert pod_type/pod_list variable rename back to k,v
- network_chaos_ng_scenario_plugin.py: revert instance_count condition order
- HealthChecker.py: revert current_iterations/ret_value back to class-level attrs

Author: NETIZEN-11

krkn/prometheus/client.py

@@ -261,37 +261,37 @@ def metrics(
                         pass
         telemetry_json = json.loads(telemetry_json)
         for scenario in telemetry_json['scenarios']:
-            for pod_type, pod_list in scenario["affected_pods"].items():
+            for k,v in scenario["affected_pods"].items():
                 metric_name = "affected_pods_recovery"
-                metric = {"metricName": metric_name, "type": pod_type}
-                if type(pod_list) is list:
-                    for pod in pod_list:
-                        for pod_k, pod_v in pod.items():
-                            metric[pod_k] = pod_v
+                metric = {"metricName": metric_name, "type": k}
+                if type(v) is list:
+                    for pod in v:
+                        for k,v in pod.items():
+                            metric[k] = v
                             metric['timestamp'] = str(datetime.datetime.now())
                         logging.debug("adding pod %s", metric)
                         metrics_list.append(metric.copy())
             for affected_node in scenario["affected_nodes"]:
                 metric_name = "affected_nodes_recovery"
                 metric = {"metricName": metric_name}
-                for node_k, node_v in affected_node.items():
-                    metric[node_k] = node_v
+                for k,v in affected_node.items():
+                    metric[k] = v
                     metric['timestamp'] = str(datetime.datetime.now())
                 metrics_list.append(metric.copy())
         if telemetry_json['health_checks']:
             for health_check in telemetry_json["health_checks"]:
                     metric_name = "health_check_recovery"
                     metric = {"metricName": metric_name}
-                    for hc_k, hc_v in health_check.items():
-                        metric[hc_k] = hc_v
+                    for k,v in health_check.items():
+                        metric[k] = v
                         metric['timestamp'] = str(datetime.datetime.now())
                     metrics_list.append(metric.copy())
         if telemetry_json['virt_checks']:
             for virt_check in telemetry_json["virt_checks"]:
                     metric_name = "virt_check_recovery"
                     metric = {"metricName": metric_name}
-                    for vc_k, vc_v in virt_check.items():
-                        metric[vc_k] = vc_v
+                    for k,v in virt_check.items():
+                        metric[k] = v
                         metric['timestamp'] = str(datetime.datetime.now())
                     metrics_list.append(metric.copy())
 

krkn/scenario_plugins/network_chaos_ng/network_chaos_ng_scenario_plugin.py

@@ -67,7 +67,10 @@ def run(
                             f"with target type {network_chaos_type}"
                         )
 
-                    if network_chaos_config.instance_count != 0 and len(targets) > network_chaos_config.instance_count:
+                    if (
+                        network_chaos_config.instance_count != 0
+                        and network_chaos_config.instance_count > len(targets)
+                    ):
                         targets = random.sample(
                             targets, network_chaos_config.instance_count
                         )

krkn/utils/HealthChecker.py

@@ -22,10 +22,10 @@
 from krkn_lib.models.telemetry.models import HealthCheck
 
 class HealthChecker:
+    current_iterations: int = 0
+    ret_value = 0
     def __init__(self, iterations):
         self.iterations = iterations
-        self.current_iterations: int = 0
-        self.ret_value = 0
 
     def make_request(self, url, auth=None, headers=None, verify=True):
         response_data = {}