Petr Horáček has uploaded a new change for review. Change subject: hooks: ovs: start every log with 'OVS: ' ...................................................................... hooks: ovs: start every log with 'OVS: ' Change-Id: I477954f0cb18071bf80caa88e241cfabdde6bbe9 Signed-off-by: Petr Horáček <phoracek(a)redhat.com&gt; --- M vdsm_hooks/ovs/ovs_after_get_stats.py M vdsm_hooks/ovs/ovs_before_network_setup.py M vdsm_hooks/ovs/ovs_before_network_setup_ip.py M vdsm_hooks/ovs/ovs_before_network_setup_ovs.py M vdsm_hooks/ovs/ovs_utils.py 5 files changed, 22 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/46906/1 diff --git a/vdsm_hooks/ovs/ovs_after_get_stats.py b/vdsm_hooks/ovs/ovs_after_get_stats.py index 6209f0a..fc04417 100755 --- a/vdsm_hooks/ovs/ovs_after_get_stats.py +++ b/vdsm_hooks/ovs/ovs_after_get_stats.py @@ -23,7 +23,7 @@ import hooking -from ovs_utils import is_ovs_network +from ovs_utils import is_ovs_network, log def ovs_networks_stats(stats): @@ -50,8 +50,7 @@ ovs_networks_stats[vlan_name] = stats[network] ovs_networks_stats[vlan_name]['name'] = vlan_name - hooking.log('Updating network stats with OVS networks: %s' % - ovs_networks_stats) + log('Updating network stats with OVS networks: %s' % ovs_networks_stats) return ovs_networks_stats diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py index 6cef711..54a941e 100755 --- a/vdsm_hooks/ovs/ovs_before_network_setup.py +++ b/vdsm_hooks/ovs/ovs_before_network_setup.py @@ -27,7 +27,7 @@ from hooking import execCmd import hooking -from ovs_utils import (is_ovs_network, is_ovs_bond, rollback, EXT_IP, +from ovs_utils import (is_ovs_network, is_ovs_bond, rollback, log, EXT_IP, EXT_OVS_VSCTL) from ovs_setup_ovs import configure_ovs, prepare_ovs from ovs_setup_ip import configure_ip @@ -65,11 +65,11 @@ yield except: if in_rollback: - hooking.log('Failed while trying to rollback:') + log('Failed while trying to rollback:') else: - hooking.log('Configuration failed. Entering rollback.') + log('Configuration failed. Entering rollback.') rollback(running_config, initial_config) - hooking.log('Rollback finished. Initial error:') + log('Rollback finished. Initial error:') raise @@ -83,14 +83,14 @@ configure_mtu(running_config) configure_ip(nets, initial_config.networks) - hooking.log('Saving running configuration: %s %s' % - (running_config.networks, running_config.bonds)) + log('Saving running configuration: %s %s' % (running_config.networks, + running_config.bonds)) running_config.save() def main(): setup_nets_config = hooking.read_json() - hooking.log('Hook started, handling: %s' % setup_nets_config) + log('Hook started, handling: %s' % setup_nets_config) running_config = RunningConfig() networks = setup_nets_config['request']['networks'] @@ -103,7 +103,7 @@ setup_nets_config['request']['bondings'] = non_ovs_bonds setup_nets_config['request']['networks'] = non_ovs_nets - hooking.log('Hook finished, returning non-OVS networks and bondings back ' + log('Hook finished, returning non-OVS networks and bondings back ' 'to VDSM: %s' % setup_nets_config) hooking.write_json(setup_nets_config) diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py index 90640a4..c87e6d6 100644 --- a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py +++ b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py @@ -21,9 +21,7 @@ from vdsm import ipwrapper, sysctl -import hooking - -from ovs_utils import suppress, BRIDGE_NAME +from ovs_utils import suppress, log, BRIDGE_NAME # TODO: move required modules into vdsm/lib sys.path.append('/usr/share/vdsm') @@ -58,7 +56,7 @@ dhclient = DhcpClient(iface, family, default_route) rc = dhclient.start(blockingdhcp) if blockingdhcp and rc: - hooking.log('failed to start dhclient%s on iface %s' % (family, iface)) + log('failed to start dhclient%s on iface %s' % (family, iface)) def _set_ip_config(iface, ipv4, ipv6, port, blockingdhcp): @@ -119,8 +117,8 @@ ip_config_to_set[top_dev] = ( ipv4, ipv6, port, 'blockingdhcp' in attrs) - hooking.log('Remove IP configuration of: %s' % ip_config_to_remove) - hooking.log('Set IP configuration: %s' % ip_config_to_set) + log('Remove IP configuration of: %s' % ip_config_to_remove) + log('Set IP configuration: %s' % ip_config_to_set) for iface, (ipv4, ipv6) in ip_config_to_remove.iteritems(): _remove_ip_config(iface, ipv4, ipv6) for iface, (ipv4, ipv6, blockingdhcp, port) in ip_config_to_set.items(): diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py index 3f663b6..09efe81 100644 --- a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py +++ b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py @@ -23,7 +23,7 @@ import hooking -from ovs_utils import (get_bond_options, is_ovs_bond, iter_ovs_nets, +from ovs_utils import (get_bond_options, is_ovs_bond, iter_ovs_nets, log, iter_ovs_bonds, rget, suppress, destroy_ovs_bridge, BRIDGE_NAME, EXT_OVS_VSCTL) @@ -41,7 +41,7 @@ return for bond, attr in iter_ovs_bonds(running_config.bonds): return - hooking.log('Removing redundant OVS bridge') + log('Removing redundant OVS bridge') destroy_ovs_bridge() @@ -89,7 +89,7 @@ if commands: commands = [EXT_OVS_VSCTL, '--', '--may-exist', 'add-br', BRIDGE_NAME] + commands - hooking.log('Executing commands: %s' % ' '.join(commands)) + log('Executing commands: %s' % ' '.join(commands)) rc, _, err = hooking.execCmd(commands) if rc != 0: raise Exception('Executing commands failed: %s' % '\n'.join(err)) diff --git a/vdsm_hooks/ovs/ovs_utils.py b/vdsm_hooks/ovs/ovs_utils.py index 35cb8cb..7375d20 100644 --- a/vdsm_hooks/ovs/ovs_utils.py +++ b/vdsm_hooks/ovs/ovs_utils.py @@ -23,6 +23,7 @@ from libvirt import libvirtError from hooking import execCmd +import hooking from vdsm.utils import CommandPath from vdsm import supervdsm @@ -143,3 +144,7 @@ supervdsm.getProxy().setupNetworks( initial_config.networks, initial_config.bonds, {'connectivityCheck': False, '_inRollback': True}) + + +def log(message): + hooking.log('OVS: %s' % message) -- To view, visit https://gerrit.ovirt.org/46906 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I477954f0cb18071bf80caa88e241cfabdde6bbe9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;