mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

netlink: adding ifacename name at the beginning of log info msg

Browse Source 
Ticket: None
Reviewed By: Roopa
Testing Done:

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-08-12 17:36:27 +02:00
committed by Nikhil
parent 9df4f95b45
commit c94041b0bd
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ifupdown/netlink.py
View File

@@ -20,17 +20,18 @@ class Netlink(utilsBase):
self._nlmanager_api = NetlinkManager() self._nlmanager_api = NetlinkManager()
def get_iface_index(self, ifacename): def get_iface_index(self, ifacename):
self.logger.info('netlink: %s: get iface index' % ifacename) self.logger.info('%s: netlink: %s: get iface index'
% (ifacename, ifacename))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
try: try:
return self._nlmanager_api.get_iface_index(ifacename) return self._nlmanager_api.get_iface_index(ifacename)
except Exception as e: except Exception as e:
raise Exception('netlink: %s: cannot get ifindex: %s' raise Exception('%s: netlink: %s: cannot get ifindex: %s'
% (ifacename, str(e))) % (ifacename, ifacename, str(e)))
def link_add_vlan(self, vlanrawdevice, ifacename, vlanid): def link_add_vlan(self, vlanrawdevice, ifacename, vlanid):
self.logger.info('netlink: ip link add link %s name %s type vlan id %s' self.logger.info('%s: netlink: ip link add link %s name %s type vlan id %s'
% (vlanrawdevice, ifacename, vlanid)) % (ifacename, vlanrawdevice, ifacename, vlanid))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
ifindex = self.get_iface_index(vlanrawdevice) ifindex = self.get_iface_index(vlanrawdevice)
try: try:
@@ -40,8 +41,8 @@ class Netlink(utilsBase):
% (vlanrawdevice, vlanid, str(e))) % (vlanrawdevice, vlanid, str(e)))
def link_add_macvlan(self, ifacename, macvlan_ifacename): def link_add_macvlan(self, ifacename, macvlan_ifacename):
self.logger.info('netlink: ip link add link %s name %s type macvlan mode private' self.logger.info('%s: netlink: ip link add link %s name %s type macvlan mode private'
% (ifacename, macvlan_ifacename)) % (ifacename, ifacename, macvlan_ifacename))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
ifindex = self.get_iface_index(ifacename) ifindex = self.get_iface_index(ifacename)
try: try:
@@ -51,7 +52,8 @@ class Netlink(utilsBase):
% (ifacename, macvlan_ifacename, str(e))) % (ifacename, macvlan_ifacename, str(e)))
def link_set_updown(self, ifacename, state): def link_set_updown(self, ifacename, state):
self.logger.info('netlink: ip link set dev %s %s' % (ifacename, state)) self.logger.info('%s: netlink: ip link set dev %s %s'
% (ifacename, ifacename, state))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
try: try:
return self._nlmanager_api.link_set_updown(ifacename, state) return self._nlmanager_api.link_set_updown(ifacename, state)
@@ -60,7 +62,8 @@ class Netlink(utilsBase):
% (ifacename, state, str(e))) % (ifacename, state, str(e)))
def link_set_protodown(self, ifacename, state): def link_set_protodown(self, ifacename, state):
self.logger.info('netlink: set link %s protodown %s' % (ifacename, state)) self.logger.info('%s: netlink: set link %s protodown %s'
% (ifacename, ifacename, state))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
try: try:
return self._nlmanager_api.link_set_protodown(ifacename, state) return self._nlmanager_api.link_set_protodown(ifacename, state)
@@ -69,8 +72,8 @@ class Netlink(utilsBase):
% (ifacename, state, str(e))) % (ifacename, state, str(e)))
def link_add_bridge_vlan(self, ifacename, vlanid): def link_add_bridge_vlan(self, ifacename, vlanid):
self.logger.info('netlink: bridge vlan add vid %s dev %s' self.logger.info('%s: netlink: bridge vlan add vid %s dev %s'
% (vlanid, ifacename)) % (ifacename, vlanid, ifacename))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
ifindex = self.get_iface_index(ifacename) ifindex = self.get_iface_index(ifacename)
try: try:
@@ -80,8 +83,8 @@ class Netlink(utilsBase):
% (ifacename, vlanid, str(e))) % (ifacename, vlanid, str(e)))
def link_del_bridge_vlan(self, ifacename, vlanid): def link_del_bridge_vlan(self, ifacename, vlanid):
self.logger.info('netlink: bridge vlan del vid %s dev %s' self.logger.info('%s: netlink: bridge vlan del vid %s dev %s'
% (vlanid, ifacename)) % (ifacename, vlanid, ifacename))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
ifindex = self.get_iface_index(ifacename) ifindex = self.get_iface_index(ifacename)
try: try:
@@ -99,7 +102,7 @@ class Netlink(utilsBase):
cmd += ' ageing %s' % ageing if ageing else '' cmd += ' ageing %s' % ageing if ageing else ''
cmd += ' remote %s' % group if group else ' noremote' cmd += ' remote %s' % group if group else ' noremote'
cmd += ' nolearning' if learning == 'off' else '' cmd += ' nolearning' if learning == 'off' else ''
self.logger.info('netlink: %s' % cmd) self.logger.info('%s: netlink: %s' % (ifacename, cmd))
if ifupdownflags.flags.DRYRUN: return if ifupdownflags.flags.DRYRUN: return
try: try:
return self._nlmanager_api.link_add_vxlan(ifacename, return self._nlmanager_api.link_add_vxlan(ifacename,