@@ -69,27 +69,29 @@ def finish():
69
69
if isinstance (ex , NotFound ):
70
70
logging .info (ex .msg )
71
71
self .set_status (404 )
72
+ # Format already expected to be JSON when raised
72
73
self .finish (ex .msg )
73
74
elif isinstance (ex , ConflictingState ):
74
75
logging .info (ex .msg )
75
76
self .set_status (409 )
77
+ # Format already expected to be JSON when raised
76
78
self .finish (ex .msg )
77
79
elif isinstance (ex , FailedValidation ):
78
80
logging .info (ex .msg )
79
81
self .set_status (400 )
80
- self .finish (ex .msg )
82
+ self .finish ({ "information" : str ( ex .msg )} )
81
83
elif isinstance (ex , Forbidden ):
82
84
logging .info (ex .msg )
83
85
self .set_status (403 )
84
- self .finish (ex .msg )
86
+ self .finish ({ "information" : str ( ex .msg )} )
85
87
elif isinstance (ex , FailedCreation ):
86
88
logging .info (ex .msg )
87
89
self .set_status (500 )
88
- self .finish (ex .msg )
90
+ self .finish ({ "information" : str ( ex .msg )} )
89
91
elif isinstance (ex , FailedConnection ):
90
92
logging .info (ex .msg )
91
93
self .set_status (503 )
92
- self .finish (ex .msg )
94
+ self .finish ({ "information" : str ( ex .msg )} )
93
95
else :
94
96
self .set_status (500 )
95
97
if "information" in str (ex ):
@@ -137,7 +139,7 @@ class EnvironmentHandler(BaseHandler):
137
139
@asynchronous
138
140
def get (self ):
139
141
def do_call ():
140
- self .send_result (dm .get_environment ())
142
+ self .send_result (dm .get_environment (self . get_argument ( "user.name" , default = '' ) ))
141
143
142
144
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
143
145
@@ -151,7 +153,7 @@ def do_call():
151
153
recency = 1
152
154
if 'recency' in args :
153
155
recency = int (args ['recency' ][0 ])
154
- self .send_result (dm .list_repository (recency ))
156
+ self .send_result (dm .list_repository (recency , self . get_argument ( "user.name" , default = '' ) ))
155
157
156
158
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
157
159
@@ -160,7 +162,7 @@ class PackagesHandler(BaseHandler):
160
162
@asynchronous
161
163
def get (self ):
162
164
def do_call ():
163
- self .send_result (dm .list_packages ())
165
+ self .send_result (dm .list_packages (self . get_argument ( "user.name" , default = '' ) ))
164
166
165
167
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
166
168
@@ -169,22 +171,22 @@ class PackageHandler(BaseHandler):
169
171
@asynchronous
170
172
def get (self , name ):
171
173
def do_call ():
172
- self .send_result (dm .get_package_info (name ))
174
+ self .send_result (dm .get_package_info (name , self . get_argument ( "user.name" , default = '' ) ))
173
175
174
176
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
175
177
176
178
@asynchronous
177
179
def put (self , name ):
178
180
def do_call ():
179
- dm .deploy_package (name )
181
+ dm .deploy_package (name , self . get_argument ( "user.name" ) )
180
182
self .send_accepted ()
181
183
182
184
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
183
185
184
186
@asynchronous
185
187
def delete (self , name ):
186
188
def do_call ():
187
- dm .undeploy_package (name )
189
+ dm .undeploy_package (name , self . get_argument ( "user.name" ) )
188
190
self .send_accepted ()
189
191
190
192
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
@@ -194,7 +196,7 @@ class PackageApplicationsHandler(BaseHandler):
194
196
@asynchronous
195
197
def get (self , name ):
196
198
def do_call ():
197
- self .send_result (dm .list_package_applications (name ))
199
+ self .send_result (dm .list_package_applications (name , self . get_argument ( "user.name" , default = '' ) ))
198
200
199
201
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
200
202
@@ -203,7 +205,7 @@ class PackageStatusHandler(BaseHandler):
203
205
@asynchronous
204
206
def get (self , name ):
205
207
def do_call ():
206
- package_info = dm .get_package_info (name )
208
+ package_info = dm .get_package_info (name , self . get_argument ( "user.name" , default = '' ) )
207
209
self .send_result ({
208
210
"status" : package_info .get ("status" ),
209
211
"information" : package_info .get ("information" , None )
@@ -216,7 +218,7 @@ class ApplicationsHandler(BaseHandler):
216
218
@asynchronous
217
219
def get (self ):
218
220
def do_call ():
219
- self .send_result (dm .list_applications ())
221
+ self .send_result (dm .list_applications (self . get_argument ( "user.name" , default = '' ) ))
220
222
221
223
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
222
224
@@ -241,16 +243,16 @@ def do_call():
241
243
def get (self , name , action ):
242
244
def do_call ():
243
245
if action == 'status' :
244
- app_info = dm .get_application_info (name )
246
+ app_info = dm .get_application_info (name , self . get_argument ( "user.name" , default = '' ) )
245
247
ret = {
246
248
"status" : app_info ["status" ],
247
249
"information" : app_info .get ("information" , None )
248
250
}
249
251
self .send_result (ret )
250
252
elif action == 'detail' :
251
- self .send_result (dm .get_application_detail (name ))
253
+ self .send_result (dm .get_application_detail (name , self . get_argument ( "user.name" , default = '' ) ))
252
254
elif action == 'summary' :
253
- self .send_result (dm .get_application_summary (name ))
255
+ self .send_result (dm .get_application_summary (name , self . get_argument ( "user.name" , default = '' ) ))
254
256
else :
255
257
self .send_client_error ("%s is not a valid query (status|detail|summary)" % action )
256
258
@@ -275,15 +277,15 @@ def put(self, aname):
275
277
user_name = self .get_argument ("user.name" )
276
278
def do_call ():
277
279
request_body .update ({'user' : user_name })
278
- dm .create_application (request_body ['package' ], aname , request_body )
280
+ dm .create_application (request_body ['package' ], aname , request_body , user_name )
279
281
self .send_accepted ()
280
282
281
283
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
282
284
283
285
@asynchronous
284
286
def get (self , name ):
285
287
def do_call ():
286
- self .send_result (dm .get_application_info (name ))
288
+ self .send_result (dm .get_application_info (name , self . get_argument ( "user.name" , default = '' ) ))
287
289
288
290
DISPATCHER .run_as_asynch (task = do_call , on_error = self .handle_error )
289
291
0 commit comments