starlingx
/
config
Code Issues Proposed changes

Merge "[PTP] Generate hieradata to set currentUtcOffsetValid"

This commit is contained in:
Zuul 2022-05-18 19:03:52 +00:00 committed by Gerrit Code Review
parent adb7b41308 01d993fe56
commit 6b16371d21
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -1920,6 +1920,19 @@ PTP_SLAVEONLY_1 = '1'
PTP_TS2PHC_PULSEWIDTH_100000000 = '100000000'
PTP_LEAPFILE_PATH = '/usr/share/zoneinfo/leap-seconds.list'
# PTP pmc values
PTP_PMC_CLOCK_CLASS = '248'
PTP_PMC_CLOCK_ACCURACY = '0xfe'
PTP_PMC_OFFSET_SCALED_LOG_VARIANCE = '0xffff'
PTP_PMC_CURRENT_UTC_OFFSET = '37'
PTP_PMC_LEAP61 = '0'
PTP_PMC_LEAP59 = '0'
PTP_PMC_CURRENT_UTC_OFFSET_VALID = '1'
PTP_PMC_PTP_TIMESCALE = '1'
PTP_PMC_TIME_TRACEABLE = '0'
PTP_PMC_FREQUENCY_TRACEABLE = '0'
PTP_PMC_TIME_SOURCE = '0xa0'
# PTP instance types
PTP_INSTANCE_TYPE_PTP4L = 'ptp4l'
PTP_INSTANCE_TYPE_PHC2SYS = 'phc2sys'

23
sysinv/sysinv/sysinv/sysinv/puppet/networking.py
View File

@ -214,8 +214,22 @@ class NetworkingPuppet(base.BasePuppet):
'ts2phc': '-s nmea'
}
default_pmc_parameters = {
'clockClass': constants.PTP_PMC_CLOCK_CLASS,
'clockAccuracy': constants.PTP_PMC_CLOCK_ACCURACY,
'offsetScaledLogVariance': constants.PTP_PMC_OFFSET_SCALED_LOG_VARIANCE,
'currentUtcOffset': constants.PTP_PMC_CURRENT_UTC_OFFSET,
'leap61': constants.PTP_PMC_LEAP61,
'leap59': constants.PTP_PMC_LEAP59,
'currentUtcOffsetValid': constants.PTP_PMC_CURRENT_UTC_OFFSET_VALID,
'ptpTimescale': constants.PTP_PMC_PTP_TIMESCALE,
'timeTraceable': constants.PTP_PMC_TIME_TRACEABLE,
'frequencyTraceable': constants.PTP_PMC_FREQUENCY_TRACEABLE,
'timeSource': constants.PTP_PMC_TIME_SOURCE
}
allowed_instance_fields = ['global_parameters', 'interfaces', 'name', 'service',
'cmdline_opts', 'id']
'cmdline_opts', 'id', 'pmc_gm_settings']
ptp_config = {}
for instance in ptp_instances:
@ -225,6 +239,7 @@ class NetworkingPuppet(base.BasePuppet):
instance['global_parameters'].update(default_global_parameters[instance['service']])
instance['cmdline_opts'] = default_cmdline_opts[instance['service']]
instance['interfaces'] = []
instance['pmc_gm_settings'] = {}
# Additional defaults for ptp4l instances
if instance['service'] == constants.PTP_INSTANCE_TYPE_PTP4L:
@ -245,6 +260,12 @@ class NetworkingPuppet(base.BasePuppet):
instance['global_parameters'][global_param['name']] = global_param['value']
if 'cmdline_opts' in instance['global_parameters']:
instance['cmdline_opts'] = instance['global_parameters'].pop('cmdline_opts')
# Add pmc parameters so that currentUtcOffsetValid can be set by puppet
if 'currentUtcOffsetValid' in instance['global_parameters']:
offset_valid = instance['global_parameters'].pop('currentUtcOffsetValid')
if (offset_valid == constants.PTP_PMC_CURRENT_UTC_OFFSET_VALID and
instance['service'] == 'ptp4l'):
instance['pmc_gm_settings'].update(default_pmc_parameters)
if instance['service'] == constants.PTP_INSTANCE_TYPE_PTP4L:
if (instance['global_parameters']['time_stamping'] ==