From 0a4912f9fb07a7330a2527af4cc7c8949c685401 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Thu, 24 Jan 2013 12:00:30 -0600 Subject: [PATCH] Standardize on a copyright header and ensure all files have them. Change-Id: I64812bca01ca655c9cf9239a0daea84907082a29 --- openstackclient/__init__.py | 14 ++++++++++++++ openstackclient/common/__init__.py | 14 ++++++++++++++ openstackclient/common/clientmanager.py | 22 ++++++++++------------ openstackclient/common/command.py | 22 ++++++++++------------ openstackclient/common/exceptions.py | 22 ++++++++++------------ openstackclient/common/openstackkeyring.py | 22 ++++++++++------------ openstackclient/common/utils.py | 22 ++++++++++------------ openstackclient/compute/__init__.py | 14 ++++++++++++++ openstackclient/compute/client.py | 22 ++++++++++------------ openstackclient/compute/v2/__init__.py | 14 ++++++++++++++ openstackclient/compute/v2/server.py | 22 ++++++++++------------ openstackclient/identity/__init__.py | 14 ++++++++++++++ openstackclient/identity/client.py | 22 ++++++++++------------ openstackclient/identity/v2_0/__init__.py | 14 ++++++++++++++ openstackclient/identity/v2_0/endpoint.py | 22 ++++++++++------------ openstackclient/identity/v2_0/role.py | 22 ++++++++++------------ openstackclient/identity/v2_0/service.py | 22 ++++++++++------------ openstackclient/identity/v2_0/tenant.py | 22 ++++++++++------------ openstackclient/identity/v2_0/user.py | 22 ++++++++++------------ openstackclient/image/__init__.py | 14 ++++++++++++++ openstackclient/image/client.py | 2 +- openstackclient/image/v2/__init__.py | 14 ++++++++++++++ openstackclient/image/v2/image.py | 2 +- openstackclient/shell.py | 22 ++++++++++------------ setup.py | 22 ++++++++++------------ tests/__init__.py | 14 ++++++++++++++ tests/test_clientmanager_clientcache.py | 14 ++++++++++++++ tests/test_shell.py | 22 ++++++++++------------ tests/utils.py | 15 +++++++++++++++ 29 files changed, 317 insertions(+), 194 deletions(-) diff --git a/openstackclient/__init__.py b/openstackclient/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/__init__.py +++ b/openstackclient/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/common/__init__.py b/openstackclient/common/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/common/__init__.py +++ b/openstackclient/common/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 4d0492130..f6f6642e6 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """Manage access to the clients, including authenticating when needed. """ diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py index 405f65556..cfcb605c3 100644 --- a/openstackclient/common/command.py +++ b/openstackclient/common/command.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ OpenStack base command diff --git a/openstackclient/common/exceptions.py b/openstackclient/common/exceptions.py index 465c3c484..9dfb4bc78 100644 --- a/openstackclient/common/exceptions.py +++ b/openstackclient/common/exceptions.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Exception definitions. diff --git a/openstackclient/common/openstackkeyring.py b/openstackclient/common/openstackkeyring.py index 2b03e7534..78c74b8f4 100644 --- a/openstackclient/common/openstackkeyring.py +++ b/openstackclient/common/openstackkeyring.py @@ -1,19 +1,17 @@ -# Copyright 2011 OpenStack LLC. -# All Rights Reserved +# Copyright 2011-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Keyring backend for Openstack, to store encrypted password in a file. diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py index c099889d2..19cca3f5f 100644 --- a/openstackclient/common/utils.py +++ b/openstackclient/common/utils.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Common client utilities diff --git a/openstackclient/compute/__init__.py b/openstackclient/compute/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/compute/__init__.py +++ b/openstackclient/compute/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/compute/client.py b/openstackclient/compute/client.py index bef9f949d..e1db22c81 100644 --- a/openstackclient/compute/client.py +++ b/openstackclient/compute/client.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 import logging diff --git a/openstackclient/compute/v2/__init__.py b/openstackclient/compute/v2/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/compute/v2/__init__.py +++ b/openstackclient/compute/v2/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 366d7640e..a334e1983 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Server action implementations diff --git a/openstackclient/identity/__init__.py b/openstackclient/identity/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/identity/__init__.py +++ b/openstackclient/identity/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/identity/client.py b/openstackclient/identity/client.py index 3d58ad7ba..65bd14ce2 100644 --- a/openstackclient/identity/client.py +++ b/openstackclient/identity/client.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 import logging diff --git a/openstackclient/identity/v2_0/__init__.py b/openstackclient/identity/v2_0/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/identity/v2_0/__init__.py +++ b/openstackclient/identity/v2_0/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py index cb06b6abb..f9c689ec8 100644 --- a/openstackclient/identity/v2_0/endpoint.py +++ b/openstackclient/identity/v2_0/endpoint.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Endpoint action implementations diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py index 99143109f..49e036535 100644 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Role action implementations diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py index da4af2eb2..89fe605ab 100644 --- a/openstackclient/identity/v2_0/service.py +++ b/openstackclient/identity/v2_0/service.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Service action implementations diff --git a/openstackclient/identity/v2_0/tenant.py b/openstackclient/identity/v2_0/tenant.py index 21516f50b..f24bc7265 100644 --- a/openstackclient/identity/v2_0/tenant.py +++ b/openstackclient/identity/v2_0/tenant.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Tenant action implementations diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py index fc7a9d73e..cf69d73f5 100644 --- a/openstackclient/identity/v2_0/user.py +++ b/openstackclient/identity/v2_0/user.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ User action implementations diff --git a/openstackclient/image/__init__.py b/openstackclient/image/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/image/__init__.py +++ b/openstackclient/image/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/image/client.py b/openstackclient/image/client.py index 0a7c576e7..5285e6d7d 100644 --- a/openstackclient/image/client.py +++ b/openstackclient/image/client.py @@ -1,4 +1,4 @@ -# Copyright 2012 OpenStack, LLC. +# Copyright 2012-2013 OpenStack, LLC. # # 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 diff --git a/openstackclient/image/v2/__init__.py b/openstackclient/image/v2/__init__.py index e69de29bb..85ac2501b 100644 --- a/openstackclient/image/v2/__init__.py +++ b/openstackclient/image/v2/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index 41520612d..2e3515db8 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -1,4 +1,4 @@ -# Copyright 2012 OpenStack, LLC. +# Copyright 2012-2013 OpenStack, LLC. # # 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 diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 531ac258d..c007fc53b 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 """ Command-line interface to the OpenStack APIs diff --git a/setup.py b/setup.py index fe0c2ebdb..fdc0d634b 100644 --- a/setup.py +++ b/setup.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 import os diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..85ac2501b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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/tests/test_clientmanager_clientcache.py b/tests/test_clientmanager_clientcache.py index 200da01fd..8ebf14be4 100644 --- a/tests/test_clientmanager_clientcache.py +++ b/tests/test_clientmanager_clientcache.py @@ -1,3 +1,17 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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. +# from openstackclient.common import clientmanager diff --git a/tests/test_shell.py b/tests/test_shell.py index e897fdfa0..cf4fc9244 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -1,19 +1,17 @@ -# Copyright 2012 OpenStack LLC. -# All Rights Reserved +# Copyright 2012-2013 OpenStack, LLC. # -# 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 +# 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 +# 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. +# 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. # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 import os import mock diff --git a/tests/utils.py b/tests/utils.py index 902747257..5c4b50c62 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,3 +1,18 @@ +# Copyright 2012-2013 OpenStack, LLC. +# +# 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. +# + import os import fixtures