Making changes suggested in PR-335

Author: ayefimov-1

roles/telemetry_chargeback/files/gen_db_summary.py

@@ -145,8 +145,8 @@ def extract_and_sort(json_path: Path) -> list[tuple[str, str]]:
         pass
 
     # Fallback: extract array strings from raw text (multi-line safe)
-    pairs = _find_arrays_in_text(raw)
-    pairs.sort(key=lambda p: int(p[0]))
+    # pairs = _find_arrays_in_text(raw)
+    # pairs.sort(key=lambda p: int(p[0]))
     return pairs
 
 

roles/telemetry_chargeback/tasks/loki_rate.yml

@@ -1,14 +1,14 @@
 ---
 - name: "TEST Get Rate and Qty by type from Cloudkitty {{ item }}"
   ansible.builtin.command:
-    cmd: "{{ openstack_cmd }} rating summary get -g type"
+    cmd: "{{ openstack_cmd }} --rating-api-version 2 rating summary get -g type"
   register: cost_totals_by_type
   changed_when: true
   failed_when: cost_totals_by_type.rc != 0
 
 - name: "**INFO** Print the rating by type {{ item }}"
   ansible.builtin.debug:
-    var: cost_totals_by_type
+    var: cost_totals_by_type.stdout
 
 - name: "Save output as a loadable variable file {{ item }}"
   ansible.builtin.copy:
@@ -26,4 +26,4 @@
 
 - name: "**INFO** Print the rating summary {{ item }}"
   ansible.builtin.debug:
-    var: cost_totals_summary
+    var: cost_totals_summary.stdout

roles/telemetry_chargeback/tasks/run_test_scenarios.yml

@@ -9,6 +9,30 @@
   ansible.builtin.include_tasks: "loki_rate.yml"
 
 #### diff uploaded data totals vs download data totals
+- name: "Check synthetic totals file exists"
+  ansible.builtin.stat:
+    path: "{{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_synth_totals_metrics_suffix }}"
+  register: synth_totals_stat
+
+- name: "Check loki totals file exists"
+  ansible.builtin.stat:
+    path: "{{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_loki_totals_metrics_suffix }}"
+  register: loki_totals_stat
+
+- name: "TEST Totals files exist {{ item }}"
+  ansible.builtin.assert:
+    that:
+      - synth_totals_stat.stat.exists | default(false)
+      - loki_totals_stat.stat.exists | default(false)
+    fail_msg: |
+      FAILED! Required file(s) missing for scenario {{ item }}:
+      - {{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_synth_totals_metrics_suffix }}
+      - {{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_loki_totals_metrics_suffix }}
+    success_msg: |
+      PASSED! Required file(s) exist {{ item }}: 
+      - {{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_synth_totals_metrics_suffix }}
+      - {{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_loki_totals_metrics_suffix }} 
+
 - name: "Read the synthetic totals file"
   ansible.builtin.slurp:
     src: "{{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_synth_totals_metrics_suffix }}"
@@ -24,6 +48,5 @@
     that:
       # Compare data_log (gen_db_summary output has time and data_log only)
       - (synth_data.content | b64decode | from_yaml).data_log == (loki_data.content | b64decode | from_yaml).data_log
-    fail_msg: |
-      FAILED! {{ item }}
-    success_msg: "PASSED - Data totals are identical."
+    fail_msg: "FAILED! {{ item }}"
+    success_msg: "PASSED! {{ item }} - Data totals are identical."