Ues upper keywords in requests job

Change-Id: Ib4b3758e78ac5ce21e6662b35413970206105c8a
Signed-off-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/job_request.py b/job_request.py
index d1315f1..46e95a3 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -65,34 +65,34 @@ def tag_info(prjdir, tag):
 
 def OBS_Git_data(event_fields):
 
-    obs_fields_mapping = {'author': 'obs_req_author',
-                          'comment': 'obs_req_comment',
-                          'deletepackage': 'obs_req_pkg_del',
-                          'deleteproject': 'obs_req_prj_del',
-                          'description': 'obs_req_desp',
-                          'id': 'obs_req_id',
-                          'oldstate': 'obs_req_oldstate',
-                          'origintype': 'obs_req_origintype',
-                          'person': 'obs_req_person',
-                          'role': 'obs_req_role',
-                          'sender': 'obs_req_sender',
-                          'sourcepackage': 'obs_req_pkg_src',
-                          'sourceproject': 'obs_req_prj_src',
-                          'sourcerevision': 'obs_req_srcrev',
-                          'state': 'obs_req_state',
-                          'targetpackage': 'obs_req_pkg',
-                          'targetproject': 'obs_req_prj',
-                          'time': 'obs_req_time',
-                          'type': 'obs_req_type',
-                          'when': 'obs_req_when',
-                          'who': 'obs_req_who'
+    obs_fields_mapping = {'author': 'OBS_REQ_AUTHOR',
+                          'comment': 'OBS_REQ_COMMENT',
+                          'deletepackage': 'OBS_REQ_PKG_DEL',
+                          'deleteproject': 'OBS_REQ_PRJ_DEL',
+                          'description': 'OBS_REQ_DESP',
+                          'id': 'OBS_REQ_ID',
+                          'oldstate': 'OBS_REQ_OLDSTATE',
+                          'origintype': 'OBS_REQ_ORIGINTYPE',
+                          'person': 'OBS_REQ_PERSON',
+                          'role': 'OBS_REQ_ROLE',
+                          'sender': 'OBS_REQ_SENDER',
+                          'sourcepackage': 'OBS_REQ_PKG_SRC',
+                          'sourceproject': 'OBS_REQ_PRJ_SRC',
+                          'sourcerevision': 'OBS_REQ_SRCREV',
+                          'state': 'OBS_REQ_STATE',
+                          'targetpackage': 'OBS_REQ_PKG',
+                          'targetproject': 'OBS_REQ_PRJ',
+                          'time': 'OBS_REQ_TIME',
+                          'type': 'OBS_REQ_TYPE',
+                          'when': 'OBS_REQ_WHEN',
+                          'who': 'OBS_REQ_WHO'
                           }
-    
-    mapping = {"Submitter" : 'git_author_email',
-               "Comments" : "git_comments",
-               "Tag" : "git_tag",
-               "Git project" : "git_project",
-               "Commit" : "git_commit_subj"
+
+    mapping = {"Submitter" : 'GIT_AUTHOR_EMAIL',
+               "Comments" : "GIT_COMMENTS",
+               "Tag" : "GIT_TAG",
+               "Git project" : "GIT_PROJECT",
+               "Commit" : "GIT_COMMIT_SUBJ"
                }
 
     ret_data = {}
@@ -142,17 +142,17 @@ def request_accepted(data, gerrit, gitprj):
     '- Git project: %s\n' \
     '- Tag:%s\n' \
     '- Commit: %s\n' \
-    '- Request URL:%s' %( data['obs_req_prj'],
-                          data['obs_req_pkg'],
-                          data["obs_req_sender"],
-                          data["obs_req_comment"],
-                          data['git_project'],
-                          data["git_tag"],
-                          data['git_commit_subj'],
-                          request_url(data['obs_req_id']))
+    '- Request URL:%s' %( data['OBS_REQ_PRJ'],
+                          data['OBS_REQ_PKG'],
+                          data["OBS_REQ_SENDER"],
+                          data["OBS_REQ_COMMENT"],
+                          data['GIT_PROJECT'],
+                          data["GIT_TAG"],
+                          data['GIT_COMMIT_SUBJ'],
+                          request_url(data['OBS_REQ_ID']))
     gerrit.review(commit = data['commitid'], message = message)
 
-    tag = data['git_tag'].lower()
+    tag = data['GIT_TAG'].lower()
 
     if tag.startswith('submit'):
         try:
@@ -173,7 +173,7 @@ def request_accepted(data, gerrit, gitprj):
     gitprj.create_tag(accepted_tag, message, data['commitid'])
 
     args = []
-    args.append('ssh://%s@%s:%s/%s' %(gerrit.username, gerrit.host, gerrit.port, data['git_project']))
+    args.append('ssh://%s@%s:%s/%s' %(gerrit.username, gerrit.host, gerrit.port, data['GIT_PROJECT']))
     args.append('refs/tags/%s' %(accepted_tag))
     gitprj.push(' '.join(args))
 
@@ -186,13 +186,13 @@ def request_rejected(data, gerrit, gitprj):
     '- Git project: %s\n' \
     '- Tag:%s\n' \
     '- Commit: %s\n' \
-    '- Request URL:%s' %( data['obs_req_prj'],
-                          data["obs_req_sender"],
-                          data["obs_req_comment"],
-                          data['git_project'],
-                          data["git_tag"],
-                          data['git_commit_subj'],
-                          request_url(data['obs_req_id']))
+    '- Request URL:%s' %( data['OBS_REQ_PRJ'],
+                          data["OBS_REQ_SENDER"],
+                          data["OBS_REQ_COMMENT"],
+                          data['GIT_PROJECT'],
+                          data["GIT_TAG"],
+                          data['GIT_COMMIT_SUBJ'],
+                          request_url(data['OBS_REQ_ID']))
 
     gerrit.review(commit = data['commitid'], message = message)
 
@@ -205,13 +205,13 @@ def request_created(data, gerrit, gitprj):
     '- Git project: %s\n' \
     '- Tag:%s\n' \
     '- Commit: %s\n' \
-    '- Request URL:%s' %( data['obs_req_prj'],
-                          data["git_author_email"],
-                          data["message"],
-                          data['git_project'],
-                          data["git_tag"],
-                          data['git_commit_subj'],
-                          request_url(data['obs_req_id']))
+    '- Request URL:%s' %( data['OBS_REQ_PRJ'],
+                          data["GIT_AUTHOR_EMAIL"],
+                          data["MESSAGE"],
+                          data['GIT_PROJECT'],
+                          data["GIT_TAG"],
+                          data['GIT_COMMIT_SUBJ'],
+                          request_url(data['OBS_REQ_ID']))
 
     print '#########NOTE: post to gerrit is disabled###############################'
     #gerrit.review(commit = data['commitid'], message = message)
@@ -245,7 +245,7 @@ notify_submiter(event_fields, data)
 
 gerrit = Gerrit(GERRIT_HOSTNAME, GERRIT_USERNAME, GERRIT_SSHPORT)
 
-gitprj = git.Git('%s/%s' %(GIT_CACHE_DIR, data['git_project']))
+gitprj = git.Git('%s/%s' %(GIT_CACHE_DIR, data['GIT_PROJECT']))
 
 if event_fields['type'] == 'OBS_SRCSRV_REQUEST_STATECHANGE':
     if event_fields['state'] == 'declined':

diff --git a/requests/mailer.py b/requests/mailer.py
index 96dfb30..7f16530 100644 (file)
--- a/requests/mailer.py
+++ b/requests/mailer.py
@@ -255,13 +255,12 @@ def mailer(request, bs, wi, noreply_sender, ml, bccs, request_data,
                     reqinfo.append('\nPlease refer to OBS webUI for more details about this SR.')
                 return_dict['reqinfo'] = '\n'.join(reqinfo)
 
-                return_dict['To'] = request_data['git_author_email']
+                return_dict['To'] = request_data['GIT_AUTHOR_EMAIL']
 
                 # CC mailinglist and the author of superseded SRs
                 return_dict['Cc'] = ml
                 for desp in request_data['descriptions']:
-                    return_dict['Cc'].append(desp['git_author_email'])
-
+                    return_dict['Cc'].append(desp['GIT_AUTHOR_EMAIL'])
                 return_dict['realname'] = request_data['author']
                 if bccs:
                     return_dict['Bcc'] = bccs