starlingx/config
Code Issues Proposed changes

[PTP dual NIC config] Cleanup service_parameter

Browse Source 
When migrating to the latest release of StarlingX (r/stx7.0), the PTP
entries stored in the 'service_parameter' table have to be cleaned up,
since they were replaced by new tables and API/commands in r/stx6.0,
and also the legacy API was deprecated.

Test Plan:
PASS: Fresh install of r/stx7.0.
PASS: Upgrade from r/stx6.0 to r/stx7.0 with legacy PTP configuration.

Task: 44743
Story: 2009248
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
Change-Id: Ic61fe7471b590b566b409562901a85a5da8bbe36
This commit is contained in:
Douglas Henrique Koerich 2022-03-10 14:41:34 -03:00
parent fd00eeb285
commit b6f0c12801
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
controllerconfig/controllerconfig/upgrade-scripts/61-move-ptp-parameters.py
View File

@ -119,6 +119,12 @@ def main():
LOG.exception(ex)
res = 1
finally:
if to_release.startswith('22'):
_cleanup_ptp_service_parameters(conn)
# Committing all changes
LOG.info("Committing all PTP-related changes into database")
conn.commit()
conn.close()
return res
@ -132,10 +138,25 @@ def _legacy_instances_not_found(connection):
PTP_INSTANCE_LEGACY_PHC2SYS))
instance = cur.fetchone()
if instance is not None:
LOG.info("Legacy instance found with id = %s" % instance['id'])
LOG.info("PTP legacy instance found with id = %s" % instance['id'])
return False
LOG.info("No PTP legacy instances found")
# If no legacy instances are present BUT any other instance is found,
# it would mean that instance must have been created after patching the
# current release making the new API fully functional, while legacy API was
# deprecated since then.
# In such case, legacy instances shouldn't be created automatically, even
# even based on the still existing (but now legacy and potentially
# untouched) 'ptp' table, because that would be an undesired behavior
with connection.cursor(cursor_factory=DictCursor) as cur:
cur.execute("SELECT id FROM ptp_instances;")
instance = cur.fetchone()
if instance is not None:
LOG.info("PTP legacy instances dismissed")
return False
LOG.info("No legacy instances found")
return True
@ -227,6 +248,12 @@ def _assign_ptp_to_interface(connection, ptp_interface_id, interface_id):
ptp_interface_id))
def _cleanup_ptp_service_parameters(connection):
with connection.cursor(cursor_factory=DictCursor) as cur:
LOG.info("Removing PTP configuration from 'service_parameter' table")
cur.execute("DELETE FROM service_parameter WHERE service = 'ptp';")
def _move_ptp_parameters(connection):
with connection.cursor(cursor_factory=DictCursor) as cur:
# List all the hosts with clock_synchronization=ptp
@ -402,10 +429,6 @@ def _move_ptp_parameters(connection):
connection, PTP_PARAMETER_BC_JBOD, PTP_BOUNDARY_CLOCK_JBOD_1)
_add_parameter_to_instance(connection, ptp4l_uuid, bc_clock_jbod_uuid)
# Committing all changes
LOG.info("Committing PTP legacy configuration into database")
connection.commit()
if __name__ == "__main__":
sys.exit(main())