Fix updater: handle many packages in update/install functions

Signed-off-by: Ronan Abhamon <[email protected]>

Author: Wescoeur

Diff for: SOURCES/etc/xapi.d/plugins/updater.py

@@ -95,6 +95,15 @@ def decorator(*args, **kwargs):
         return decorator
     return wrapper
 
+def get_packages_from_args(args):
+    packages = args.get('packages')
+    if not packages:
+        return []
+
+    import re
+    packages = re.sub(r'\s+', ' ', packages).replace(',', ' ').split(' ')
+    packages = filter(lambda package: package, packages)
+    return dict.fromkeys(packages, '')
 
 def display_package(p):
     if len(p.changelog):
@@ -113,7 +122,7 @@ def build_repo_list(enabled_repos, additional_repos):
 def install_helper(session, args, action):
     assert action in ('install', 'update')
 
-    packages = args.get('packages')
+    packages = list(get_packages_from_args(args))
     if action == 'install' and not packages:
         raise Exception('Missing or empty argument `packages`')
 
@@ -139,7 +148,7 @@ def install_helper(session, args, action):
 
         command = ['yum', action, '--disablerepo=*', '--enablerepo=' + ','.join(repos), '-y']
         if packages:
-            command.append(packages)
+            command.extend(packages)
         res = run_command(command)
         session.xenapi.task.set_status(task, 'success')
     except Exception as e:
@@ -181,19 +190,11 @@ def update(session, args):
 
 @error_wrapped
 def query_installed(session, args):
-    packages = args.get('packages')
-    if not packages:
-        return '{}'
-
-    import re
-    packages = re.sub(r'\s+', ' ', packages).replace(',', ' ').split(' ')
-    packages = filter(lambda package: package, packages)
-    if not packages:
+    package_map = get_packages_from_args(args)
+    if not package_map:
         return '{}'
 
-    package_map = dict.fromkeys(packages, '')
     packages = list(package_map)
-
     command = ['rpm', '-q'] + packages
     result = run_command(command, check=False)
     package_info = result['stdout'].rstrip().split('\n')

Diff for: tests/test_updater.py

@@ -28,7 +28,7 @@ def test_install(self, run_command, fs):
         packages = 'toto tata titi'
         install(mock.MagicMock(), {'packages': packages})
         run_command.assert_called_once_with(
-            ['yum', 'install', '--disablerepo=*', '--enablerepo=' + ','.join(DEFAULT_REPOS), '-y', packages]
+            ['yum', 'install', '--disablerepo=*', '--enablerepo=' + ','.join(DEFAULT_REPOS), '-y'] + packages.split(' ')
         )
 
     def test_install_without_packages(self, run_command, fs):
@@ -72,7 +72,7 @@ def test_update_with_packages(self, run_command, fs):
         packages = 'toto tata titi'
         update(mock.MagicMock(), {'packages': packages})
         run_command.assert_called_once_with(
-            ['yum', 'update', '--disablerepo=*', '--enablerepo=' + ','.join(DEFAULT_REPOS), '-y', packages]
+            ['yum', 'update', '--disablerepo=*', '--enablerepo=' + ','.join(DEFAULT_REPOS), '-y'] + packages.split(' ')
         )
 
     def test_update_error(self, run_command, fs):
@@ -112,7 +112,7 @@ def test_update_with_additional_repos_and_packages(self, run_command, fs):
         packages = 'donald hortense'
         update(mock.MagicMock(), {'repos': 'riri, fifi, loulou', 'packages': packages})
         run_command.assert_called_once_with(
-            ['yum', 'update', '--disablerepo=*', '--enablerepo=' + ','.join(repos), '-y', packages]
+            ['yum', 'update', '--disablerepo=*', '--enablerepo=' + ','.join(repos), '-y'] + packages.split(' ')
         )
 
 @mock.patch('updater.run_command', autospec=True)