summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Page <james.page@ubuntu.com>2016-06-22 15:52:24 +0100
committerJames Page <james.page@ubuntu.com>2016-06-28 12:10:59 +0100
commitaa57d5f48e8c659df17bf625cd0f4d45a7133e03 (patch)
treebceac6842d0c131a05e8e8a0d9b219b478dc6db9
parent41e9baacd9784474a3689b6765583d6182b88928 (diff)
Re-license charm as Apache-2.0
All contributions to this charm where made under Canonical copyright; switch to Apache-2.0 license as agreed so we can move forward with official project status. Change-Id: I57efcf92ebd630190d351e8203c409d9c3136211
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+1: Erlon R. Cruz <sombrafam@gmail.com> Code-Review+2: Liam Young <liam.young@canonical.com> Workflow+1: Liam Young <liam.young@canonical.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 01 Jul 2016 11:09:44 +0000 Reviewed-on: https://review.openstack.org/332855 Project: openstack/charm-cinder-backup Branch: refs/heads/master
-rw-r--r--LICENSE202
-rw-r--r--copyright29
-rw-r--r--hooks/__init__.py13
-rw-r--r--hooks/cinder_backup_contexts.py14
-rwxr-xr-xhooks/cinder_backup_hooks.py15
-rw-r--r--hooks/cinder_backup_utils.py14
-rwxr-xr-xtests/00-setup14
-rwxr-xr-xtests/014-basic-precise-icehouse14
-rwxr-xr-xtests/015-basic-trusty-icehouse14
-rwxr-xr-xtests/016-basic-trusty-juno14
-rwxr-xr-xtests/017-basic-trusty-kilo14
-rwxr-xr-xtests/018-basic-vivid-kilo14
-rwxr-xr-xtests/019-basic-wily-liberty14
-rwxr-xr-xtests/021-basic-xenial-mitaka14
-rw-r--r--tests/basic_deployment.py15
-rw-r--r--unit_tests/__init__.py14
-rw-r--r--unit_tests/test_cinder_backup_contexts.py14
-rw-r--r--unit_tests/test_cinder_backup_hooks.py14
-rw-r--r--unit_tests/test_utils.py14
19 files changed, 455 insertions, 15 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
1
2 Apache License
3 Version 2.0, January 2004
4 http://www.apache.org/licenses/
5
6 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
8 1. Definitions.
9
10 "License" shall mean the terms and conditions for use, reproduction,
11 and distribution as defined by Sections 1 through 9 of this document.
12
13 "Licensor" shall mean the copyright owner or entity authorized by
14 the copyright owner that is granting the License.
15
16 "Legal Entity" shall mean the union of the acting entity and all
17 other entities that control, are controlled by, or are under common
18 control with that entity. For the purposes of this definition,
19 "control" means (i) the power, direct or indirect, to cause the
20 direction or management of such entity, whether by contract or
21 otherwise, or (ii) ownership of fifty percent (50%) or more of the
22 outstanding shares, or (iii) beneficial ownership of such entity.
23
24 "You" (or "Your") shall mean an individual or Legal Entity
25 exercising permissions granted by this License.
26
27 "Source" form shall mean the preferred form for making modifications,
28 including but not limited to software source code, documentation
29 source, and configuration files.
30
31 "Object" form shall mean any form resulting from mechanical
32 transformation or translation of a Source form, including but
33 not limited to compiled object code, generated documentation,
34 and conversions to other media types.
35
36 "Work" shall mean the work of authorship, whether in Source or
37 Object form, made available under the License, as indicated by a
38 copyright notice that is included in or attached to the work
39 (an example is provided in the Appendix below).
40
41 "Derivative Works" shall mean any work, whether in Source or Object
42 form, that is based on (or derived from) the Work and for which the
43 editorial revisions, annotations, elaborations, or other modifications
44 represent, as a whole, an original work of authorship. For the purposes
45 of this License, Derivative Works shall not include works that remain
46 separable from, or merely link (or bind by name) to the interfaces of,
47 the Work and Derivative Works thereof.
48
49 "Contribution" shall mean any work of authorship, including
50 the original version of the Work and any modifications or additions
51 to that Work or Derivative Works thereof, that is intentionally
52 submitted to Licensor for inclusion in the Work by the copyright owner
53 or by an individual or Legal Entity authorized to submit on behalf of
54 the copyright owner. For the purposes of this definition, "submitted"
55 means any form of electronic, verbal, or written communication sent
56 to the Licensor or its representatives, including but not limited to
57 communication on electronic mailing lists, source code control systems,
58 and issue tracking systems that are managed by, or on behalf of, the
59 Licensor for the purpose of discussing and improving the Work, but
60 excluding communication that is conspicuously marked or otherwise
61 designated in writing by the copyright owner as "Not a Contribution."
62
63 "Contributor" shall mean Licensor and any individual or Legal Entity
64 on behalf of whom a Contribution has been received by Licensor and
65 subsequently incorporated within the Work.
66
67 2. Grant of Copyright License. Subject to the terms and conditions of
68 this License, each Contributor hereby grants to You a perpetual,
69 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70 copyright license to reproduce, prepare Derivative Works of,
71 publicly display, publicly perform, sublicense, and distribute the
72 Work and such Derivative Works in Source or Object form.
73
74 3. Grant of Patent License. Subject to the terms and conditions of
75 this License, each Contributor hereby grants to You a perpetual,
76 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77 (except as stated in this section) patent license to make, have made,
78 use, offer to sell, sell, import, and otherwise transfer the Work,
79 where such license applies only to those patent claims licensable
80 by such Contributor that are necessarily infringed by their
81 Contribution(s) alone or by combination of their Contribution(s)
82 with the Work to which such Contribution(s) was submitted. If You
83 institute patent litigation against any entity (including a
84 cross-claim or counterclaim in a lawsuit) alleging that the Work
85 or a Contribution incorporated within the Work constitutes direct
86 or contributory patent infringement, then any patent licenses
87 granted to You under this License for that Work shall terminate
88 as of the date such litigation is filed.
89
90 4. Redistribution. You may reproduce and distribute copies of the
91 Work or Derivative Works thereof in any medium, with or without
92 modifications, and in Source or Object form, provided that You
93 meet the following conditions:
94
95 (a) You must give any other recipients of the Work or
96 Derivative Works a copy of this License; and
97
98 (b) You must cause any modified files to carry prominent notices
99 stating that You changed the files; and
100
101 (c) You must retain, in the Source form of any Derivative Works
102 that You distribute, all copyright, patent, trademark, and
103 attribution notices from the Source form of the Work,
104 excluding those notices that do not pertain to any part of
105 the Derivative Works; and
106
107 (d) If the Work includes a "NOTICE" text file as part of its
108 distribution, then any Derivative Works that You distribute must
109 include a readable copy of the attribution notices contained
110 within such NOTICE file, excluding those notices that do not
111 pertain to any part of the Derivative Works, in at least one
112 of the following places: within a NOTICE text file distributed
113 as part of the Derivative Works; within the Source form or
114 documentation, if provided along with the Derivative Works; or,
115 within a display generated by the Derivative Works, if and
116 wherever such third-party notices normally appear. The contents
117 of the NOTICE file are for informational purposes only and
118 do not modify the License. You may add Your own attribution
119 notices within Derivative Works that You distribute, alongside
120 or as an addendum to the NOTICE text from the Work, provided
121 that such additional attribution notices cannot be construed
122 as modifying the License.
123
124 You may add Your own copyright statement to Your modifications and
125 may provide additional or different license terms and conditions
126 for use, reproduction, or distribution of Your modifications, or
127 for any such Derivative Works as a whole, provided Your use,
128 reproduction, and distribution of the Work otherwise complies with
129 the conditions stated in this License.
130
131 5. Submission of Contributions. Unless You explicitly state otherwise,
132 any Contribution intentionally submitted for inclusion in the Work
133 by You to the Licensor shall be under the terms and conditions of
134 this License, without any additional terms or conditions.
135 Notwithstanding the above, nothing herein shall supersede or modify
136 the terms of any separate license agreement you may have executed
137 with Licensor regarding such Contributions.
138
139 6. Trademarks. This License does not grant permission to use the trade
140 names, trademarks, service marks, or product names of the Licensor,
141 except as required for reasonable and customary use in describing the
142 origin of the Work and reproducing the content of the NOTICE file.
143
144 7. Disclaimer of Warranty. Unless required by applicable law or
145 agreed to in writing, Licensor provides the Work (and each
146 Contributor provides its Contributions) on an "AS IS" BASIS,
147 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148 implied, including, without limitation, any warranties or conditions
149 of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150 PARTICULAR PURPOSE. You are solely responsible for determining the
151 appropriateness of using or redistributing the Work and assume any
152 risks associated with Your exercise of permissions under this License.
153
154 8. Limitation of Liability. In no event and under no legal theory,
155 whether in tort (including negligence), contract, or otherwise,
156 unless required by applicable law (such as deliberate and grossly
157 negligent acts) or agreed to in writing, shall any Contributor be
158 liable to You for damages, including any direct, indirect, special,
159 incidental, or consequential damages of any character arising as a
160 result of this License or out of the use or inability to use the
161 Work (including but not limited to damages for loss of goodwill,
162 work stoppage, computer failure or malfunction, or any and all
163 other commercial damages or losses), even if such Contributor
164 has been advised of the possibility of such damages.
165
166 9. Accepting Warranty or Additional Liability. While redistributing
167 the Work or Derivative Works thereof, You may choose to offer,
168 and charge a fee for, acceptance of support, warranty, indemnity,
169 or other liability obligations and/or rights consistent with this
170 License. However, in accepting such obligations, You may act only
171 on Your own behalf and on Your sole responsibility, not on behalf
172 of any other Contributor, and only if You agree to indemnify,
173 defend, and hold each Contributor harmless for any liability
174 incurred by, or claims asserted against, such Contributor by reason
175 of your accepting any such warranty or additional liability.
176
177 END OF TERMS AND CONDITIONS
178
179 APPENDIX: How to apply the Apache License to your work.
180
181 To apply the Apache License to your work, attach the following
182 boilerplate notice, with the fields enclosed by brackets "[]"
183 replaced with your own identifying information. (Don't include
184 the brackets!) The text should be enclosed in the appropriate
185 comment syntax for the file format. We also recommend that a
186 file or class name and description of purpose be included on the
187 same "printed page" as the copyright notice for easier
188 identification within third-party archives.
189
190 Copyright [yyyy] [name of copyright owner]
191
192 Licensed under the Apache License, Version 2.0 (the "License");
193 you may not use this file except in compliance with the License.
194 You may obtain a copy of the License at
195
196 http://www.apache.org/licenses/LICENSE-2.0
197
198 Unless required by applicable law or agreed to in writing, software
199 distributed under the License is distributed on an "AS IS" BASIS,
200 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201 See the License for the specific language governing permissions and
202 limitations under the License.
diff --git a/copyright b/copyright
index 567db82..6b49449 100644
--- a/copyright
+++ b/copyright
@@ -1,17 +1,16 @@
1Format: http://dep.debian.net/deps/dep5/ 1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
2 2
3Files: * 3Files: *
4Copyright: Copyright 2015, Canonical Ltd., All Rights Reserved. 4Copyright: Copyright 2011-2016, Canonical Ltd., All Rights Reserved.
5License: GPL-3 5License: Apache-2.0
6 This program is free software: you can redistribute it and/or modify 6 Licensed under the Apache License, Version 2.0 (the "License"); you may
7 it under the terms of the GNU General Public License as published by 7 not use this file except in compliance with the License. You may obtain
8 the Free Software Foundation, either version 3 of the License, or 8 a copy of the License at
9 (at your option) any later version. 9
10 . 10 http://www.apache.org/licenses/LICENSE-2.0
11 This program is distributed in the hope that it will be useful, 11
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 12 Unless required by applicable law or agreed to in writing, software
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
14 GNU General Public License for more details. 14 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
15 . 15 License for the specific language governing permissions and limitations
16 You should have received a copy of the GNU General Public License 16 under the License.
17 along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/hooks/__init__.py b/hooks/__init__.py
index e69de29..9b088de 100644
--- a/hooks/__init__.py
+++ b/hooks/__init__.py
@@ -0,0 +1,13 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
diff --git a/hooks/cinder_backup_contexts.py b/hooks/cinder_backup_contexts.py
index 102da0c..3fc5574 100644
--- a/hooks/cinder_backup_contexts.py
+++ b/hooks/cinder_backup_contexts.py
@@ -1,3 +1,17 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
1from charmhelpers.core.hookenv import ( 15from charmhelpers.core.hookenv import (
2 service_name, 16 service_name,
3 is_relation_made, 17 is_relation_made,
diff --git a/hooks/cinder_backup_hooks.py b/hooks/cinder_backup_hooks.py
index 6dc11e2..0185246 100755
--- a/hooks/cinder_backup_hooks.py
+++ b/hooks/cinder_backup_hooks.py
@@ -1,4 +1,19 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
16
2import os 17import os
3import sys 18import sys
4import json 19import json
diff --git a/hooks/cinder_backup_utils.py b/hooks/cinder_backup_utils.py
index d538297..db3cab6 100644
--- a/hooks/cinder_backup_utils.py
+++ b/hooks/cinder_backup_utils.py
@@ -1,3 +1,17 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
1import os 15import os
2from collections import OrderedDict 16from collections import OrderedDict
3 17
diff --git a/tests/00-setup b/tests/00-setup
index 94e5611..14711e9 100755
--- a/tests/00-setup
+++ b/tests/00-setup
@@ -1,4 +1,18 @@
1#!/bin/bash 1#!/bin/bash
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3set -ex 17set -ex
4 18
diff --git a/tests/014-basic-precise-icehouse b/tests/014-basic-precise-icehouse
index cdf3eb9..7e624ae 100755
--- a/tests/014-basic-precise-icehouse
+++ b/tests/014-basic-precise-icehouse
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on precise-icehouse.""" 17"""Amulet tests on a basic cinder-backup deployment on precise-icehouse."""
4 18
diff --git a/tests/015-basic-trusty-icehouse b/tests/015-basic-trusty-icehouse
index d10900a..5009514 100755
--- a/tests/015-basic-trusty-icehouse
+++ b/tests/015-basic-trusty-icehouse
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on trusty-icehouse.""" 17"""Amulet tests on a basic cinder-backup deployment on trusty-icehouse."""
4 18
diff --git a/tests/016-basic-trusty-juno b/tests/016-basic-trusty-juno
index ffd5986..ae39b77 100755
--- a/tests/016-basic-trusty-juno
+++ b/tests/016-basic-trusty-juno
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on trusty-juno.""" 17"""Amulet tests on a basic cinder-backup deployment on trusty-juno."""
4 18
diff --git a/tests/017-basic-trusty-kilo b/tests/017-basic-trusty-kilo
index d614911..3752f3c 100755
--- a/tests/017-basic-trusty-kilo
+++ b/tests/017-basic-trusty-kilo
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on trusty-kilo.""" 17"""Amulet tests on a basic cinder-backup deployment on trusty-kilo."""
4 18
diff --git a/tests/018-basic-vivid-kilo b/tests/018-basic-vivid-kilo
index f3f4188..9efad00 100755
--- a/tests/018-basic-vivid-kilo
+++ b/tests/018-basic-vivid-kilo
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on vivid-kilo.""" 17"""Amulet tests on a basic cinder-backup deployment on vivid-kilo."""
4 18
diff --git a/tests/019-basic-wily-liberty b/tests/019-basic-wily-liberty
index c35d145..966396e 100755
--- a/tests/019-basic-wily-liberty
+++ b/tests/019-basic-wily-liberty
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on wily-liberty.""" 17"""Amulet tests on a basic cinder-backup deployment on wily-liberty."""
4 18
diff --git a/tests/021-basic-xenial-mitaka b/tests/021-basic-xenial-mitaka
index cf1f4d5..ccd6fce 100755
--- a/tests/021-basic-xenial-mitaka
+++ b/tests/021-basic-xenial-mitaka
@@ -1,4 +1,18 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
2 16
3"""Amulet tests on a basic cinder-backup deployment on xenial-mitaka.""" 17"""Amulet tests on a basic cinder-backup deployment on xenial-mitaka."""
4 18
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index eb0a0db..7b66066 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -1,4 +1,19 @@
1#!/usr/bin/python 1#!/usr/bin/python
2#
3# Copyright 2016 Canonical Ltd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
16
2""" Basic cinder-backup functional test. """ 17""" Basic cinder-backup functional test. """
3import amulet 18import amulet
4import json 19import json
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index f80aab3..b7fe4e1 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -1,2 +1,16 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
1import sys 15import sys
2sys.path.append('hooks') 16sys.path.append('hooks')
diff --git a/unit_tests/test_cinder_backup_contexts.py b/unit_tests/test_cinder_backup_contexts.py
index 98b188d..b7386f9 100644
--- a/unit_tests/test_cinder_backup_contexts.py
+++ b/unit_tests/test_cinder_backup_contexts.py
@@ -1,3 +1,17 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
1import cinder_backup_contexts as contexts 15import cinder_backup_contexts as contexts
2 16
3from test_utils import ( 17from test_utils import (
diff --git a/unit_tests/test_cinder_backup_hooks.py b/unit_tests/test_cinder_backup_hooks.py
index a22932f..4f85b13 100644
--- a/unit_tests/test_cinder_backup_hooks.py
+++ b/unit_tests/test_cinder_backup_hooks.py
@@ -1,3 +1,17 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
1from mock import patch 15from mock import patch
2 16
3with patch('cinder_backup_utils.register_configs'): 17with patch('cinder_backup_utils.register_configs'):
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 30ee5e5..896bbf3 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -1,3 +1,17 @@
1# Copyright 2016 Canonical Ltd
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
1import logging 15import logging
2import unittest 16import unittest
3import os 17import os