Skip to content

Commit c796a11

Browse files
authored
Add conditional testing for ovn router traffic metrics (infrawatch#316)
Split ovn controller metrics into base metrics and router traffic metrics to allow conditional testing based on configuration.
1 parent d9c9b67 commit c796a11

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

roles/telemetry_verify_metrics/tasks/verify_ovn_metrics.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@
5151
- name: |
5252
TEST Use openstack observabilityclient to verify ovn controller metrics are stored in prometheus
5353
vars:
54-
ovn_controller_metrics:
54+
ovn_controller_base_metrics:
5555
- ovnc_rconn_queued
5656
- ovnc_txn_incomplete
5757
- ovnc_bridge_mappings
5858
- ovnc_encap_ip
5959
- ovnc_encap_type
6060
- ovnc_sb_connection_method
61-
- ovnc_router_port_traffic_pkts
62-
- ovnc_router_port_traffic_bytes
6361
- ovs_build_info
6462
- ovs_dpdk_initialized
6563
- ovs_bridge_flow_count
@@ -72,6 +70,14 @@
7270
- ovs_memory_ports_total
7371
- ovs_memory_revalidators_total
7472
- ovs_memory_rules_total
73+
ovn_controller_traffic_metrics:
74+
- ovnc_router_port_traffic_pkts
75+
- ovnc_router_port_traffic_bytes
76+
ovn_controller_metrics: >-
77+
{{
78+
ovn_controller_base_metrics +
79+
(ovn_controller_traffic_metrics if test_ovn_router_traffic_metrics | default(false) else [])
80+
}}
7581
ansible.builtin.shell: |
7682
{{ openstack_cmd }} metric show --disable-rbac {{ item }}
7783
register: result

0 commit comments

Comments
 (0)