Skip to content
This repository has been archived by the owner on May 26, 2018. It is now read-only.

Commit

Permalink
fix install
Browse files Browse the repository at this point in the history
  • Loading branch information
Ikit committed Mar 15, 2017
1 parent b340e62 commit 7a152e4
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 38 deletions.
74 changes: 37 additions & 37 deletions pirus/api_rest/routes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,47 +33,47 @@

# Routes
app.router.add_route('GET', "/", website.home)
app.router.add_route('GET', "/www", website.home)
app.router.add_route('GET', "/config", website.get_config)
app.router.add_route('GET', "/db", website.get_db)
app.router.add_route('GET', "/ws", websocket.get)

app.router.add_route('GET', "/pipeline", pipeHdl.get)
app.router.add_route('DELETE', "/pipeline/{pipe_id}", pipeHdl.delete)
app.router.add_route('GET', "/pipeline/{pipe_id}", pipeHdl.get_details)
app.router.add_route('GET', "/pipeline/{pipe_id}/{filename}", fileHdl.dl_pipe_file)
app.router.add_route('POST', "/pipeline/upload", pipeHdl.tus_upload_init)
app.router.add_route('OPTIONS',"/pipeline/upload", pipeHdl.tus_config)
app.router.add_route('HEAD', "/pipeline/upload/{file_id}", pipeHdl.tus_upload_resume)
app.router.add_route('PATCH', "/pipeline/upload/{file_id}", pipeHdl.tus_upload_chunk)
app.router.add_route('DELETE', "/pipeline/upload/{file_id}", pipeHdl.tus_upload_delete)

app.router.add_route('GET', "/run", runHdl.get)
app.router.add_route('POST', "/run", runHdl.post)
app.router.add_route('GET', "/run/{run_id}", runHdl.get_details)
app.router.add_route('GET', "/run/{run_id}/out", runHdl.get_olog)
app.router.add_route('GET', "/run/{run_id}/err", runHdl.get_elog)
app.router.add_route('GET', "/run/{run_id}/out/tail", runHdl.get_olog_tail)
app.router.add_route('GET', "/run/{run_id}/err/tail", runHdl.get_elog_tail)
app.router.add_route('GET', "/run/{run_id}/io", runHdl.get_io)
app.router.add_route('GET', "/run/{run_id}/pause", runHdl.get_pause)
app.router.add_route('GET', "/run/{run_id}/play", runHdl.get_play)
app.router.add_route('GET', "/run/{run_id}/stop", runHdl.get_stop)
app.router.add_route('GET', "/run/{run_id}/monitoring", runHdl.get_monitoring)
app.router.add_route('GET', "/v1/www", website.home)
app.router.add_route('GET', "/v1/config", website.get_config)
app.router.add_route('GET', "/v1/db", website.get_db)
app.router.add_route('GET', "/v1/ws", websocket.get)

app.router.add_route('GET', "/v1/pipeline", pipeHdl.get)
app.router.add_route('DELETE', "/v1/pipeline/{pipe_id}", pipeHdl.delete)
app.router.add_route('GET', "/v1/pipeline/{pipe_id}", pipeHdl.get_details)
app.router.add_route('GET', "/v1/pipeline/{pipe_id}/{filename}", fileHdl.dl_pipe_file)
app.router.add_route('POST', "/v1/pipeline/upload", pipeHdl.tus_upload_init)
app.router.add_route('OPTIONS',"/v1/pipeline/upload", pipeHdl.tus_config)
app.router.add_route('HEAD', "/v1/pipeline/upload/{file_id}", pipeHdl.tus_upload_resume)
app.router.add_route('PATCH', "/v1/pipeline/upload/{file_id}", pipeHdl.tus_upload_chunk)
app.router.add_route('DELETE', "/v1/pipeline/upload/{file_id}", pipeHdl.tus_upload_delete)

app.router.add_route('GET', "/v1/run", runHdl.get)
app.router.add_route('POST', "/v1/run", runHdl.post)
app.router.add_route('GET', "/v1/run/{run_id}", runHdl.get_details)
app.router.add_route('GET', "/v1/run/{run_id}/out", runHdl.get_olog)
app.router.add_route('GET', "/v1/run/{run_id}/err", runHdl.get_elog)
app.router.add_route('GET', "/v1/run/{run_id}/out/tail", runHdl.get_olog_tail)
app.router.add_route('GET', "/v1/run/{run_id}/err/tail", runHdl.get_elog_tail)
app.router.add_route('GET', "/v1/run/{run_id}/io", runHdl.get_io)
app.router.add_route('GET', "/v1/run/{run_id}/pause", runHdl.get_pause)
app.router.add_route('GET', "/v1/run/{run_id}/play", runHdl.get_play)
app.router.add_route('GET', "/v1/run/{run_id}/stop", runHdl.get_stop)
app.router.add_route('GET', "/v1/run/{run_id}/monitoring", runHdl.get_monitoring)
#app.router.add_route('GET', "/run/{run_id}/{filename}", fileHdl.dl_run_file)

app.router.add_route('GET', "/file", fileHdl.get)
app.router.add_route('DELETE', "/file/{file_id}", fileHdl.delete)
app.router.add_route('PUT', "/file/{file_id}", fileHdl.edit_infos)
app.router.add_route('GET', "/file/{file_id}", fileHdl.get_details)
app.router.add_route('POST', "/file/upload", fileHdl.tus_upload_init)
app.router.add_route('OPTIONS',"/file/upload", fileHdl.tus_config)
app.router.add_route('HEAD', "/file/upload/{file_id}", fileHdl.tus_upload_resume)
app.router.add_route('PATCH', "/file/upload/{file_id}", fileHdl.tus_upload_chunk)
app.router.add_route('DELETE', "/file/upload/{file_id}", fileHdl.tus_upload_delete)
app.router.add_route('GET', "/v1/file", fileHdl.get)
app.router.add_route('DELETE', "/v1/file/{file_id}", fileHdl.delete)
app.router.add_route('PUT', "/v1/file/{file_id}", fileHdl.edit_infos)
app.router.add_route('GET', "/v1/file/{file_id}", fileHdl.get_details)
app.router.add_route('POST', "/v1/file/upload", fileHdl.tus_upload_init)
app.router.add_route('OPTIONS',"/v1/file/upload", fileHdl.tus_config)
app.router.add_route('HEAD', "/v1/file/upload/{file_id}", fileHdl.tus_upload_resume)
app.router.add_route('PATCH', "/v1/file/upload/{file_id}", fileHdl.tus_upload_chunk)
app.router.add_route('DELETE', "/v1/file/upload/{file_id}", fileHdl.tus_upload_delete)

# Websockets / realtime notification
app.router.add_route('POST', "/run/notify/{run_id}", runHdl.update_status)
app.router.add_route('POST', "/v1/run/notify/{run_id}", runHdl.update_status)


# DEV/DEBUG - Routes that should be manages directly by NginX
Expand Down
1 change: 0 additions & 1 deletion pirus/core/core.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ def install(self, pipe_id):
if pipeline == None or pipeline.size != pipeline.upload_offset or pipeline.status != "UPLOADING":
return None

ipdb.set_trace()
lxd_alias = str(uuid.uuid4())
root_path = os.path.join(PIPELINES_DIR, lxd_alias)
old_file = pipeline.pipeline_file
Expand Down

0 comments on commit 7a152e4

Please sign in to comment.