Skip to content

Commit 5328fc2

Browse files
Refactor: migration: extract a function _migrate_totem_interface (jsc#PED-8252)
1 parent 1d5147f commit 5328fc2

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

crmsh/migration.py

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -430,14 +430,7 @@ def migrate_udpu(dom):
430430
dom['totem']['transport'] = 'knet'
431431
if 'interface' in dom['totem']:
432432
for interface in dom['totem']['interface']:
433-
# remove udp-only items
434-
interface.pop('mcastaddr', None)
435-
interface.pop('bindnetaddr', None)
436-
interface.pop('broadcast', None)
437-
interface.pop('ttl', None)
438-
ringnumber = interface.pop('ringnumber', None)
439-
if ringnumber is not None:
440-
interface['linknumber'] = ringnumber
433+
_migrate_totem_interface(interface)
441434
if 'quorum' in dom:
442435
dom['quorum'].pop('expected_votes', None)
443436
logger.info("Upgrade totem.transport to knet.")
@@ -446,14 +439,7 @@ def migrate_udpu(dom):
446439
def migrate_multicast(dom):
447440
dom['totem']['transport'] = 'knet'
448441
for interface in dom['totem']['interface']:
449-
# remove udp-only items
450-
interface.pop('mcastaddr', None)
451-
interface.pop('bindnetaddr', None)
452-
interface.pop('broadcast', None)
453-
interface.pop('ttl', None)
454-
ringnumber = interface.pop('ringnumber', None)
455-
if ringnumber is not None:
456-
interface['linknumber'] = ringnumber
442+
_migrate_totem_interface(interface)
457443
logger.info("Generating nodelist according to CIB...")
458444
with open(constants.CIB_RAW_FILE, 'rb') as f:
459445
cib = lxml.etree.parse(f)
@@ -490,6 +476,17 @@ def migrate_multicast(dom):
490476
logger.info("Upgrade totem.transport to knet.")
491477

492478

479+
def _migrate_totem_interface(interface):
480+
# remove udp-only items
481+
interface.pop('mcastaddr', None)
482+
interface.pop('bindnetaddr', None)
483+
interface.pop('broadcast', None)
484+
interface.pop('ttl', None)
485+
ringnumber = interface.pop('ringnumber', None)
486+
if ringnumber is not None:
487+
interface['linknumber'] = ringnumber
488+
489+
493490
class _BindnetaddrFixer:
494491
# crmsh generates incorrect bindnetaddr when joining a corosync 2 multicast cluster
495492
def __init__(self, interfaces: typing.Iterable[iproute2.IPInterface]):

0 commit comments

Comments
 (0)