diff --git a/docs/Manifest Parameters.md b/docs/Manifest Parameters.md index 6dca55728..31b9efe74 100644 --- a/docs/Manifest Parameters.md +++ b/docs/Manifest Parameters.md @@ -958,6 +958,59 @@ The query command can be used to gather information about the system and the Vis ``` +#### Source Application Add Manifest Example (deb822 format) +```xml + + + source + + + + Enabled: yes + Types: deb + URIs: http://dl.google.com/linux/chrome/deb/ + Suites: stable + Components: main + Signed-By: + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1.4.2.2 (GNU/Linux) + . + mQGiBEXwb0YRBADQva2NLpYXxgjNkbuP0LnPoEXruGmvi3XMIxjEUFuGNCP4Rj/a + kv2E5VixBP1vcQFDRJ+p1puh8NU0XERlhpyZrVMzzS/RdWdyXf7E5S8oqNXsoD1z + fvmI+i9b2EhHAA19Kgw7ifV8vMa4tkwslEmcTiwiw8lyUl28Wh4Et8SxzwCggDcA + feGqtn3PP5YAdD0km4S4XeMEAJjlrqPoPv2Gf//tfznY2UyS9PUqFCPLHgFLe80u + QhI2U5jt6jUKN4fHauvR6z3seSAsh1YyzyZCKxJFEKXCCqnrFSoh4WSJsbFNc4PN + b0V0SqiTCkWADZyLT5wll8sWuQ5ylTf3z1ENoHf+G3um3/wk/+xmEHvj9HCTBEXP + 78X0A/0Tqlhc2RBnEf+AqxWvM8sk8LzJI/XGjwBvKfXe+l3rnSR2kEAvGzj5Sg0X + 4XmfTg4Jl8BNjWyvm2Wmjfet41LPmYJKsux3g0b8yzQxeOA4pQKKAU3Z4+rgzGmf + HdwCG5MNT2A5XxD/eDd+L4fRx0HbFkIQoAi1J3YWQSiTk15fw7RMR29vZ2xlLCBJ + bmMuIExpbnV4IFBhY2thZ2UgU2lnbmluZyBLZXkgPGxpbnV4LXBhY2thZ2VzLWtl + eW1hc3RlckBnb29nbGUuY29tPohjBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwEC + HgECF4AFAkYVdn8CGQEACgkQoECDD3+sWZHKSgCfdq3HtNYJLv+XZleb6HN4zOcF + AJEAniSFbuv8V5FSHxeRimHx25671az+uQINBEXwb0sQCACuA8HT2nr+FM5y/kzI + A51ZcC46KFtIDgjQJ31Q3OrkYP8LbxOpKMRIzvOZrsjOlFmDVqitiVc7qj3lYp6U + rgNVaFv6Qu4bo2/ctjNHDDBdv6nufmusJUWq/9TwieepM/cwnXd+HMxu1XBKRVk9 + XyAZ9SvfcW4EtxVgysI+XlptKFa5JCqFM3qJllVohMmr7lMwO8+sxTWTXqxsptJo + pZeKz+UBEEqPyw7CUIVYGC9ENEtIMFvAvPqnhj1GS96REMpry+5s9WKuLEaclWpd + K3krttbDlY1NaeQUCRvBYZ8iAG9YSLHUHMTuI2oea07Rh4dtIAqPwAX8xn36JAYG + 2vgLAAMFB/wKqaycjWAZwIe98Yt0qHsdkpmIbarD9fGiA6kfkK/UxjL/k7tmS4Vm + CljrrDZkPSQ/19mpdRcGXtb0NI9+nyM5trweTvtPw+HPkDiJlTaiCcx+izg79Fj9 + KcofuNb3lPdXZb9tzf5oDnmm/B+4vkeTuEZJ//IFty8cmvCpzvY+DAz1Vo9rA+Zn + cpWY1n6z6oSS9AsyT/IFlWWBZZ17SpMHu+h4Bxy62+AbPHKGSujEGQhWq8ZRoJAT + G0KSObnmZ7FwFWu1e9XFoUCt0bSjiJWTIyaObMrWu/LvJ3e9I87HseSJStfw6fki + 5og9qFEkMrIrBCp3QGuQWBq/rTdMuwNFiEkEGBECAAkFAkXwb0sCGwwACgkQoECD + D3+sWZF/WACfeNAu1/1hwZtUo1bR+MWiCjpvHtwAnA1R3IHqFLQ2X3xJ40XPuAyY + /FJG + %20=Quqp + -----END PGP PUBLIC KEY BLOCK----- + + google-chrome.sources + + + + +``` + #### Source Application Update Manifest Parameters | Tag | Example | Required/Optional | Notes | |:-----------------------------------------|:-----------------------------------------------------------------------------------------------|:-----------------:|:------| @@ -998,22 +1051,22 @@ The query command can be used to gather information about the system and the Vis ``` #### Source Application Remove Manifest Parameters -| Tag | Example | Required/Optional | Notes | -|:-----------------------------------------|:-----------------------------------------|:-----------------:|:------| -| `` | `` | R | | -| `` | `` | R | | -| `` | `source` | R | | -| `` | `` | R | | -| `` | `` | R | | -| `` | `` | O | | -| `` | `google-chrome.gpg` | O | | -| `` | `` | O | | -| `` | `` | R | | -| `` | `google-chrom.list` | R | | -| `` | `` | R | | -| `` | `` | R | | -| `` | `` | R | | -| `` | `` | R | | +| Tag | Example | Required/Optional | Notes | +|:-----------------------------------------|:------------------------------------------|:-----------------:|:------| +| `` | `` | R | | +| `` | `` | R | | +| `` | `source` | R | | +| `` | `` | R | | +| `` | `` | R | | +| `` | `` | O | | +| `` | `google-chrome.gpg` | O | | +| `` | `` | O | | +| `` | `` | R | | +| `` | `google-chrome.list` | R | | +| `` | `` | R | | +| `` | `` | R | | +| `` | `` | R | | +| `` | `` | R | | @@ -1044,7 +1097,7 @@ The query command can be used to gather information about the system and the Vis - google-chrome.list + google-chrome.sources diff --git a/inbc-program/tests/unit/test_source_app_parser.py b/inbc-program/tests/unit/test_source_app_parser.py index 547f2f1d7..c16d98595 100644 --- a/inbc-program/tests/unit/test_source_app_parser.py +++ b/inbc-program/tests/unit/test_source_app_parser.py @@ -82,7 +82,7 @@ def test_create_add_deb_822_format_manifest_successfully(self, m_connect): 'URIs: https://dl-ssl.google.com/linux/linux_signing_key.pub', 'Suites: stable', 'Components: main', - '--filename', 'intel-gpu-jammy.list']) + '--filename', 'google-chrome.sources']) Inbc(p, 'source', False) expected = 'source' \ 'X-Repolib-Name: Google Chrome' \ @@ -91,7 +91,7 @@ def test_create_add_deb_822_format_manifest_successfully(self, m_connect): 'URIs: https://dl-ssl.google.com/linux/linux_signing_key.pub' \ 'Suites: stable' \ 'Components: main' \ - 'intel-gpu-jammy.list' + 'google-chrome.sources' self.assertEqual(p.func(p), expected) @patch('inbm_lib.mqttclient.mqtt.mqtt.Client.connect') diff --git a/inbm/dispatcher-agent/fpm-template/usr/share/dispatcher-agent/manifest_schema.xsd b/inbm/dispatcher-agent/fpm-template/usr/share/dispatcher-agent/manifest_schema.xsd index a8ea29ac0..36ce3c38a 100644 --- a/inbm/dispatcher-agent/fpm-template/usr/share/dispatcher-agent/manifest_schema.xsd +++ b/inbm/dispatcher-agent/fpm-template/usr/share/dispatcher-agent/manifest_schema.xsd @@ -333,7 +333,7 @@ - + @@ -353,7 +353,7 @@ - + diff --git a/inbm/dispatcher-agent/tests/unit/source/test_ubuntu_source_cmd.py b/inbm/dispatcher-agent/tests/unit/source/test_ubuntu_source_cmd.py index 60e500191..933e37379 100644 --- a/inbm/dispatcher-agent/tests/unit/source/test_ubuntu_source_cmd.py +++ b/inbm/dispatcher-agent/tests/unit/source/test_ubuntu_source_cmd.py @@ -210,7 +210,7 @@ def test_add_app_with_gpg_key_successfully(self): def test_add_app_deb_822_format_successfully(self): try: params = ApplicationAddSourceParameters( - file_name="intel-gpu-jammy.list", + file_name="google-chrome.sources", sources="X-Repolib-Name: Google Chrome" "Enabled: yes" "Types: deb"