@@ -430,14 +430,7 @@ def migrate_udpu(dom):
430
430
dom ['totem' ]['transport' ] = 'knet'
431
431
if 'interface' in dom ['totem' ]:
432
432
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 )
441
434
if 'quorum' in dom :
442
435
dom ['quorum' ].pop ('expected_votes' , None )
443
436
logger .info ("Upgrade totem.transport to knet." )
@@ -446,14 +439,7 @@ def migrate_udpu(dom):
446
439
def migrate_multicast (dom ):
447
440
dom ['totem' ]['transport' ] = 'knet'
448
441
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 )
457
443
logger .info ("Generating nodelist according to CIB..." )
458
444
with open (constants .CIB_RAW_FILE , 'rb' ) as f :
459
445
cib = lxml .etree .parse (f )
@@ -490,6 +476,17 @@ def migrate_multicast(dom):
490
476
logger .info ("Upgrade totem.transport to knet." )
491
477
492
478
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
+
493
490
class _BindnetaddrFixer :
494
491
# crmsh generates incorrect bindnetaddr when joining a corosync 2 multicast cluster
495
492
def __init__ (self , interfaces : typing .Iterable [iproute2 .IPInterface ]):
0 commit comments