brcd_zone_util.py does not return anything. It does a lot of printing - perhaps deliberately, perhaps only if under a debug/test run.
In order to catch zone delete errors, we should preserve the first fail before the cfgsave or cfgabort.
--- /opt/esm/Config/current/soc/git/pyfos/pyfos/utils/brcd_zone_util.py 2022-04-07 16:50:06.414032000 +0100
+++ brcd_zone_util.py 2023-01-17 17:52:31.244548000 +0000
@@ -57,8 +57,8 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
-
result = cfgabort.cfgabort(session)
-
pyfos_util.response_print(result)
-
res = cfgabort.cfgabort(session)
-
pyfos_util.response_print(res)
else:
pyfos_util.response_print(result)
print(func.name, "succeeded. \n\nSaving transaction.")
@@ -66,8 +66,9 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
-
result = cfgabort.cfgabort(session)
-
pyfos_util.response_print(result)
-
res = cfgabort.cfgabort(session)
-
pyfos_util.response_print(res)
-
def zone_name_members_func(session, inputs, usage, func):
@@ -94,8 +95,8 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
-
result = cfgabort.cfgabort(session)
-
pyfos_util.response_print(result)
-
res = cfgabort.cfgabort(session)
-
pyfos_util.response_print(res)
else:
pyfos_util.response_print(result)
print(func.name, "succeeded. \n\nSaving transaction.")
@@ -103,8 +104,9 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
-
result = cfgabort.cfgabort(session)
-
pyfos_util.response_print(result)
-
res = cfgabort.cfgabort(session)
-
pyfos_util.response_print(res)
-
def zone_name_func(session, inputs, usage, func):
@@ -124,8 +126,8 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
-
result = cfgabort.cfgabort(session)
-
pyfos_util.response_print(result)
-
res = cfgabort.cfgabort(session)
-
pyfos_util.response_print(res)
else:
pyfos_util.response_print(result)
print(func.name, "succeeded. \n\nSaving transaction.")
@@ -133,5 +135,6 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
-
result = cfgabort.cfgabort(session)
-
pyfos_util.response_print(result)
-
res = cfgabort.cfgabort(session)
-
pyfos_util.response_print(res)
-
brcd_zone_util.py does not return anything. It does a lot of printing - perhaps deliberately, perhaps only if under a debug/test run.
In order to catch zone delete errors, we should preserve the first fail before the cfgsave or cfgabort.
--- /opt/esm/Config/current/soc/git/pyfos/pyfos/utils/brcd_zone_util.py 2022-04-07 16:50:06.414032000 +0100
+++ brcd_zone_util.py 2023-01-17 17:52:31.244548000 +0000
@@ -57,8 +57,8 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
pyfos_util.response_print(result)
print(func.name, "succeeded. \n\nSaving transaction.")
@@ -66,8 +66,9 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
def zone_name_members_func(session, inputs, usage, func):
@@ -94,8 +95,8 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
pyfos_util.response_print(result)
print(func.name, "succeeded. \n\nSaving transaction.")
@@ -103,8 +104,9 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
def zone_name_func(session, inputs, usage, func):
@@ -124,8 +126,8 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")
pyfos_util.response_print(result)
print(func.name, "succeeded. \n\nSaving transaction.")
@@ -133,5 +135,6 @@
if pyfos_util.is_failed_resp(result):
pyfos_util.response_print(result)
print(func.name, "failed. \n\nAborting transaction.")