Skip to content

Commit 08900c6

Browse files
MangirishKMangirishK
authored
Merge pull request #101 from dell/usr/mangirish/github_action_issue_fix
Fixing lint and sanity issues
2 parents b1f53c9 + f43879e commit 08900c6

File tree

3 files changed

+73
-66
lines changed

3 files changed

+73
-66
lines changed

‎.ansible-lint-ignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ roles/powerflex_sdr/molecule/sdr_installation_invalid_path_rpm/converge.yml var-
2727
roles/powerflex_sds/molecule/sds_installation/converge.yml var-naming[no-role-prefix]
2828
roles/powerflex_sdt/molecule/sdt_installation/converge.yml var-naming[no-role-prefix]
2929
roles/powerflex_webui/molecule/webui_installation_invalid_path_rpm/converge.yml var-naming[no-role-prefix]
30+
roles/powerflex_tb/molecule/wrong_tb_credentials/converge.yml var-naming[no-role-prefix]

‎plugins/modules/info_v2.py‎

Lines changed: 71 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@
15421542
name:
15431543
description: Name of the statistic (e.g., avg_host_read_latency).
15441544
type: str
1545-
values:
1545+
stat_values:
15461546
description: Values for the statistic.
15471547
type: list
15481548
sample: [
@@ -1581,56 +1581,56 @@
15811581
}
15821582
],
15831583
"statistics": [
1584-
{"name": "avg_host_read_latency", "values": [0]},
1585-
{"name": "raw_used", "values": [13190918307840]},
1586-
{"name": "logical_used", "values": [0]},
1587-
{"name": "host_write_bandwidth", "values": [0]},
1588-
{"name": "host_write_iops", "values": [0]},
1589-
{"name": "storage_fe_write_bandwidth", "values": [0]},
1590-
{"name": "storage_fe_write_iops", "values": [0]},
1591-
{"name": "avg_fe_write_io_size", "values": [0]},
1592-
{"name": "storage_fe_read_bandwidth", "values": [0]},
1593-
{"name": "storage_fe_read_iops", "values": [0]},
1594-
{"name": "avg_fe_read_io_size", "values": [0]},
1595-
{"name": "utilization_ratio", "values": [0.008140671]},
1596-
{"name": "compression_reducible_ratio", "values": [0.0]},
1597-
{"name": "host_read_bandwidth", "values": [0]},
1598-
{"name": "host_read_iops", "values": [0]},
1599-
{"name": "data_reduction_ratio", "values": [0.0]},
1600-
{"name": "thin_provisioning_ratio", "values": ["0.8"]},
1601-
{"name": "avg_wrc_write_latency", "values": [0]},
1602-
{"name": "unreducible_data", "values": [0]},
1603-
{"name": "avg_wrc_read_latency", "values": [0]},
1604-
{"name": "storage_fe_read_latency", "values": [0]},
1605-
{"name": "over_provisioning_limit", "values": [4611686017353646080]},
1606-
{"name": "patterns_saving_ratio", "values": [0.0]},
1607-
{"name": "avg_host_write_latency", "values": [0]},
1608-
{"name": "storage_fe_write_latency", "values": [0]},
1609-
{"name": "logical_provisioned", "values": [42949672960]},
1610-
{"name": "efficiency_ratio", "values": ["0.8"]},
1611-
{"name": "storage_fe_trim_latency", "values": [0]},
1612-
{"name": "physical_system", "values": [53687091200]},
1613-
{"name": "data_reduction_reducible_ratio", "values": [0.0]},
1614-
{"name": "storage_fe_trim_bandwidth", "values": [0]},
1615-
{"name": "storage_fe_trim_iops", "values": [0]},
1616-
{"name": "avg_fe_trim_io_size", "values": [0]},
1617-
{"name": "compression_ratio", "values": [0.0]},
1618-
{"name": "reducible_ratio", "values": [1.0]},
1619-
{"name": "physical_used", "values": [0]},
1620-
{"name": "snapshot_saving_ratio", "values": [0.0]},
1621-
{"name": "physical_free", "values": [6541235191808]},
1622-
{"name": "host_trim_bandwidth", "values": [0]},
1623-
{"name": "host_trim_iops", "values": [0]},
1624-
{"name": "total_wrc_write_bandwidth", "values": [0]},
1625-
{"name": "total_wrc_write_iops", "values": [0]},
1626-
{"name": "avg_wrc_write_io_size", "values": [0]},
1627-
{"name": "total_wrc_read_bandwidth", "values": [0]},
1628-
{"name": "total_wrc_read_iops", "values": [0]},
1629-
{"name": "avg_wrc_read_io_size", "values": [0]},
1630-
{"name": "physical_total", "values": [6594922283008]},
1631-
{"name": "logical_owned", "values": [0]},
1632-
{"name": "patterns_saving_reducible_ratio", "values": [0.0]},
1633-
{"name": "avg_host_trim_latency", "values": [0]}
1584+
{"name": "avg_host_read_latency", "stat_values": [0]},
1585+
{"name": "raw_used", "stat_values": [13190918307840]},
1586+
{"name": "logical_used", "stat_values": [0]},
1587+
{"name": "host_write_bandwidth", "stat_values": [0]},
1588+
{"name": "host_write_iops", "stat_values": [0]},
1589+
{"name": "storage_fe_write_bandwidth", "stat_values": [0]},
1590+
{"name": "storage_fe_write_iops", "stat_values": [0]},
1591+
{"name": "avg_fe_write_io_size", "stat_values": [0]},
1592+
{"name": "storage_fe_read_bandwidth", "stat_values": [0]},
1593+
{"name": "storage_fe_read_iops", "stat_values": [0]},
1594+
{"name": "avg_fe_read_io_size", "stat_values": [0]},
1595+
{"name": "utilization_ratio", "stat_values": [0.008140671]},
1596+
{"name": "compression_reducible_ratio", "stat_values": [0.0]},
1597+
{"name": "host_read_bandwidth", "stat_values": [0]},
1598+
{"name": "host_read_iops", "stat_values": [0]},
1599+
{"name": "data_reduction_ratio", "stat_values": [0.0]},
1600+
{"name": "thin_provisioning_ratio", "stat_values": ["0.8"]},
1601+
{"name": "avg_wrc_write_latency", "stat_values": [0]},
1602+
{"name": "unreducible_data", "stat_values": [0]},
1603+
{"name": "avg_wrc_read_latency", "stat_values": [0]},
1604+
{"name": "storage_fe_read_latency", "stat_values": [0]},
1605+
{"name": "over_provisioning_limit", "stat_values": [4611686017353646080]},
1606+
{"name": "patterns_saving_ratio", "stat_values": [0.0]},
1607+
{"name": "avg_host_write_latency", "stat_values": [0]},
1608+
{"name": "storage_fe_write_latency", "stat_values": [0]},
1609+
{"name": "logical_provisioned", "stat_values": [42949672960]},
1610+
{"name": "efficiency_ratio", "stat_values": ["0.8"]},
1611+
{"name": "storage_fe_trim_latency", "stat_values": [0]},
1612+
{"name": "physical_system", "stat_values": [53687091200]},
1613+
{"name": "data_reduction_reducible_ratio", "stat_values": [0.0]},
1614+
{"name": "storage_fe_trim_bandwidth", "stat_values": [0]},
1615+
{"name": "storage_fe_trim_iops", "stat_values": [0]},
1616+
{"name": "avg_fe_trim_io_size", "stat_values": [0]},
1617+
{"name": "compression_ratio", "stat_values": [0.0]},
1618+
{"name": "reducible_ratio", "stat_values": [1.0]},
1619+
{"name": "physical_used", "stat_values": [0]},
1620+
{"name": "snapshot_saving_ratio", "stat_values": [0.0]},
1621+
{"name": "physical_free", "stat_values": [6541235191808]},
1622+
{"name": "host_trim_bandwidth", "stat_values": [0]},
1623+
{"name": "host_trim_iops", "stat_values": [0]},
1624+
{"name": "total_wrc_write_bandwidth", "stat_values": [0]},
1625+
{"name": "total_wrc_write_iops", "stat_values": [0]},
1626+
{"name": "avg_wrc_write_io_size", "stat_values": [0]},
1627+
{"name": "total_wrc_read_bandwidth", "stat_values": [0]},
1628+
{"name": "total_wrc_read_iops", "stat_values": [0]},
1629+
{"name": "avg_wrc_read_io_size", "stat_values": [0]},
1630+
{"name": "physical_total", "stat_values": [6594922283008]},
1631+
{"name": "logical_owned", "stat_values": [0]},
1632+
{"name": "patterns_saving_reducible_ratio", "stat_values": [0.0]},
1633+
{"name": "avg_host_trim_latency", "stat_values": [0]}
16341634
],
16351635
"mediaType": null,
16361636
"name": "SP_EC",
@@ -1827,7 +1827,7 @@
18271827
name:
18281828
description: Name of the statistic (e.g., avg_host_read_latency).
18291829
type: str
1830-
values:
1830+
stat_values:
18311831
description: Values for the statistic.
18321832
type: list
18331833
sample: [
@@ -1848,17 +1848,17 @@
18481848
}
18491849
],
18501850
"statistics": [
1851-
{"name": "host_trim_bandwidth", "values": [0]},
1852-
{"name": "host_trim_iops", "values": [0]},
1853-
{"name": "avg_host_write_latency", "values": [0]},
1854-
{"name": "avg_host_read_latency", "values": [0]},
1855-
{"name": "logical_provisioned", "values": [10737418240]},
1856-
{"name": "host_read_bandwidth", "values": [0]},
1857-
{"name": "host_read_iops", "values": [0]},
1858-
{"name": "logical_used", "values": [0]},
1859-
{"name": "host_write_bandwidth", "values": [0]},
1860-
{"name": "host_write_iops", "values": [0]},
1861-
{"name": "avg_host_trim_latency", "values": [0]}
1851+
{"name": "host_trim_bandwidth", "stat_values": [0]},
1852+
{"name": "host_trim_iops", "stat_values": [0]},
1853+
{"name": "avg_host_write_latency", "stat_values": [0]},
1854+
{"name": "avg_host_read_latency", "stat_values": [0]},
1855+
{"name": "logical_provisioned", "stat_values": [10737418240]},
1856+
{"name": "host_read_bandwidth", "stat_values": [0]},
1857+
{"name": "host_read_iops", "stat_values": [0]},
1858+
{"name": "logical_used", "stat_values": [0]},
1859+
{"name": "host_write_bandwidth", "stat_values": [0]},
1860+
{"name": "host_write_iops", "stat_values": [0]},
1861+
{"name": "avg_host_trim_latency", "stat_values": [0]}
18621862
],
18631863
"lockedAutoSnapshot": false,
18641864
"lockedAutoSnapshotMarkedForRemoval": false,
@@ -4130,7 +4130,10 @@ def get_storage_pool_list(self, filter_dict=None):
41304130
resources = self.powerflex_conn.utility.query_metrics('storage_pool', [], []).get("resources", [])
41314131
resource_map = {res["id"]: res["metrics"] for res in resources}
41324132
for item in pool:
4133-
item['statistics'] = resource_map[item['id']] if item['id'] in resource_map else {}
4133+
metrics = resource_map.get(item['id'], {})
4134+
if isinstance(metrics, list):
4135+
metrics = [{'name': m['name'], 'stat_values': m.pop('values')} if 'values' in m else m for m in metrics]
4136+
item['statistics'] = metrics
41344137
return result_list(pool)
41354138

41364139
except Exception as e:
@@ -4153,7 +4156,10 @@ def get_volumes_list(self, filter_dict=None):
41534156
resources = self.powerflex_conn.utility.query_metrics('volume', [], []).get("resources", [])
41544157
resource_map = {res["id"]: res["metrics"] for res in resources}
41554158
for item in volumes:
4156-
item['statistics'] = resource_map[item['id']] if item['id'] in resource_map else {}
4159+
metrics = resource_map.get(item['id'], {})
4160+
if isinstance(metrics, list):
4161+
metrics = [{'name': m['name'], 'stat_values': m.pop('values')} if 'values' in m else m for m in metrics]
4162+
item['statistics'] = metrics
41574163
return result_list(volumes)
41584164

41594165
except Exception as e:

‎roles/powerflex_sdc/molecule/sdc_install_map_volume_uninstall_negative/converge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
protection_domain_name: "{{ protection_domain_name }}"
1818
size: "{{ vol_size }}"
1919
state: "present"
20-
register: volume_output
20+
register: powerflex_sdc_volume_output
2121

2222
- name: Install SDC
2323
hosts: sdc

0 commit comments

Comments
 (0)