diff options
Diffstat (limited to 'legacy/api/router')
| -rw-r--r-- | legacy/api/router/mapper.py | 10 | ||||
| -rw-r--r-- | legacy/api/router/mapper.py.orig | 19 |
2 files changed, 28 insertions, 1 deletions
diff --git a/legacy/api/router/mapper.py b/legacy/api/router/mapper.py index 8839f3f5..470d18e2 100644 --- a/legacy/api/router/mapper.py +++ b/legacy/api/router/mapper.py @@ -1,4 +1,12 @@ -from legacy.api.handler import Job, JobList +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +from legacy.api.handler.job_handler import Job, JobList mappers = [ diff --git a/legacy/api/router/mapper.py.orig b/legacy/api/router/mapper.py.orig new file mode 100644 index 00000000..1acb40b5 --- /dev/null +++ b/legacy/api/router/mapper.py.orig @@ -0,0 +1,19 @@ +<<<<<<< HEAD +from legacy.api.handler.job_handler import Job, JobList +======= +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +from legacy.api.handler import Job, JobList +>>>>>>> 615b529... Add licence header according to OPNFV contribution guidelines[1] by script[2] + + +mappers = [ + (JobList, '/api/v1.0/jobs'), + (Job, '/api/v1.0/jobs/<string:id>'), +] |