Skip to content

Commit 1944bcd

Browse files
committed
Fix typo in header line
1 parent 1204baa commit 1944bcd

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

snic_util.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!usr/bin/env python
1+
#!/usr/bin/env python
22

33
description="A python wrapper for SNIC API utilities. It requires a config file with SNIC credentials."
44

@@ -56,24 +56,24 @@ def __init__(self, config=None, params=None):
5656
if params:
5757
for _key, _val in params.iteritems():
5858
setattr(self, _key, _val)
59-
59+
6060
def create_grus_project(self, proj_data={}):
6161
"""Create a GRUS delivery project with given info and return info of created project in JSON"""
6262
pdata = proj_data or getattr(self, 'proj_data', {})
6363
create_proj_url = "{}/ngi_delivery/project/create/".format(self.api_url)
6464
response = requests.post(create_proj_url, data=json.dumps(pdata), auth=self.api_cred)
6565
self._assert_response(response)
6666
return response.json()
67-
67+
6868
def update_grus_project(self, prj_snic_id=None, updata={}):
6969
"""Update a GRUS delivery project with given info and return info of updated project in JSON"""
7070
psnic = prj_snic_id or getattr(self, 'prj_snic_id', None)
71-
udata = updata or getattr(self, 'updata', {})
71+
udata = updata or getattr(self, 'updata', {})
7272
update_proj_url = "{}/ngi_delivery/project/{}/update/".format(self.api_url, psnic)
7373
response = requests.post(update_proj_url, data=json.dumps(udata), auth=self.api_cred)
7474
self._assert_response(response)
7575
return response.json()
76-
76+
7777
def get_user_info(self, user_email=None):
7878
"""Search for user in SNIC and return list with matching hits. Each hits is in JSON format"""
7979
uemail = user_email or getattr(self, 'user_email')
@@ -83,7 +83,7 @@ def get_user_info(self, user_email=None):
8383
if len(user_hits) == 0:
8484
logger.info("No user found with email {}".format(uemail))
8585
return user_hits
86-
86+
8787
def get_project_info(self, grus_project=None):
8888
"""Search for delivery project in SNIC and return list with matching hits. Each hits is in JSON format"""
8989
gproject = grus_project or getattr(self, 'grus_project')
@@ -93,7 +93,7 @@ def get_project_info(self, grus_project=None):
9393
if len(project_hits) == 0:
9494
logger.info("No projects was found with name {}".format(gproject))
9595
return project_hits
96-
96+
9797
def _search_snic(self, search_url, search_params):
9898
response = requests.get(search_url, params=search_params, auth=self.api_cred)
9999
self._assert_response(response)
@@ -136,7 +136,7 @@ def _create_project(self):
136136
'end_date': endday.strftime(supr_date_format),
137137
'ngi_ready': False,
138138
'ngi_sensitive_data': self.sensitive,
139-
'member_ids': mem_snic_ids}
139+
'member_ids': mem_snic_ids}
140140
question = ("\nA GRUS delivery project will be created with following information, check and confirm\n\n{}\n\n"
141141
"NOTE: Sensivity for project is my default set to 'True', it can be change dby calling '--no-sensitive'. "
142142
"Also parameters '--title / --members / --days' can be used to control the defaults, check help\n\n"
@@ -147,13 +147,13 @@ def _create_project(self):
147147
logger.info("Created GRUS delivery project with id '{}'".format(grus_proj_details["name"]))
148148
else:
149149
logger.warning("Project will not be created. EXITING")
150-
150+
151151
def _extend_project(self):
152152
ukey = "end_date"
153153
endday = datetime.date.today() + datetime.timedelta(days=self.days)
154154
uval = endday.strftime('%Y-%m-%d')
155155
self._execute_project_update(ukey=ukey, uval=uval)
156-
156+
157157
def _change_pi(self):
158158
ukey = "pi_id"
159159
try:
@@ -164,7 +164,7 @@ def _change_pi(self):
164164
raise SystemExit
165165
uval = pi_snic_id
166166
self._execute_project_update(ukey=ukey, uval=uval)
167-
167+
168168
def _change_sensitive(self):
169169
ukey = "ngi_sensitive_data"
170170
uval = self.sensitive
@@ -173,11 +173,11 @@ def _change_sensitive(self):
173173
def _project_info(self):
174174
interested_keys = ["name", "id", "title", "ngi_project_name", "pi", "members", "ngi_sensitive_data", "start_date", "end_date"]
175175
self._execute_search(exec_func=self.get_project_info, filter_keys=interested_keys)
176-
176+
177177
def _user_info(self):
178178
interested_keys = ["first_name", "last_name", "id", "email", "department", "organization"]
179179
self._execute_search(exec_func=self.get_user_info, filter_keys=interested_keys)
180-
180+
181181
def _execute_project_update(self, ukey, uval):
182182
try:
183183
prj_info = self.get_project_info(grus_project=self.grus_project)[0]
@@ -193,14 +193,14 @@ def _execute_project_update(self, ukey, uval):
193193
logger.info("Updated project {}".format(self.grus_project))
194194
else:
195195
logger.warning("Project '{}' will not be updated. EXITING".format(self.grus_project))
196-
196+
197197
def _execute_search(self, exec_func, filter_keys=[], all_info=False):
198198
all_info = all_info or getattr(self, "all_info", False)
199199
search_hits = exec_func()
200200
for ind, inf in enumerate(search_hits, 1):
201201
oinf = inf if all_info else OrderedDict((k, inf.get(k)) for k in filter_keys)
202202
print "Hit {}:\n{}".format(ind, json.dumps(oinf, indent=4))
203-
203+
204204

205205
if __name__ == "__main__":
206206
# parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter, description=description)
@@ -239,7 +239,7 @@ def _execute_search(self, exec_func, filter_keys=[], all_info=False):
239239
subparser_change_sensitive.add_argument("-g", "--grus-project", required=True, type=str, metavar="", help="Grus project id, format should be 'deliveryNNNNN'")
240240
subparser_change_sensitive.add_argument("-s", "--sensitive", required=True, type=to_bool, metavar="",
241241
help="Choose if the project is sensitive or not, (Only 'yes/no' is allowed)")
242-
242+
243243
params = vars(parser.parse_args())
244244
# try loading config file
245245
try:

0 commit comments

Comments
 (0)