diff options
author | Yun Huang <yun.huang@windriver.com> | 2018-03-06 14:52:50 +0800 |
---|---|---|
committer | Yun Huang <yun.huang@windriver.com> | 2018-03-06 14:52:50 +0800 |
commit | 824e19a34feac3183b556da0f9381c3287c519c6 (patch) | |
tree | e255635a46e0c0330fd845c6f503791b8d974c15 /ocata/ocata/extensions | |
parent | 6cfec9cb52c1ee3dbf3e4891b3f412b8b6fc442d (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/extensions')
-rw-r--r-- | ocata/ocata/extensions/__init__.py | 10 | ||||
-rw-r--r-- | ocata/ocata/extensions/tests/__init__.py | 14 | ||||
-rw-r--r-- | ocata/ocata/extensions/tests/test_epacaps.py | 2 | ||||
-rw-r--r-- | ocata/ocata/extensions/tests/test_extensions.py | 4 | ||||
-rw-r--r-- | ocata/ocata/extensions/urls.py | 2 | ||||
-rw-r--r-- | ocata/ocata/extensions/views/__init__.py | 10 | ||||
-rw-r--r-- | ocata/ocata/extensions/views/epacaps.py | 1 | ||||
-rw-r--r-- | ocata/ocata/extensions/views/extensions.py | 3 |
8 files changed, 35 insertions, 11 deletions
diff --git a/ocata/ocata/extensions/__init__.py b/ocata/ocata/extensions/__init__.py index 802f3fba..afa702d3 100644 --- a/ocata/ocata/extensions/__init__.py +++ b/ocata/ocata/extensions/__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/extensions/tests/__init__.py b/ocata/ocata/extensions/tests/__init__.py index e69de29b..afa702d3 100644 --- a/ocata/ocata/extensions/tests/__init__.py +++ b/ocata/ocata/extensions/tests/__init__.py @@ -0,0 +1,14 @@ +# 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 +# +# 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/extensions/tests/test_epacaps.py b/ocata/ocata/extensions/tests/test_epacaps.py index 34a4e8e1..8120ba28 100644 --- a/ocata/ocata/extensions/tests/test_epacaps.py +++ b/ocata/ocata/extensions/tests/test_epacaps.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Intel Corporation. +# 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/extensions/tests/test_extensions.py b/ocata/ocata/extensions/tests/test_extensions.py index 16bcf47a..762f0015 100644 --- a/ocata/ocata/extensions/tests/test_extensions.py +++ b/ocata/ocata/extensions/tests/test_extensions.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Intel Corporation. +# 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. @@ -42,4 +42,4 @@ class TestExtensions(unittest.TestCase): self.assertEquals("EPACapsQuery", json_content["extensions"][0]["name"]) self.assertEquals("http://127.0.0.1:80/api/multicloud-ocata/v0/%s/extensions/epa-caps" % vimid, json_content["extensions"][0]["url"]) - self.assertEquals("", json_content["extensions"][0]["spec"])
\ No newline at end of file + self.assertEquals("", json_content["extensions"][0]["spec"]) diff --git a/ocata/ocata/extensions/urls.py b/ocata/ocata/extensions/urls.py index 9aaf1331..0e364e02 100644 --- a/ocata/ocata/extensions/urls.py +++ b/ocata/ocata/extensions/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/extensions/views/__init__.py b/ocata/ocata/extensions/views/__init__.py index 802f3fba..afa702d3 100644 --- a/ocata/ocata/extensions/views/__init__.py +++ b/ocata/ocata/extensions/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/extensions/views/epacaps.py b/ocata/ocata/extensions/views/epacaps.py index 2c69ed9b..77542b31 100644 --- a/ocata/ocata/extensions/views/epacaps.py +++ b/ocata/ocata/extensions/views/epacaps.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 import json import traceback diff --git a/ocata/ocata/extensions/views/extensions.py b/ocata/ocata/extensions/views/extensions.py index f778d9f3..61428a5b 100644 --- a/ocata/ocata/extensions/views/extensions.py +++ b/ocata/ocata/extensions/views/extensions.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 |