Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[System ready] Extend sysmonitor functionality to wait for host daemons #3294

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sonic_package_manager/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ def unmarshal(self, value):
ManifestField('host-service', DefaultMarshaller(bool), True),
ManifestField('delayed', DefaultMarshaller(bool), False),
ManifestField('check_up_status', DefaultMarshaller(bool), False),
ManifestField('irrel_for_sysready', DefaultMarshaller(bool), True),
ManifestRoot('warm-shutdown', [
ManifestArray('after', DefaultMarshaller(str)),
ManifestArray('before', DefaultMarshaller(str)),
Expand Down
1 change: 1 addition & 0 deletions sonic_package_manager/service_creator/feature.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,6 @@ def get_non_configurable_feature_entries(manifest) -> Dict[str, str]:
'has_global_scope': str(manifest['service']['host-service']),
'delayed': str(manifest['service']['delayed']),
'check_up_status': str(manifest['service']['check_up_status']),
'irrel_for_sysready': str(manifest['service']['irrel_for_sysready']),
'support_syslog_rate_limit': str(manifest['service']['syslog']['support-rate-limit']),
}
5 changes: 5 additions & 0 deletions tests/sonic_package_manager/test_service_creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ def test_feature_registration(mock_sonic_db, manifest):
'has_global_scope': 'True',
'delayed': 'False',
'check_up_status': 'False',
'irrel_for_sysready': 'True',
'support_syslog_rate_limit': 'False',
})

Expand All @@ -349,6 +350,7 @@ def test_feature_update(mock_sonic_db, manifest):
'has_global_scope': 'True',
'delayed': 'False',
'check_up_status': 'False',
'irrel_for_sysready': 'True',
'support_syslog_rate_limit': 'False',
}
mock_connector = Mock()
Expand All @@ -373,6 +375,7 @@ def test_feature_update(mock_sonic_db, manifest):
'has_global_scope': 'True',
'delayed': 'True',
'check_up_status': 'False',
'irrel_for_sysready': 'True',
'support_syslog_rate_limit': 'False',
}),
], any_order=True)
Expand All @@ -395,6 +398,7 @@ def test_feature_registration_with_timer(mock_sonic_db, manifest):
'has_global_scope': 'True',
'delayed': 'True',
'check_up_status': 'False',
'irrel_for_sysready': 'True',
'support_syslog_rate_limit': 'False',
})

Expand All @@ -415,6 +419,7 @@ def test_feature_registration_with_non_default_owner(mock_sonic_db, manifest):
'has_global_scope': 'True',
'delayed': 'False',
'check_up_status': 'False',
'irrel_for_sysready': 'True',
'support_syslog_rate_limit': 'False',
})

Expand Down
Loading