Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-video-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-video-pipeline
Commits
d28bd1bc
Commit
d28bd1bc
authored
Jul 28, 2017
by
Gregory Martin
Committed by
GitHub
Jul 28, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13 from edx/yro/update_val_ingest_call
Update URL handling
parents
d682334e
1af95727
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
14 deletions
+4
-14
control/veda_file_ingest.py
+1
-11
control/veda_val.py
+3
-3
No files found.
control/veda_file_ingest.py
View file @
d28bd1bc
...
@@ -386,20 +386,10 @@ class VedaIngest:
...
@@ -386,20 +386,10 @@ class VedaIngest:
else
:
else
:
val_status
=
'ingest'
val_status
=
'ingest'
val_duration
=
Output
.
_seconds_from_string
(
duration
=
self
.
video_proto
.
duration
)
if
self
.
video_proto
.
s3_filename
is
not
None
:
val_id
=
self
.
video_proto
.
s3_filename
else
:
val_id
=
self
.
video_proto
.
veda_id
if
self
.
video_proto
.
platform_course_url
is
None
:
self
.
video_proto
.
platform_course_url
=
''
VAC
=
VALAPICall
(
VAC
=
VALAPICall
(
video_proto
=
self
.
video_proto
,
video_proto
=
self
.
video_proto
,
val_status
=
val_status
,
val_status
=
val_status
,
platform_course_url
=
self
.
video_proto
.
platform_course_url
platform_course_url
=
""
# Empty record for initial status update
)
)
VAC
.
call
()
VAC
.
call
()
...
...
control/veda_val.py
View file @
d28bd1bc
...
@@ -81,10 +81,8 @@ class VALAPICall():
...
@@ -81,10 +81,8 @@ class VALAPICall():
if
self
.
val_token
is
None
:
if
self
.
val_token
is
None
:
self
.
val_tokengen
()
self
.
val_tokengen
()
if
self
.
video_object
is
not
None
:
if
self
.
video_object
is
not
None
:
print
'VIDEO OBJECT'
self
.
send_object_data
()
self
.
send_object_data
()
if
self
.
video_proto
is
not
None
:
if
self
.
video_proto
is
not
None
:
print
'VIDEO PROTO'
self
.
send_val_data
()
self
.
send_val_data
()
def
_AUTH
(
self
):
def
_AUTH
(
self
):
...
@@ -106,7 +104,9 @@ class VALAPICall():
...
@@ -106,7 +104,9 @@ class VALAPICall():
@newrelic.agent.background_task
()
@newrelic.agent.background_task
()
def
val_tokengen
(
self
):
def
val_tokengen
(
self
):
"""
Generate a API token for VAL
"""
payload
=
{
payload
=
{
'grant_type'
:
'password'
,
'grant_type'
:
'password'
,
'client_id'
:
self
.
auth_dict
[
'val_client_id'
],
'client_id'
:
self
.
auth_dict
[
'val_client_id'
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment