From 02a7d8bdb42d55b11881a141989c32bfc73f983b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 4 Nov 2015 11:54:26 +0100 Subject: [PATCH] remove noise in nodemanager log --- plugins/update_ipv6addr_slivertag.py | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/plugins/update_ipv6addr_slivertag.py b/plugins/update_ipv6addr_slivertag.py index 8182eb2..f14c062 100644 --- a/plugins/update_ipv6addr_slivertag.py +++ b/plugins/update_ipv6addr_slivertag.py @@ -12,7 +12,7 @@ import re import tools import uuid -from xml.dom.minidom import parseString +#from xml.dom.minidom import parseString # TODO: is there anything better to do if the "libvirt", "sliver_libvirt", # and are not in place in the VS distro? @@ -42,7 +42,7 @@ def SetSliverTag(plc, data, tagname): return for slice in data['slivers']: - #logger.log("update_ipv6addr_slivertag: starting with slice=%s" % (slice['name']) ) + #logger.log("update_ipv6addr_slivertag: starting with slice={}".format(slice['name'])) # Check if the slice to be processed in a "system" slice # If so, just loop to the next slice @@ -67,8 +67,9 @@ def SetSliverTag(plc, data, tagname): slivertag_id, ipv6addr = get_sliver_tag_id_value(slivertags) except: slivertag_id, ipv6addr = None, None - logger.log("update_ipv6addr_slivertag: slice=%s getSliceIPv6Address=%s" % \ - (slice['name'], ipv6addr) ) + if ipv6addr: + logger.log("update_ipv6addr_slivertag: slice={} getSliceIPv6Address={}" + .format(slice['name'], ipv6addr)) # if the value to set is null... if value is None: if ipv6addr is not None: @@ -76,11 +77,11 @@ def SetSliverTag(plc, data, tagname): if slivertag_id: try: plc.DeleteSliceTag(slivertag_id) - logger.log("update_ipv6addr_slivertag: slice tag deleted for slice=%s" % \ - (slice['name']) ) + logger.log("update_ipv6addr_slivertag: slice tag deleted for slice={}" + .format(slice['name'])) except: - logger.log("update_ipv6addr_slivertag: slice tag not deleted for slice=%s" % \ - (slice['name']) ) + logger.log("update_ipv6addr_slivertag: slice tag not deleted for slice={}" + .format(slice['name'])) result = tools.search_ipv6addr_hosts(slice['name'], value) if result: # if there's any ipv6 address, then remove everything from the /etc/hosts @@ -89,23 +90,23 @@ def SetSliverTag(plc, data, tagname): # if the ipv6 addr set on the slice does not exist yet, so, let's add it if (ipv6addr is None) and len(value)>0: try: - logger.log("update_ipv6addr_slivertag: slice name=%s" % (slice['name']) ) + logger.log("update_ipv6addr_slivertag: slice name={}".format(slice['name'])) slivertag_id=plc.AddSliceTag(slice['name'], tagname, value, node_id) - logger.log("update_ipv6addr_slivertag: slice tag added to slice %s" % \ - (slice['name']) ) + logger.log("update_ipv6addr_slivertag: slice tag added to slice {}" + .format(slice['name'])) except: - logger.log("update_ipv6addr_slivertag: could not set ipv6 addr tag to sliver. "+ - "slice=%s tag=%s node_id=%d" % (slice['name'], tagname, node_id) ) + logger.log("update_ipv6addr_slivertag: could not set ipv6 addr tag to sliver. " + "slice={} tag={} node_id={}".format(slice['name'], tagname, node_id)) # if the ipv6 addr set on the slice is different on the value provided, let's update it - if (ipv6addr is not None) and (len(value)>0) and (ipv6addr!=value): + if (ipv6addr is not None) and (len(value) > 0) and (ipv6addr != value): plc.UpdateSliceTag(slivertag_id, value) # ipv6 entry on /etc/hosts of each slice result = tools.search_ipv6addr_hosts(slice['name'], value) if not result: tools.remove_all_ipv6addr_hosts(slice['name'], data['hostname']) tools.add_ipv6addr_hosts_line(slice['name'], data['hostname'], value) - #logger.log("update_ipv6addr_slivertag: finishing the update process for " + - # "slice=%s" % (slice['name']) ) + #logger.log("update_ipv6addr_slivertag: finishing the update process for " + # "slice={}".format(slice['name'])) def GetSlivers(data, config, plc): SetSliverTag(plc, data, ipv6addrtag) -- 2.43.0