diff options
Diffstat (limited to 'ansible_collections/purestorage/flasharray/plugins')
4 files changed, 535 insertions, 191 deletions
diff --git a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_host.py b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_host.py index c396975a2..1bf88ac1e 100644 --- a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_host.py +++ b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_host.py @@ -792,6 +792,7 @@ def update_host(module, array): """Modify a host""" changed = False renamed = False + vol_changed = False vlan_changed = False if module.params["state"] == "present": if module.params["vlan"]: @@ -816,7 +817,7 @@ def update_host(module, array): module.params["rename"] ) ) - init_changed = vol_changed = pers_changed = pref_changed = chap_changed = False + init_changed = pers_changed = pref_changed = chap_changed = False volumes = array.list_host_connections(module.params["name"]) if module.params["iqn"] or module.params["wwns"] or module.params["nqn"]: init_changed = _update_host_initiators(module, array) diff --git a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_info.py b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_info.py index 262d227be..cc2c92fdc 100644 --- a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_info.py +++ b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_info.py @@ -176,6 +176,9 @@ def generate_default_dict(module, array): default_info["encryption_module_version"] = encryption.module_version eradication = array_data.eradication_config if SUBS_API_VERSION in api_version: + default_info["service_mode"] = list(arrayv6.get_subscriptions().items)[ + 0 + ].service default_info["eradication_disabled_days_timer"] = int( eradication.disabled_delay / SEC_TO_DAY ) @@ -1079,9 +1082,15 @@ def generate_snap_dict(module, array): "size": snaps[snap]["size"], "source": snaps[snap]["source"], "created": snaps[snap]["created"], + "created_epoch": int( + time.mktime(time.strptime(snaps[snap]["created"], "%Y-%m-%dT%H:%M:%SZ")) + ), "tags": [], + "is_local": True, "remote": [], } + if ":" in snapshot and "::" not in snapshot: + snap_info[snapshot]["is_local"] = False if FC_REPL_API_VERSION in api_version: for snap in range(0, len(snapsv6)): snapshot = snapsv6[snap].name @@ -1324,7 +1333,7 @@ def generate_del_vol_dict(module, array): return volume_info -def generate_vol_dict(module, array): +def generate_vol_dict(module, array, performance): volume_info = {} vols_space = array.list_volumes(space=True) vols = array.list_volumes() @@ -1347,6 +1356,7 @@ def generate_vol_dict(module, array): "data_reduction": vols_space[vol]["data_reduction"], "thin_provisioning": vols_space[vol]["thin_provisioning"], "total_reduction": vols_space[vol]["total_reduction"], + "performance": [], } api_version = array._list_available_rest_versions() if V6_MINIMUM_API_VERSION in api_version: @@ -1425,27 +1435,78 @@ def generate_vol_dict(module, array): ].priority_adjustment.priority_adjustment_operator + str( volumes[vol].priority_adjustment.priority_adjustment_value ) - cvols = array.list_volumes(connect=True) - for cvol in range(0, len(cvols)): - volume = cvols[cvol]["name"] - voldict = {"host": cvols[cvol]["host"], "lun": cvols[cvol]["lun"]} - volume_info[volume]["hosts"].append(voldict) - if ACTIVE_DR_API in api_version: - voltags = array.list_volumes(tags=True) - for voltag in range(0, len(voltags)): - if voltags[voltag]["namespace"] != "vasa-integration.purestorage.com": - volume = voltags[voltag]["name"] - tagdict = { - "key": voltags[voltag]["key"], - "value": voltags[voltag]["value"], - "copyable": voltags[voltag]["copyable"], - "namespace": voltags[voltag]["namespace"], + if performance: + vols_performance = list(arrayv6.get_volumes_performance().items) + for performance in range(0, len(vols_performance)): + volume_info[vols_performance[performance].name]["performance"] = { + "bytes_per_mirrored_write": vols_performance[ + performance + ].bytes_per_mirrored_write, + "bytes_per_op": vols_performance[performance].bytes_per_op, + "bytes_per_read": vols_performance[performance].bytes_per_read, + "bytes_per_write": vols_performance[performance].bytes_per_write, + "mirrored_write_bytes_per_sec": vols_performance[ + performance + ].mirrored_write_bytes_per_sec, + "mirrored_writes_per_sec": vols_performance[ + performance + ].mirrored_writes_per_sec, + "qos_rate_limit_usec_per_mirrored_write_op": vols_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_read_op": vols_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_write_op": vols_performance[ + performance + ].qos_rate_limit_usec_per_read_op, + "queue_usec_per_mirrored_write_op": vols_performance[ + performance + ].queue_usec_per_mirrored_write_op, + "queue_usec_per_read_op": vols_performance[ + performance + ].queue_usec_per_read_op, + "queue_usec_per_write_op": vols_performance[ + performance + ].queue_usec_per_write_op, + "read_bytes_per_sec": vols_performance[ + performance + ].read_bytes_per_sec, + "reads_per_sec": vols_performance[performance].reads_per_sec, + "san_usec_per_mirrored_write_op": vols_performance[ + performance + ].san_usec_per_mirrored_write_op, + "san_usec_per_read_op": vols_performance[ + performance + ].san_usec_per_read_op, + "san_usec_per_write_op": vols_performance[ + performance + ].san_usec_per_write_op, + "service_usec_per_mirrored_write_op": vols_performance[ + performance + ].service_usec_per_mirrored_write_op, + "service_usec_per_read_op": vols_performance[ + performance + ].service_usec_per_read_op, + "service_usec_per_write_op": vols_performance[ + performance + ].service_usec_per_write_op, + "usec_per_mirrored_write_op": vols_performance[ + performance + ].usec_per_mirrored_write_op, + "usec_per_read_op": vols_performance[performance].usec_per_read_op, + "usec_per_write_op": vols_performance[ + performance + ].usec_per_write_op, + "write_bytes_per_sec": vols_performance[ + performance + ].write_bytes_per_sec, + "writes_per_sec": vols_performance[performance].writes_per_sec, } - volume_info[volume]["tags"].append(tagdict) return volume_info -def generate_host_dict(module, array): +def generate_host_dict(module, array, performance): api_version = array._list_available_rest_versions() host_info = {} if FC_REPL_API_VERSION in api_version: @@ -1474,6 +1535,7 @@ def generate_host_dict(module, array): "personality": array.get_host(hostname, personality=True)["personality"], "target_port": all_tports, "volumes": [], + "performance": [], "performance_balance": [], } if FC_REPL_API_VERSION in api_version: @@ -1546,6 +1608,70 @@ def generate_host_dict(module, array): if hosts[host].is_local: hostname = hosts[host].name host_info[hostname]["vlan"] = getattr(hosts[host], "vlan", None) + if FC_REPL_API_VERSION in api_version and performance: + hosts_performance = list(arrayv6.get_hosts_performance().items) + for performance in range(0, len(hosts_performance)): + host_info[hosts_performance[performance].name]["performance"] = { + "bytes_per_mirrored_write": hosts_performance[ + performance + ].bytes_per_mirrored_write, + "bytes_per_op": hosts_performance[performance].bytes_per_op, + "bytes_per_read": hosts_performance[performance].bytes_per_read, + "bytes_per_write": hosts_performance[performance].bytes_per_write, + "mirrored_write_bytes_per_sec": hosts_performance[ + performance + ].mirrored_write_bytes_per_sec, + "mirrored_writes_per_sec": hosts_performance[ + performance + ].mirrored_writes_per_sec, + "qos_rate_limit_usec_per_mirrored_write_op": hosts_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_read_op": hosts_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_write_op": hosts_performance[ + performance + ].qos_rate_limit_usec_per_read_op, + "queue_usec_per_mirrored_write_op": hosts_performance[ + performance + ].queue_usec_per_mirrored_write_op, + "queue_usec_per_read_op": hosts_performance[ + performance + ].queue_usec_per_read_op, + "queue_usec_per_write_op": hosts_performance[ + performance + ].queue_usec_per_write_op, + "read_bytes_per_sec": hosts_performance[performance].read_bytes_per_sec, + "reads_per_sec": hosts_performance[performance].reads_per_sec, + "san_usec_per_mirrored_write_op": hosts_performance[ + performance + ].san_usec_per_mirrored_write_op, + "san_usec_per_read_op": hosts_performance[ + performance + ].san_usec_per_read_op, + "san_usec_per_write_op": hosts_performance[ + performance + ].san_usec_per_write_op, + "service_usec_per_mirrored_write_op": hosts_performance[ + performance + ].service_usec_per_mirrored_write_op, + "service_usec_per_read_op": hosts_performance[ + performance + ].service_usec_per_read_op, + "service_usec_per_write_op": hosts_performance[ + performance + ].service_usec_per_write_op, + "usec_per_mirrored_write_op": hosts_performance[ + performance + ].usec_per_mirrored_write_op, + "usec_per_read_op": hosts_performance[performance].usec_per_read_op, + "usec_per_write_op": hosts_performance[performance].usec_per_write_op, + "write_bytes_per_sec": hosts_performance[ + performance + ].write_bytes_per_sec, + "writes_per_sec": hosts_performance[performance].writes_per_sec, + } return host_info @@ -1674,7 +1800,7 @@ def generate_del_pgroups_dict(module, array): return pgroups_info -def generate_pgroups_dict(module, array): +def generate_pgroups_dict(module, array, performance): pgroups_info = {} api_version = array._list_available_rest_versions() pgroups = array.list_pgroups() @@ -1901,7 +2027,7 @@ def generate_del_pods_dict(module, array): return pods_info -def generate_pods_dict(module, array): +def generate_pods_dict(module, array, performance): pods_info = {} api_version = array._list_available_rest_versions() if AC_REQUIRED_API_VERSION in api_version: @@ -1913,6 +2039,7 @@ def generate_pods_dict(module, array): "arrays": pods[pod]["arrays"], "mediator": pods[pod]["mediator"], "mediator_version": pods[pod]["mediator_version"], + "performance": [], } if ACTIVE_DR_API in api_version: if pods_info[acpod]["arrays"][0]["frozen_at"]: @@ -1968,6 +2095,79 @@ def generate_pods_dict(module, array): ) if SUBS_API_VERSION in api_version: pods_info[name]["total_used"] = pods[pod].space.total_used + if performance: + pods_performance = list(arrayv6.get_pods_performance().items) + for performance in range(0, len(pods_performance)): + pods_info[pods_performance[performance].name]["performance"] = { + "bytes_per_mirrored_write": pods_performance[ + performance + ].bytes_per_mirrored_write, + "bytes_per_op": pods_performance[performance].bytes_per_op, + "bytes_per_read": pods_performance[performance].bytes_per_read, + "bytes_per_write": pods_performance[ + performance + ].bytes_per_write, + "mirrored_write_bytes_per_sec": pods_performance[ + performance + ].mirrored_write_bytes_per_sec, + "mirrored_writes_per_sec": pods_performance[ + performance + ].mirrored_writes_per_sec, + "others_per_sec": pods_performance[performance].others_per_sec, + "qos_rate_limit_usec_per_mirrored_write_op": pods_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_read_op": pods_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_write_op": pods_performance[ + performance + ].qos_rate_limit_usec_per_read_op, + "queue_usec_per_mirrored_write_op": pods_performance[ + performance + ].queue_usec_per_mirrored_write_op, + "queue_usec_per_read_op": pods_performance[ + performance + ].queue_usec_per_read_op, + "queue_usec_per_write_op": pods_performance[ + performance + ].queue_usec_per_write_op, + "read_bytes_per_sec": pods_performance[ + performance + ].read_bytes_per_sec, + "reads_per_sec": pods_performance[performance].reads_per_sec, + "san_usec_per_mirrored_write_op": pods_performance[ + performance + ].san_usec_per_mirrored_write_op, + "san_usec_per_read_op": pods_performance[ + performance + ].san_usec_per_read_op, + "san_usec_per_write_op": pods_performance[ + performance + ].san_usec_per_write_op, + "service_usec_per_mirrored_write_op": pods_performance[ + performance + ].service_usec_per_mirrored_write_op, + "service_usec_per_read_op": pods_performance[ + performance + ].service_usec_per_read_op, + "service_usec_per_write_op": pods_performance[ + performance + ].service_usec_per_write_op, + "usec_per_mirrored_write_op": pods_performance[ + performance + ].usec_per_mirrored_write_op, + "usec_per_read_op": pods_performance[ + performance + ].usec_per_read_op, + "usec_per_write_op": pods_performance[ + performance + ].usec_per_write_op, + "write_bytes_per_sec": pods_performance[ + performance + ].write_bytes_per_sec, + "writes_per_sec": pods_performance[performance].writes_per_sec, + } return pods_info @@ -2064,7 +2264,7 @@ def generate_apps_dict(array): return apps_info -def generate_vgroups_dict(module, array): +def generate_vgroups_dict(module, array, performance): vgroups_info = {} api_version = array._list_available_rest_versions() if AC_REQUIRED_API_VERSION in api_version: @@ -2073,6 +2273,7 @@ def generate_vgroups_dict(module, array): virtgroup = vgroups[vgroup]["name"] vgroups_info[virtgroup] = { "volumes": vgroups[vgroup]["volumes"], + "performance": [], } if V6_MINIMUM_API_VERSION in api_version: arrayv6 = get_array(module) @@ -2115,6 +2316,72 @@ def generate_vgroups_dict(module, array): ].priority_adjustment.priority_adjustment_operator + str( vgroups[vgroup].priority_adjustment.priority_adjustment_value ) + if performance: + vgs_performance = list(arrayv6.get_volume_groups_performance().items) + for performance in range(0, len(vgs_performance)): + vgroups_info[vgs_performance[performance].name]["performance"] = { + "bytes_per_mirrored_write": vgs_performance[ + performance + ].bytes_per_mirrored_write, + "bytes_per_op": vgs_performance[performance].bytes_per_op, + "bytes_per_read": vgs_performance[performance].bytes_per_read, + "bytes_per_write": vgs_performance[performance].bytes_per_write, + "mirrored_write_bytes_per_sec": vgs_performance[ + performance + ].mirrored_write_bytes_per_sec, + "mirrored_writes_per_sec": vgs_performance[ + performance + ].mirrored_writes_per_sec, + "qos_rate_limit_usec_per_mirrored_write_op": vgs_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_read_op": vgs_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_write_op": vgs_performance[ + performance + ].qos_rate_limit_usec_per_read_op, + "queue_usec_per_mirrored_write_op": vgs_performance[ + performance + ].queue_usec_per_mirrored_write_op, + "queue_usec_per_read_op": vgs_performance[ + performance + ].queue_usec_per_read_op, + "queue_usec_per_write_op": vgs_performance[ + performance + ].queue_usec_per_write_op, + "read_bytes_per_sec": vgs_performance[ + performance + ].read_bytes_per_sec, + "reads_per_sec": vgs_performance[performance].reads_per_sec, + "san_usec_per_mirrored_write_op": vgs_performance[ + performance + ].san_usec_per_mirrored_write_op, + "san_usec_per_read_op": vgs_performance[ + performance + ].san_usec_per_read_op, + "san_usec_per_write_op": vgs_performance[ + performance + ].san_usec_per_write_op, + "service_usec_per_mirrored_write_op": vgs_performance[ + performance + ].service_usec_per_mirrored_write_op, + "service_usec_per_read_op": vgs_performance[ + performance + ].service_usec_per_read_op, + "service_usec_per_write_op": vgs_performance[ + performance + ].service_usec_per_write_op, + "usec_per_mirrored_write_op": vgs_performance[ + performance + ].usec_per_mirrored_write_op, + "usec_per_read_op": vgs_performance[performance].usec_per_read_op, + "usec_per_write_op": vgs_performance[performance].usec_per_write_op, + "write_bytes_per_sec": vgs_performance[ + performance + ].write_bytes_per_sec, + "writes_per_sec": vgs_performance[performance].writes_per_sec, + } return vgroups_info @@ -2425,7 +2692,7 @@ def generate_google_offload_dict(array): return offload_info -def generate_hgroups_dict(module, array): +def generate_hgroups_dict(module, array, performance): hgroups_info = {} api_version = array._list_available_rest_versions() hgroups = array.list_hgroups() @@ -2480,6 +2747,72 @@ def generate_hgroups_dict(module, array): ) if SUBS_API_VERSION in api_version: hgroups_info[name]["total_used"] = hgroups[hgroup].space.total_used + if performance: + hgs_performance = list(arrayv6.get_host_groups_performance().items) + for performance in range(0, len(hgs_performance)): + hgroups_info[hgs_performance[performance].name]["performance"] = { + "bytes_per_mirrored_write": hgs_performance[ + performance + ].bytes_per_mirrored_write, + "bytes_per_op": hgs_performance[performance].bytes_per_op, + "bytes_per_read": hgs_performance[performance].bytes_per_read, + "bytes_per_write": hgs_performance[performance].bytes_per_write, + "mirrored_write_bytes_per_sec": hgs_performance[ + performance + ].mirrored_write_bytes_per_sec, + "mirrored_writes_per_sec": hgs_performance[ + performance + ].mirrored_writes_per_sec, + "qos_rate_limit_usec_per_mirrored_write_op": hgs_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_read_op": hgs_performance[ + performance + ].qos_rate_limit_usec_per_mirrored_write_op, + "qos_rate_limit_usec_per_write_op": hgs_performance[ + performance + ].qos_rate_limit_usec_per_read_op, + "queue_usec_per_mirrored_write_op": hgs_performance[ + performance + ].queue_usec_per_mirrored_write_op, + "queue_usec_per_read_op": hgs_performance[ + performance + ].queue_usec_per_read_op, + "queue_usec_per_write_op": hgs_performance[ + performance + ].queue_usec_per_write_op, + "read_bytes_per_sec": hgs_performance[ + performance + ].read_bytes_per_sec, + "reads_per_sec": hgs_performance[performance].reads_per_sec, + "san_usec_per_mirrored_write_op": hgs_performance[ + performance + ].san_usec_per_mirrored_write_op, + "san_usec_per_read_op": hgs_performance[ + performance + ].san_usec_per_read_op, + "san_usec_per_write_op": hgs_performance[ + performance + ].san_usec_per_write_op, + "service_usec_per_mirrored_write_op": hgs_performance[ + performance + ].service_usec_per_mirrored_write_op, + "service_usec_per_read_op": hgs_performance[ + performance + ].service_usec_per_read_op, + "service_usec_per_write_op": hgs_performance[ + performance + ].service_usec_per_write_op, + "usec_per_mirrored_write_op": hgs_performance[ + performance + ].usec_per_mirrored_write_op, + "usec_per_read_op": hgs_performance[performance].usec_per_read_op, + "usec_per_write_op": hgs_performance[performance].usec_per_write_op, + "write_bytes_per_sec": hgs_performance[ + performance + ].write_bytes_per_sec, + "writes_per_sec": hgs_performance[performance].writes_per_sec, + } return hgroups_info @@ -2657,10 +2990,11 @@ def main(): ) info = {} - + performance = False if "minimum" in subset or "all" in subset or "apps" in subset: info["default"] = generate_default_dict(module, array) if "performance" in subset or "all" in subset: + performance = True info["performance"] = generate_perf_dict(array) if "config" in subset or "all" in subset: info["config"] = generate_config_dict(module, array) @@ -2673,26 +3007,26 @@ def main(): if "interfaces" in subset or "all" in subset: info["interfaces"] = generate_interfaces_dict(array) if "hosts" in subset or "all" in subset: - info["hosts"] = generate_host_dict(module, array) + info["hosts"] = generate_host_dict(module, array, performance) if "volumes" in subset or "all" in subset: - info["volumes"] = generate_vol_dict(module, array) + info["volumes"] = generate_vol_dict(module, array, performance) info["deleted_volumes"] = generate_del_vol_dict(module, array) if "snapshots" in subset or "all" in subset: info["snapshots"] = generate_snap_dict(module, array) info["deleted_snapshots"] = generate_del_snap_dict(module, array) if "hgroups" in subset or "all" in subset: - info["hgroups"] = generate_hgroups_dict(module, array) + info["hgroups"] = generate_hgroups_dict(module, array, performance) if "pgroups" in subset or "all" in subset: info["pgroups"] = generate_pgroups_dict(module, array) info["deleted_pgroups"] = generate_del_pgroups_dict(module, array) if "pods" in subset or "all" in subset or "replication" in subset: info["replica_links"] = generate_rl_dict(module, array) - info["pods"] = generate_pods_dict(module, array) + info["pods"] = generate_pods_dict(module, array, performance) info["deleted_pods"] = generate_del_pods_dict(module, array) if "admins" in subset or "all" in subset: info["admins"] = generate_admin_dict(array) if "vgroups" in subset or "all" in subset: - info["vgroups"] = generate_vgroups_dict(module, array) + info["vgroups"] = generate_vgroups_dict(module, array, performance) info["deleted_vgroups"] = generate_del_vgroups_dict(module, array) if "offload" in subset or "all" in subset: info["azure_offload"] = generate_azure_offload_dict(module, array) diff --git a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_pg.py b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_pg.py index 3344c0895..840b11385 100644 --- a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_pg.py +++ b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_pg.py @@ -36,6 +36,8 @@ options: state: description: - Define whether the protection group should exist or not. + - If specified with I(volume) or I(host) or I(hostgroup) will + act on those items in the protection group only. type: str default: present choices: [ absent, present ] @@ -186,6 +188,15 @@ EXAMPLES = r""" target: arrayb fa_url: 10.10.10.2 api_token: e31060a7-21fc-e277-6240-25983c6c4592 + +- name: Remove a volume from protection group + purestorage.flasharray.purefa_pg: + name: bar + volume: + - vol1 + state: absent + fa_url: 10.10.10.2 + api_token: e31060a7-21fc-e277-6240-25983c6c4592 """ RETURN = r""" @@ -455,6 +466,7 @@ def rename_exists(module, array): def update_pgroup(module, array): """Update Protection Group""" changed = renamed = False + state = module.params["state"] api_version = array._list_available_rest_versions() if module.params["target"]: connected_targets = [] @@ -546,19 +558,36 @@ def update_pgroup(module, array): else: cased_vols = list(module.params["volume"]) cased_pgvols = list(get_pgroup(module, array)["volumes"]) - if not all(x in cased_pgvols for x in cased_vols): - if not module.check_mode: - changed = True - try: - array.set_pgroup( - module.params["name"], addvollist=module.params["volume"] - ) - except Exception: - module.fail_json( - msg="Changing volumes in pgroup {0} failed.".format( - module.params["name"] + if state == "present": + if not all(x in cased_pgvols for x in cased_vols): + if not module.check_mode: + changed = True + try: + array.set_pgroup( + module.params["name"], + addvollist=module.params["volume"], + ) + except Exception: + module.fail_json( + msg="Adding volumes in pgroup {0} failed.".format( + module.params["name"] + ) + ) + else: + if all(x in cased_pgvols for x in cased_vols): + if not module.check_mode: + changed = True + try: + array.set_pgroup( + module.params["name"], + remvollist=module.params["volume"], + ) + except Exception: + module.fail_json( + msg="Removing volumes in pgroup {0} failed.".format( + module.params["name"] + ) ) - ) if ( module.params["host"] @@ -581,19 +610,34 @@ def update_pgroup(module, array): else: cased_hosts = list(module.params["host"]) cased_pghosts = list(get_pgroup(module, array)["hosts"]) - if not all(x in cased_pghosts for x in cased_hosts): - if not module.check_mode: - changed = True - try: - array.set_pgroup( - module.params["name"], addhostlist=module.params["host"] - ) - except Exception: - module.fail_json( - msg="Changing hosts in pgroup {0} failed.".format( - module.params["name"] + if state == "present": + if not all(x in cased_pghosts for x in cased_hosts): + if not module.check_mode: + changed = True + try: + array.set_pgroup( + module.params["name"], addhostlist=module.params["host"] + ) + except Exception: + module.fail_json( + msg="Adding hosts in pgroup {0} failed.".format( + module.params["name"] + ) + ) + else: + if all(x in cased_pghosts for x in cased_hosts): + if not module.check_mode: + changed = True + try: + array.set_pgroup( + module.params["name"], remhostlist=module.params["host"] + ) + except Exception: + module.fail_json( + msg="Removing hosts in pgroup {0} failed.".format( + module.params["name"] + ) ) - ) if ( module.params["hostgroup"] @@ -616,20 +660,36 @@ def update_pgroup(module, array): else: cased_hostg = list(module.params["hostgroup"]) cased_pghostg = list(get_pgroup(module, array)["hgroups"]) - if not all(x in cased_pghostg for x in cased_hostg): - if not module.check_mode: - changed = True - try: - array.set_pgroup( - module.params["name"], - addhgrouplist=module.params["hostgroup"], - ) - except Exception: - module.fail_json( - msg="Changing hostgroups in pgroup {0} failed.".format( - module.params["name"] + if state == "present": + if not all(x in cased_pghostg for x in cased_hostg): + if not module.check_mode: + changed = True + try: + array.set_pgroup( + module.params["name"], + addhgrouplist=module.params["hostgroup"], + ) + except Exception: + module.fail_json( + msg="Adding hostgroups in pgroup {0} failed.".format( + module.params["name"] + ) + ) + else: + if all(x in cased_pghostg for x in cased_hostg): + if not module.check_mode: + changed = True + try: + array.set_pgroup( + module.params["name"], + remhgrouplist=module.params["hostgroup"], + ) + except Exception: + module.fail_json( + msg="Removing hostgroups in pgroup {0} failed.".format( + module.params["name"] + ) ) - ) if module.params["rename"]: if not rename_exists(module, array): if ":" in module.params["name"]: @@ -881,6 +941,16 @@ def main(): if pgroup and state == "present": update_pgroup(module, array) + elif ( + pgroup + and state == "absent" + and ( + module.params["volume"] + or module.params["hosts"] + or module.params["hostgroups"] + ) + ): + update_pgroup(module, array) elif pgroup and state == "absent": delete_pgroup(module, array) elif xpgroup and state == "absent" and module.params["eradicate"]: diff --git a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_volume.py b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_volume.py index 877af7f74..77236e3af 100644 --- a/ansible_collections/purestorage/flasharray/plugins/modules/purefa_volume.py +++ b/ansible_collections/purestorage/flasharray/plugins/modules/purefa_volume.py @@ -331,7 +331,9 @@ from ansible_collections.purestorage.flasharray.plugins.module_utils.common impo human_to_bytes, human_to_real, ) - +from ansible_collections.purestorage.flasharray.plugins.module_utils.version import ( + LooseVersion, +) QOS_API_VERSION = "1.14" VGROUPS_API_VERSION = "1.13" @@ -347,6 +349,38 @@ DEFAULT_API_VERSION = "2.16" VOLUME_PROMOTION_API_VERSION = "2.2" +def _volfact(module, array): + api_version = array.get_rest_version() + volume_name = module.params["name"] + volume_data = list(array.get_volumes(names=[volume_name]).items)[0] + volfact = { + volume_name: { + "size": volume_data.provisioned, + "serial": volume_data.serial, + "created": time.strftime( + "%Y-%m-%d %H:%M:%S", time.localtime(volume_data.created / 1000) + ), + "page83_naa": PURE_OUI + volume_data.serial.lower(), + "nvme_nguid": _create_nguid(volume_data.serial.lower()), + "iops_limit": getattr(volume_data.qos, "iops_limit", 0), + "bandwidth_limit": getattr(volume_data.qos, "bandwidth_limit", 0), + "requested_promotion_state": volume_data.requested_promotion_state, + "promotion_status": volume_data.promotion_status, + "priority": getattr(volume_data, "priority", 0), + "priority_operator": "", + "priority_value": "", + } + } + if LooseVersion(PRIORITY_API_VERSION) <= LooseVersion(api_version): + volfact[volume_name][ + "priority_operator" + ] = volume_data.priority_adjustment.priority_adjustment_operator + volfact[volume_name][ + "priority_value" + ] = volume_data.priority_adjustment.priority_adjustment_value + return volfact + + def _create_nguid(serial): nguid = "eui.00" + serial[0:14] + "24a937" + serial[-10:] return nguid @@ -511,7 +545,6 @@ def check_pod(module, array): def create_volume(module, array): """Create Volume""" - volfact = [] changed = False api_version = array._list_available_rest_versions() if "/" in module.params["name"] and not check_vgroup(module, array): @@ -549,17 +582,11 @@ def create_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.create_volume( + array.create_volume( module.params["name"], module.params["size"], bandwidth_limit=module.params["bw_qos"], ) - volfact["page83_naa"] = ( - PURE_OUI + volfact["serial"].lower() - ) - volfact["nvme_nguid"] = _create_nguid( - volfact["serial"].lower() - ) except Exception: module.fail_json( msg="Volume {0} creation failed.".format( @@ -581,17 +608,11 @@ def create_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.create_volume( + array.create_volume( module.params["name"], module.params["size"], iops_limit=module.params["iops_qos"], ) - volfact["page83_naa"] = ( - PURE_OUI + volfact["serial"].lower() - ) - volfact["nvme_nguid"] = _create_nguid( - volfact["serial"].lower() - ) except Exception: module.fail_json( msg="Volume {0} creation failed.".format( @@ -612,18 +633,12 @@ def create_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.create_volume( + array.create_volume( module.params["name"], module.params["size"], iops_limit=module.params["iops_qos"], bandwidth_limit=module.params["bw_qos"], ) - volfact["page83_naa"] = ( - PURE_OUI + volfact["serial"].lower() - ) - volfact["nvme_nguid"] = _create_nguid( - volfact["serial"].lower() - ) except Exception: module.fail_json( msg="Volume {0} creation failed.".format( @@ -642,17 +657,11 @@ def create_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.create_volume( + array.create_volume( module.params["name"], module.params["size"], bandwidth_limit=module.params["bw_qos"], ) - volfact["page83_naa"] = ( - PURE_OUI + volfact["serial"].lower() - ) - volfact["nvme_nguid"] = _create_nguid( - volfact["serial"].lower() - ) except Exception: module.fail_json( msg="Volume {0} creation failed.".format( @@ -669,13 +678,9 @@ def create_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.create_volume( + array.create_volume( module.params["name"], module.params["size"] ) - volfact["page83_naa"] = PURE_OUI + volfact["serial"].lower() - volfact["nvme_nguid"] = _create_nguid( - volfact["serial"].lower() - ) except Exception: module.fail_json( msg="Volume {0} creation failed.".format( @@ -686,11 +691,7 @@ def create_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.create_volume( - module.params["name"], module.params["size"] - ) - volfact["page83_naa"] = PURE_OUI + volfact["serial"].lower() - volfact["nvme_nguid"] = _create_nguid(volfact["serial"].lower()) + array.create_volume(module.params["name"], module.params["size"]) except Exception: module.fail_json( msg="Volume {0} creation failed.".format(module.params["name"]) @@ -714,8 +715,6 @@ def create_volume(module, array): module.params["name"] ) ) - else: - volfact["promotion_state"] = module.params["promotion_state"] if PRIORITY_API_VERSION in api_version and module.params["priority_operator"]: arrayv6 = get_array(module) volume = flasharray.VolumePatch( @@ -736,9 +735,6 @@ def create_volume(module, array): module.params["name"], res.errors[0].message ) ) - else: - volfact["priority_operator"] = module.params["priority_operator"] - volfact["priority_value"] = module.params["priority_value"] if module.params["pgroup"] and DEFAULT_API_VERSION not in api_version: changed = True if not module.check_mode: @@ -753,7 +749,7 @@ def create_volume(module, array): ) ) - module.exit_json(changed=changed, volume=volfact) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def create_multi_volume(module, array, single=False): @@ -954,7 +950,6 @@ def create_multi_volume(module, array, single=False): def copy_from_volume(module, array): """Create Volume Clone""" - volfact = [] changed = False tgt = get_target(module, array) api_version = array._list_available_rest_versions() @@ -1000,23 +995,9 @@ def copy_from_volume(module, array): res.errors[0].message, ) ) - vol_data = list(res.items) - volfact = { - "size": vol_data[0].provisioned, - "serial": vol_data[0].serial, - "created": time.strftime( - "%Y-%m-%d %H:%M:%S", time.localtime(vol_data[0].created / 1000) - ), - "page83_naa": PURE_OUI + vol_data[0].serial.lower(), - "nvme_nguid": _create_nguid(vol_data[0].serial.lower()), - } else: try: - volfact = array.copy_volume( - module.params["name"], module.params["target"] - ) - volfact["page83_naa"] = PURE_OUI + volfact["serial"].lower() - volfact["nvme_nguid"] = _create_nguid(volfact["serial"].lower()) + array.copy_volume(module.params["name"], module.params["target"]) changed = True except Exception: module.fail_json( @@ -1029,13 +1010,11 @@ def copy_from_volume(module, array): if not module.check_mode: if DEFAULT_API_VERSION not in api_version: try: - volfact = array.copy_volume( + array.copy_volume( module.params["name"], module.params["target"], overwrite=module.params["overwrite"], ) - volfact["page83_naa"] = PURE_OUI + volfact["serial"].lower() - volfact["nvme_nguid"] = _create_nguid(volfact["serial"].lower()) changed = True except Exception: module.fail_json( @@ -1059,23 +1038,12 @@ def copy_from_volume(module, array): res.errors[0].message, ) ) - vol_data = list(res.items) - volfact = { - "size": vol_data[0].provisioned, - "serial": vol_data[0].serial, - "created": time.strftime( - "%Y-%m-%d %H:%M:%S", time.localtime(vol_data[0].created / 1000) - ), - "page83_naa": PURE_OUI + vol_data[0].serial.lower(), - "nvme_nguid": _create_nguid(vol_data[0].serial.lower()), - } - module.exit_json(changed=changed, volume=volfact) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def update_volume(module, array): """Update Volume size and/or QoS""" - volfact = {} changed = False arrayv6 = None api_version = array._list_available_rest_versions() @@ -1102,7 +1070,7 @@ def update_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.extend_volume( + array.extend_volume( module.params["name"], module.params["size"] ) except Exception: @@ -1119,9 +1087,7 @@ def update_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.set_volume( - module.params["name"], bandwidth_limit="" - ) + array.set_volume(module.params["name"], bandwidth_limit="") except Exception: module.fail_json( msg="Volume {0} Bandwidth QoS removal failed.".format( @@ -1134,7 +1100,7 @@ def update_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.set_volume( + array.set_volume( module.params["name"], bandwidth_limit=module.params["bw_qos"], ) @@ -1156,7 +1122,7 @@ def update_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.set_volume(module.params["name"], iops_limit="") + array.set_volume(module.params["name"], iops_limit="") except Exception: module.fail_json( msg="Volume {0} IOPs QoS removal failed.".format( @@ -1167,7 +1133,7 @@ def update_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.set_volume( + array.set_volume( module.params["name"], iops_limit=module.params["iops_qos"] ) except Exception: @@ -1199,10 +1165,6 @@ def update_volume(module, array): module.params["name"] ) ) - else: - if not volfact: - volfact = array.get_volume(module.params["name"]) - volfact["promotion_status"] = module.params["promotion_state"] if PRIORITY_API_VERSION in api_version and module.params["priority_operator"]: volv6 = list(arrayv6.get_volumes(names=[module.params["name"]]).items)[0] change_prio = False @@ -1246,33 +1208,13 @@ def update_volume(module, array): module.params["name"], prio_res.errors[0].message ) ) - else: - if not volfact: - volfact = array.get_volume(module.params["name"]) - volfact["priority_operator"] = module.params["priority_operator"] - volfact["priority_value"] = module.params["priority_value"] - if MULTI_VOLUME_VERSION in api_version: - volume_data = list(arrayv6.get_volumes(names=[module.params["name"]]).items)[0] - updatefacts = { - "name": volume_data.name, - "size": volume_data.provisioned, - "serial": volume_data.serial, - "created": time.strftime( - "%Y-%m-%d %H:%M:%S", time.localtime(volume_data.created / 1000) - ), - "page83_naa": PURE_OUI + volume_data.serial.lower(), - "nvme_nguid": _create_nguid(volume_data.serial.lower()), - } - else: - updatefacts = array.get_volume(module.params["name"]) - vol_fact = {**volfact, **updatefacts} - module.exit_json(changed=changed, volume=vol_fact) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def rename_volume(module, array): """Rename volume within a container, ie pod, vgroup or local array""" - volfact = [] changed = False + arrayv6 = get_array(module) pod_name = "" vgroup_name = "" target_name = module.params["rename"] @@ -1314,9 +1256,7 @@ def rename_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.rename_volume( - module.params["name"], module.params["rename"] - ) + array.rename_volume(module.params["name"], module.params["rename"]) except Exception: module.fail_json( msg="Rename volume {0} to {1} failed.".format( @@ -1326,12 +1266,11 @@ def rename_volume(module, array): else: module.fail_json(msg="Target volume {0} already exists.".format(target_name)) - module.exit_json(changed=changed, volume=volfact) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def move_volume(module, array): """Move volume between pods, vgroups or local array""" - volfact = [] changed = vgroup_exists = target_exists = pod_exists = False api_version = array._list_available_rest_versions() pod_name = "" @@ -1428,7 +1367,7 @@ def move_volume(module, array): changed = True if not module.check_mode: try: - volfact = array.move_volume(module.params["name"], target_location) + array.move_volume(module.params["name"], target_location) except Exception: if target_location == "": target_location = "[local]" @@ -1437,28 +1376,30 @@ def move_volume(module, array): module.params["name"], target_location ) ) - module.exit_json(changed=changed, volume=volfact) + arrayv6 = get_array(module) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def delete_volume(module, array): """Delete Volume""" changed = True - volfact = [] if not module.check_mode: try: array.destroy_volume(module.params["name"]) if module.params["eradicate"]: try: - volfact = array.eradicate_volume(module.params["name"]) + array.eradicate_volume(module.params["name"]) except Exception: module.fail_json( msg="Eradicate volume {0} failed.".format(module.params["name"]) ) + module.exit_json(changed=changed, volume=[]) except Exception: module.fail_json( msg="Delete volume {0} failed.".format(module.params["name"]) ) - module.exit_json(changed=changed, volume=volfact) + arrayv6 = get_array(module) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def eradicate_volume(module, array): @@ -1479,7 +1420,6 @@ def eradicate_volume(module, array): def recover_volume(module, array): """Recover Deleted Volume""" changed = True - volfact = [] if not module.check_mode: try: array.recover_volume(module.params["name"]) @@ -1487,10 +1427,9 @@ def recover_volume(module, array): module.fail_json( msg="Recovery of volume {0} failed".format(module.params["name"]) ) - volfact = array.get_volume(module.params["name"]) - volfact["page83_naa"] = PURE_OUI + volfact["serial"].lower() - volfact["nvme_nguid"] = _create_nguid(volfact["serial"].lower()) - module.exit_json(changed=changed, volume=volfact) + array.get_volume(module.params["name"]) + arrayv6 = get_array(module) + module.exit_json(changed=changed, volume=_volfact(module, arrayv6)) def main(): |