summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryunlong ying <ying.yunlong@zte.com.cn>2017-02-14 07:24:47 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-02-14 07:24:47 +0000
commit5aa210ad3760b1eadd0cdbe0cc2987462322dbfc (patch)
tree62a004df781be798db5068104a77c943a1fab14f
parentfb961baab613a906011f3a0d705c8fca604a5f60 (diff)
parent01da50ffb906d22ed408962c63fcf04309fe90eb (diff)
Merge "Add file of get operation status"
-rw-r--r--lcm/lcm/jobs/__init__.py13
-rw-r--r--lcm/lcm/jobs/job_get.py13
-rw-r--r--lcm/lcm/jobs/tests.py13
-rw-r--r--lcm/lcm/jobs/urls.py13
-rw-r--r--lcm/lcm/jobs/views.py13
-rw-r--r--lcm/lcm/nf/vnfs/urls.py3
6 files changed, 67 insertions, 1 deletions
diff --git a/lcm/lcm/jobs/__init__.py b/lcm/lcm/jobs/__init__.py
new file mode 100644
index 00000000..650d17ec
--- /dev/null
+++ b/lcm/lcm/jobs/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. \ No newline at end of file
diff --git a/lcm/lcm/jobs/job_get.py b/lcm/lcm/jobs/job_get.py
new file mode 100644
index 00000000..650d17ec
--- /dev/null
+++ b/lcm/lcm/jobs/job_get.py
@@ -0,0 +1,13 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. \ No newline at end of file
diff --git a/lcm/lcm/jobs/tests.py b/lcm/lcm/jobs/tests.py
new file mode 100644
index 00000000..650d17ec
--- /dev/null
+++ b/lcm/lcm/jobs/tests.py
@@ -0,0 +1,13 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. \ No newline at end of file
diff --git a/lcm/lcm/jobs/urls.py b/lcm/lcm/jobs/urls.py
new file mode 100644
index 00000000..650d17ec
--- /dev/null
+++ b/lcm/lcm/jobs/urls.py
@@ -0,0 +1,13 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. \ No newline at end of file
diff --git a/lcm/lcm/jobs/views.py b/lcm/lcm/jobs/views.py
new file mode 100644
index 00000000..650d17ec
--- /dev/null
+++ b/lcm/lcm/jobs/views.py
@@ -0,0 +1,13 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. \ No newline at end of file
diff --git a/lcm/lcm/nf/vnfs/urls.py b/lcm/lcm/nf/vnfs/urls.py
index da06cbb3..8f79d61b 100644
--- a/lcm/lcm/nf/vnfs/urls.py
+++ b/lcm/lcm/nf/vnfs/urls.py
@@ -27,7 +27,8 @@ urlpatterns = patterns('',
url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)/terminate$',
TerminateVnf.as_view()),
url(r'^openoapi/vnflcm/v1/vnf_instances$', QueryMultipleVnf.as_view()),
- url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)$', QuerySingleVnf.as_view()),
+ url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)$',
+ QuerySingleVnf.as_view()),
url(r'^openoapi/vnflcm/v1/vnf_lc_ops/(?P<vnfLcOpId>[0-9a-zA-Z_-]+)&'
r'responseId=(?P<responseId>[0-9a-zA-Z_-]+)$', GetOperationStatus.as_view()),
url(r'^openoapi/vnflcm/v1/swagger.json$', SwaggerJsonView.as_view()),