Merge pull request xapi-project#251 from huizh/CA-231365

CA-229070: switch to @update group

Author: lindig

scripts/extensions/pool_update.apply

@@ -83,7 +83,6 @@ if __name__ == '__main__':
             sys.exit(0)
 
         update_uuid = session.xenapi.pool_update.get_uuid(update)
-        update_package = 'update-' + session.xenapi.pool_update.get_name_label(update)
         yum_conf_file = os.path.join(TMP_DIR, update_uuid, 'yum.conf')
 
         # To prevent the race condition of invoking apply, set a lock.
@@ -126,7 +125,7 @@ if __name__ == '__main__':
             with open (yum_conf_file, "w+") as file:
                 file.write("{0}".format(yum_conf))
 
-            execute_apply(session, update_package, yum_conf_file)
+            execute_apply(session, '@update', yum_conf_file)
 
             session.xenapi.pool_update.resync_host(host)
             print(success_message())

scripts/extensions/pool_update.precheck

@@ -25,7 +25,6 @@ UPDATE_PRECHECK_FAILED_PREREQUISITE_MISSING = 'UPDATE_PRECHECK_FAILED_PREREQUISI
 UPDATE_PRECHECK_FAILED_CONFLICT_PRESENT = 'UPDATE_PRECHECK_FAILED_CONFLICT_PRESENT'
 UPDATE_PRECHECK_FAILED_WRONG_SERVER_VERSION = 'UPDATE_PRECHECK_FAILED_WRONG_SERVER_VERSION'
 UPDATE_PRECHECK_FAILED_OUT_OF_SPACE = 'UPDATE_PRECHECK_FAILED_OUT_OF_SPACE'
-UPDATE_PREFIX = 'update-'
 INVALID_UPDATE = 'INVALID_UPDATE'
 CANNOT_FIND_UPDATE = 'CANNOT_FIND_UPDATE'
 ERROR_MESSAGE_START = 'Error: '
@@ -97,7 +96,7 @@ def execute_precheck(session, control_package, yum_conf_file, update_precheck_fi
             errmsg = m.group()
             errmsg = re.sub(ERROR_MESSAGE_END + '.+', '', errmsg, flags=re.DOTALL)
             if ERROR_MESSAGE_CONFLICTS_WITH in errmsg and ERROR_MESSAGE_PROCESSING_CONFLICT in output:
-                regex = ERROR_MESSAGE_PROCESSING_CONFLICT + '(.*)' + ERROR_MESSAGE_CONFLICTS + UPDATE_PREFIX + '(.+?)\n'
+                regex = ERROR_MESSAGE_PROCESSING_CONFLICT + '(.*)' + ERROR_MESSAGE_CONFLICTS + '(.+?)\n'
                 conflict_tuples = re.findall(regex, output)
                 if len(conflict_tuples) > 0:
                     conflict_updates = ''
@@ -116,7 +115,7 @@ def execute_precheck(session, control_package, yum_conf_file, update_precheck_fi
                 else:
                     raise PrecheckFailure(errmsg)
             elif ERROR_MESSAGE_PREREQUISITE in errmsg:
-                regex = ERROR_MESSAGE_PREREQUISITE + UPDATE_PREFIX + '(.+?)\n'
+                regex = ERROR_MESSAGE_PREREQUISITE + '(.+?)\n'
                 prerequisite_list = re.findall(regex, errmsg)
                 if len(prerequisite_list) > 0:
                     prerequisite_updates = ''