summaryrefslogtreecommitdiffstats
path: root/windriver/titanium_cloud/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'windriver/titanium_cloud/extensions')
-rw-r--r--windriver/titanium_cloud/extensions/__init__.py10
-rw-r--r--windriver/titanium_cloud/extensions/tests/__init__.py14
-rw-r--r--windriver/titanium_cloud/extensions/tests/test_epacaps.py4
-rw-r--r--windriver/titanium_cloud/extensions/tests/test_extensions.py4
-rw-r--r--windriver/titanium_cloud/extensions/urls.py2
-rw-r--r--windriver/titanium_cloud/extensions/views/__init__.py10
-rw-r--r--windriver/titanium_cloud/extensions/views/epacaps.py3
-rw-r--r--windriver/titanium_cloud/extensions/views/extensions.py3
-rw-r--r--windriver/titanium_cloud/extensions/views/fcaps.py5
9 files changed, 40 insertions, 15 deletions
diff --git a/windriver/titanium_cloud/extensions/__init__.py b/windriver/titanium_cloud/extensions/__init__.py
index 802f3fba..afa702d3 100644
--- a/windriver/titanium_cloud/extensions/__init__.py
+++ b/windriver/titanium_cloud/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/windriver/titanium_cloud/extensions/tests/__init__.py b/windriver/titanium_cloud/extensions/tests/__init__.py
index e69de29b..afa702d3 100644
--- a/windriver/titanium_cloud/extensions/tests/__init__.py
+++ b/windriver/titanium_cloud/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/windriver/titanium_cloud/extensions/tests/test_epacaps.py b/windriver/titanium_cloud/extensions/tests/test_epacaps.py
index 544b8ef7..89fe1b42 100644
--- a/windriver/titanium_cloud/extensions/tests/test_epacaps.py
+++ b/windriver/titanium_cloud/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.
@@ -64,4 +64,4 @@ class TestEpaCaps(unittest.TestCase):
self.assertEquals(cloud_region_id, json_content["cloud-region-id"])
self.assertEquals(vimid, json_content["vimid"])
self.assertEquals(json.loads(MOCK_VIM_INFO['cloud_epa_caps']),
- json_content["cloud-epa-caps"]) \ No newline at end of file
+ json_content["cloud-epa-caps"])
diff --git a/windriver/titanium_cloud/extensions/tests/test_extensions.py b/windriver/titanium_cloud/extensions/tests/test_extensions.py
index 93d990bb..f0dae164 100644
--- a/windriver/titanium_cloud/extensions/tests/test_extensions.py
+++ b/windriver/titanium_cloud/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-titanium_cloud/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/windriver/titanium_cloud/extensions/urls.py b/windriver/titanium_cloud/extensions/urls.py
index b0ffec89..afaad828 100644
--- a/windriver/titanium_cloud/extensions/urls.py
+++ b/windriver/titanium_cloud/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/windriver/titanium_cloud/extensions/views/__init__.py b/windriver/titanium_cloud/extensions/views/__init__.py
index 802f3fba..afa702d3 100644
--- a/windriver/titanium_cloud/extensions/views/__init__.py
+++ b/windriver/titanium_cloud/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/windriver/titanium_cloud/extensions/views/epacaps.py b/windriver/titanium_cloud/extensions/views/epacaps.py
index 7f638fad..69b24c9f 100644
--- a/windriver/titanium_cloud/extensions/views/epacaps.py
+++ b/windriver/titanium_cloud/extensions/views/epacaps.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
import json
import traceback
diff --git a/windriver/titanium_cloud/extensions/views/extensions.py b/windriver/titanium_cloud/extensions/views/extensions.py
index 3b231c02..d6988830 100644
--- a/windriver/titanium_cloud/extensions/views/extensions.py
+++ b/windriver/titanium_cloud/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
import traceback
diff --git a/windriver/titanium_cloud/extensions/views/fcaps.py b/windriver/titanium_cloud/extensions/views/fcaps.py
index ad054e95..894db367 100644
--- a/windriver/titanium_cloud/extensions/views/fcaps.py
+++ b/windriver/titanium_cloud/extensions/views/fcaps.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
import json
import traceback
@@ -317,4 +318,4 @@ class GuestMonitor(APIView):
except Exception as e:
self._logger.error(traceback.format_exc())
return Response(data={'error': str(e)},
- status=status.HTTP_500_INTERNAL_SERVER_ERROR) \ No newline at end of file
+ status=status.HTTP_500_INTERNAL_SERVER_ERROR)