summaryrefslogtreecommitdiffstats
path: root/ocata/ocata/proxy
diff options
context:
space:
mode:
authorYun Huang <yun.huang@windriver.com>2018-03-06 14:52:50 +0800
committerYun Huang <yun.huang@windriver.com>2018-03-06 14:52:50 +0800
commit824e19a34feac3183b556da0f9381c3287c519c6 (patch)
treee255635a46e0c0330fd845c6f503791b8d974c15 /ocata/ocata/proxy
parent6cfec9cb52c1ee3dbf3e4891b3f412b8b6fc442d (diff)
Update Ocata license header
Change-Id: I45b6a8b1cbc6571a1c09d375b31e42df70b94cfa Issue-ID: MULTICLOUD-140 Signed-off-by: Yun Huang <yun.huang@windriver.com>
Diffstat (limited to 'ocata/ocata/proxy')
-rw-r--r--ocata/ocata/proxy/__init__.py10
-rw-r--r--ocata/ocata/proxy/tests/__init__.py3
-rw-r--r--ocata/ocata/proxy/tests/test_identity_proxy.py3
-rw-r--r--ocata/ocata/proxy/tests/test_service_proxy.py2
-rw-r--r--ocata/ocata/proxy/urls.py2
-rw-r--r--ocata/ocata/proxy/views/__init__.py10
-rw-r--r--ocata/ocata/proxy/views/identityV3.py3
-rw-r--r--ocata/ocata/proxy/views/services.py1
8 files changed, 23 insertions, 11 deletions
diff --git a/ocata/ocata/proxy/__init__.py b/ocata/ocata/proxy/__init__.py
index 802f3fba..afa702d3 100644
--- a/ocata/ocata/proxy/__init__.py
+++ b/ocata/ocata/proxy/__init__.py
@@ -1,10 +1,14 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# 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
+# 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.
+
diff --git a/ocata/ocata/proxy/tests/__init__.py b/ocata/ocata/proxy/tests/__init__.py
index 48b6e44b..afa702d3 100644
--- a/ocata/ocata/proxy/tests/__init__.py
+++ b/ocata/ocata/proxy/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,3 +11,4 @@
# 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.
+
diff --git a/ocata/ocata/proxy/tests/test_identity_proxy.py b/ocata/ocata/proxy/tests/test_identity_proxy.py
index d5fb22ec..774b0ffb 100644
--- a/ocata/ocata/proxy/tests/test_identity_proxy.py
+++ b/ocata/ocata/proxy/tests/test_identity_proxy.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
# 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.
+
import json
import mock
diff --git a/ocata/ocata/proxy/tests/test_service_proxy.py b/ocata/ocata/proxy/tests/test_service_proxy.py
index aa461d37..3b784be3 100644
--- a/ocata/ocata/proxy/tests/test_service_proxy.py
+++ b/ocata/ocata/proxy/tests/test_service_proxy.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/ocata/ocata/proxy/urls.py b/ocata/ocata/proxy/urls.py
index 9a1b3cf4..34e8e50e 100644
--- a/ocata/ocata/proxy/urls.py
+++ b/ocata/ocata/proxy/urls.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/ocata/ocata/proxy/views/__init__.py b/ocata/ocata/proxy/views/__init__.py
index 802f3fba..afa702d3 100644
--- a/ocata/ocata/proxy/views/__init__.py
+++ b/ocata/ocata/proxy/views/__init__.py
@@ -1,10 +1,14 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# 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
+# 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.
+
diff --git a/ocata/ocata/proxy/views/identityV3.py b/ocata/ocata/proxy/views/identityV3.py
index 5f11d847..dd280314 100644
--- a/ocata/ocata/proxy/views/identityV3.py
+++ b/ocata/ocata/proxy/views/identityV3.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
# 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.
+
import logging
from django.conf import settings
diff --git a/ocata/ocata/proxy/views/services.py b/ocata/ocata/proxy/views/services.py
index 7863393d..4bfecdbc 100644
--- a/ocata/ocata/proxy/views/services.py
+++ b/ocata/ocata/proxy/views/services.py
@@ -11,6 +11,7 @@
# 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.
+
import logging
from rest_framework import status