mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 14:22:46 +00:00
modules h*: use f-strings (#10959)
* modules h*: use f-strings * add changelog frag
This commit is contained in:
@@ -191,8 +191,7 @@ def main():
|
||||
else:
|
||||
v = search_resource(config)
|
||||
if len(v) > 1:
|
||||
raise Exception("Found more than one resource(%s)" % ", ".join([
|
||||
navigate_value(i, ["id"]) for i in v]))
|
||||
raise Exception(f"Found more than one resource({', '.join([navigate_value(i, ['id']) for i in v])})")
|
||||
|
||||
if len(v) == 1:
|
||||
resource = v[0]
|
||||
@@ -288,9 +287,7 @@ def delete(config):
|
||||
try:
|
||||
wait_to_finish(["Done"], ["Pending"], _refresh_status, timeout)
|
||||
except Exception as ex:
|
||||
module.fail_json(msg="module(hwc_vpc_subnet): error "
|
||||
"waiting for api(delete) to "
|
||||
"be done, error= %s" % str(ex))
|
||||
module.fail_json(msg=f"module(hwc_vpc_subnet): error waiting for api(delete) to be done, error= {ex}")
|
||||
|
||||
|
||||
def read_resource(config, exclude_output=False):
|
||||
@@ -309,7 +306,7 @@ def _build_query_link(opts):
|
||||
query_link = "?marker={marker}&limit=10"
|
||||
v = navigate_value(opts, ["vpc_id"])
|
||||
if v:
|
||||
query_link += "&vpc_id=" + str(v)
|
||||
query_link += f"&vpc_id={v}"
|
||||
|
||||
return query_link
|
||||
|
||||
@@ -320,7 +317,7 @@ def search_resource(config):
|
||||
opts = user_input_parameters(module)
|
||||
identity_obj = _build_identity_object(opts)
|
||||
query_link = _build_query_link(opts)
|
||||
link = "subnets" + query_link
|
||||
link = f"subnets{query_link}"
|
||||
|
||||
result = []
|
||||
p = {'marker': ''}
|
||||
@@ -410,8 +407,7 @@ def send_create_request(module, params, client):
|
||||
try:
|
||||
r = client.post(url, params)
|
||||
except HwcClientException as ex:
|
||||
msg = ("module(hwc_vpc_subnet): error running "
|
||||
"api(create), error: %s" % str(ex))
|
||||
msg = f"module(hwc_vpc_subnet): error running api(create), error: {ex}"
|
||||
module.fail_json(msg=msg)
|
||||
|
||||
return r
|
||||
@@ -446,9 +442,7 @@ def async_wait_create(config, result, client, timeout):
|
||||
["UNKNOWN"],
|
||||
_query_status, timeout)
|
||||
except Exception as ex:
|
||||
module.fail_json(msg="module(hwc_vpc_subnet): error "
|
||||
"waiting for api(create) to "
|
||||
"be done, error= %s" % str(ex))
|
||||
module.fail_json(msg=f"module(hwc_vpc_subnet): error waiting for api(create) to be done, error= {ex}")
|
||||
|
||||
|
||||
def build_update_parameters(opts):
|
||||
@@ -507,8 +501,7 @@ def send_update_request(module, params, client):
|
||||
try:
|
||||
r = client.put(url, params)
|
||||
except HwcClientException as ex:
|
||||
msg = ("module(hwc_vpc_subnet): error running "
|
||||
"api(update), error: %s" % str(ex))
|
||||
msg = f"module(hwc_vpc_subnet): error running api(update), error: {ex}"
|
||||
module.fail_json(msg=msg)
|
||||
|
||||
return r
|
||||
@@ -543,9 +536,7 @@ def async_wait_update(config, result, client, timeout):
|
||||
["UNKNOWN"],
|
||||
_query_status, timeout)
|
||||
except Exception as ex:
|
||||
module.fail_json(msg="module(hwc_vpc_subnet): error "
|
||||
"waiting for api(update) to "
|
||||
"be done, error= %s" % str(ex))
|
||||
module.fail_json(msg=f"module(hwc_vpc_subnet): error waiting for api(update) to be done, error= {ex}")
|
||||
|
||||
|
||||
def send_delete_request(module, params, client):
|
||||
@@ -554,8 +545,7 @@ def send_delete_request(module, params, client):
|
||||
try:
|
||||
r = client.delete(url, params)
|
||||
except HwcClientException as ex:
|
||||
msg = ("module(hwc_vpc_subnet): error running "
|
||||
"api(delete), error: %s" % str(ex))
|
||||
msg = f"module(hwc_vpc_subnet): error running api(delete), error: {ex}"
|
||||
module.fail_json(msg=msg)
|
||||
|
||||
return r
|
||||
@@ -568,8 +558,7 @@ def send_read_request(module, client):
|
||||
try:
|
||||
r = client.get(url)
|
||||
except HwcClientException as ex:
|
||||
msg = ("module(hwc_vpc_subnet): error running "
|
||||
"api(read), error: %s" % str(ex))
|
||||
msg = f"module(hwc_vpc_subnet): error running api(read), error: {ex}"
|
||||
module.fail_json(msg=msg)
|
||||
|
||||
return navigate_value(r, ["subnet"], None)
|
||||
@@ -640,8 +629,7 @@ def send_list_request(module, client, url):
|
||||
try:
|
||||
r = client.get(url)
|
||||
except HwcClientException as ex:
|
||||
msg = ("module(hwc_vpc_subnet): error running "
|
||||
"api(list), error: %s" % str(ex))
|
||||
msg = f"module(hwc_vpc_subnet): error running api(list), error: {ex}"
|
||||
module.fail_json(msg=msg)
|
||||
|
||||
return navigate_value(r, ["subnets"], None)
|
||||
|
||||
Reference in New Issue
Block a user