cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bigip_monitor bugfix for check mode

Browse source 
Fixes case where properties are retrieved for a non existent monitor
which happens in check mode.
This commit is contained in:
Serge van Ginderachter 2014-06-06 16:48:36 +02:00
parent 14b4887733
commit 4a3c3f9a82
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
net_infrastructure/bigip_monitor_http
View file

@ -226,7 +226,15 @@ def delete_monitor(api, monitor):
def check_string_property(api, monitor, str_property): def check_string_property(api, monitor, str_property):
return str_property == api.LocalLB.Monitor.get_template_string_property([monitor], [str_property['type']])[0] try:
return str_property == api.LocalLB.Monitor.get_template_string_property([monitor], [str_property['type']])[0]
except bigsuds.OperationFailed, e:
# happens in check mode if not created yet
if "was not found" in str(e):
return True
else:
# genuine exception
raise
def set_string_property(api, monitor, str_property): def set_string_property(api, monitor, str_property):
@ -236,7 +244,16 @@ def set_string_property(api, monitor, str_property):
def check_integer_property(api, monitor, int_property): def check_integer_property(api, monitor, int_property):
return int_property == api.LocalLB.Monitor.get_template_integer_property([monitor], [int_property['type']])[0] try:
return int_property == api.LocalLB.Monitor.get_template_integer_property([monitor], [int_property['type']])[0]
except bigsuds.OperationFailed, e:
# happens in check mode if not created yet
if "was not found" in str(e):
return True
else:
# genuine exception
raise
def set_integer_property(api, monitor, int_property): def set_integer_property(api, monitor, int_property):

22
net_infrastructure/bigip_monitor_tcp
View file

@ -245,7 +245,16 @@ def delete_monitor(api, monitor):
def check_string_property(api, monitor, str_property): def check_string_property(api, monitor, str_property):
return str_property == api.LocalLB.Monitor.get_template_string_property([monitor], [str_property['type']])[0] try:
return str_property == api.LocalLB.Monitor.get_template_string_property([monitor], [str_property['type']])[0]
except bigsuds.OperationFailed, e:
# happens in check mode if not created yet
if "was not found" in str(e):
return True
else:
# genuine exception
raise
return True
def set_string_property(api, monitor, str_property): def set_string_property(api, monitor, str_property):
@ -255,7 +264,16 @@ def set_string_property(api, monitor, str_property):
def check_integer_property(api, monitor, int_property): def check_integer_property(api, monitor, int_property):
return int_property == api.LocalLB.Monitor.get_template_integer_property([monitor], [int_property['type']])[0] try:
return int_property == api.LocalLB.Monitor.get_template_integer_property([monitor], [int_property['type']])[0]
except bigsuds.OperationFailed, e:
# happens in check mode if not created yet
if "was not found" in str(e):
return True
else:
# genuine exception
raise
return True
def set_integer_property(api, monitor, int_property): def set_integer_property(api, monitor, int_property):