From bd25a18a1a39d0444fe7c44768d1d67202bc5470 Mon Sep 17 00:00:00 2001 From: Feodor Tersin Date: Tue, 11 Nov 2014 21:02:39 +0400 Subject: [PATCH] Update copyright Change-Id: I185fa28474fca0cc8666d6f59de251ce1f9683f2 --- bin/ec2api-db-setup | 22 +++++++++++----------- ec2api/__init__.py | 22 +++++++++++----------- ec2api/api/__init__.py | 22 +++++++++++----------- ec2api/api/address.py | 22 +++++++++++----------- ec2api/api/apirequest.py | 22 +++++++++++----------- ec2api/api/auth.py | 22 +++++++++++----------- ec2api/api/clients.py | 22 +++++++++++----------- ec2api/api/cloud.py | 22 +++++++++++----------- ec2api/api/dhcp_options.py | 22 +++++++++++----------- ec2api/api/ec2client.py | 22 +++++++++++----------- ec2api/api/ec2utils.py | 22 +++++++++++----------- ec2api/api/faults.py | 22 +++++++++++----------- ec2api/api/instance.py | 22 +++++++++++----------- ec2api/api/internet_gateway.py | 22 +++++++++++----------- ec2api/api/key_pair.py | 22 +++++++++++----------- ec2api/api/network_interface.py | 22 +++++++++++----------- ec2api/api/proxy.py | 22 +++++++++++----------- ec2api/api/route_table.py | 22 +++++++++++----------- ec2api/api/security_group.py | 22 +++++++++++----------- ec2api/api/subnet.py | 22 +++++++++++----------- ec2api/api/utils.py | 22 +++++++++++----------- ec2api/api/validator.py | 22 +++++++++++----------- ec2api/api/vpc.py | 22 +++++++++++----------- ec2api/cmd/__init__.py | 22 +++++++++++----------- ec2api/cmd/api.py | 22 +++++++++++----------- ec2api/config.py | 22 +++++++++++----------- ec2api/context.py | 22 +++++++++++----------- ec2api/db/sqlalchemy/migration.py | 22 +++++++++++----------- ec2api/exception.py | 22 +++++++++++----------- ec2api/novadb/__init__.py | 22 +++++++++++----------- ec2api/paths.py | 22 +++++++++++----------- ec2api/service.py | 22 +++++++++++----------- ec2api/tests/__init__.py | 22 +++++++++++----------- ec2api/tests/base.py | 22 +++++++++++----------- ec2api/tests/fakes.py | 22 +++++++++++----------- ec2api/tests/fakes_request_response.py | 22 +++++++++++----------- ec2api/tests/matchers.py | 22 +++++++++++----------- ec2api/tests/test_address.py | 22 +++++++++++----------- ec2api/tests/test_api_init.py | 22 +++++++++++----------- ec2api/tests/test_apirequest.py | 22 +++++++++++----------- ec2api/tests/test_dhcp_options.py | 22 +++++++++++----------- ec2api/tests/test_ec2client.py | 22 +++++++++++----------- ec2api/tests/test_ec2utils.py | 22 +++++++++++----------- ec2api/tests/test_instance.py | 22 +++++++++++----------- ec2api/tests/test_internet_gateway.py | 22 +++++++++++----------- ec2api/tests/test_network_interface.py | 22 +++++++++++----------- ec2api/tests/test_route_table.py | 22 +++++++++++----------- ec2api/tests/test_security_group.py | 22 +++++++++++----------- ec2api/tests/test_subnet.py | 22 +++++++++++----------- ec2api/tests/test_tools.py | 22 +++++++++++----------- ec2api/tests/test_vpc.py | 22 +++++++++++----------- ec2api/tests/tools.py | 22 +++++++++++----------- ec2api/utils.py | 22 +++++++++++----------- ec2api/version.py | 22 +++++++++++----------- ec2api/wsgi.py | 22 +++++++++++----------- 55 files changed, 605 insertions(+), 605 deletions(-) diff --git a/bin/ec2api-db-setup b/bin/ec2api-db-setup index 1b7cbcd5..9da0b0c3 100755 --- a/bin/ec2api-db-setup +++ b/bin/ec2api-db-setup @@ -1,18 +1,18 @@ #!/bin/bash -e # -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. # # diff --git a/ec2api/__init__.py b/ec2api/__init__.py index 62f43c53..43b757b3 100644 --- a/ec2api/__init__.py +++ b/ec2api/__init__.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ :mod:`ec2api` -- Cloud IaaS Platform diff --git a/ec2api/api/__init__.py b/ec2api/api/__init__.py index 1b710b06..4ef8c66b 100644 --- a/ec2api/api/__init__.py +++ b/ec2api/api/__init__.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ Starting point for routing EC2 requests. diff --git a/ec2api/api/address.py b/ec2api/api/address.py index dcdcb18d..c4660636 100644 --- a/ec2api/api/address.py +++ b/ec2api/api/address.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import netaddr from neutronclient.common import exceptions as neutron_exception diff --git a/ec2api/api/apirequest.py b/ec2api/api/apirequest.py index cb82a97b..2f537b54 100644 --- a/ec2api/api/apirequest.py +++ b/ec2api/api/apirequest.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ APIRequest class diff --git a/ec2api/api/auth.py b/ec2api/api/auth.py index 4978dd5e..e7864f19 100644 --- a/ec2api/api/auth.py +++ b/ec2api/api/auth.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ Common Auth Middleware. diff --git a/ec2api/api/clients.py b/ec2api/api/clients.py index b9078526..e66f1dcd 100644 --- a/ec2api/api/clients.py +++ b/ec2api/api/clients.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from keystoneclient.v2_0 import client as kc diff --git a/ec2api/api/cloud.py b/ec2api/api/cloud.py index 11edcd58..24106277 100644 --- a/ec2api/api/cloud.py +++ b/ec2api/api/cloud.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ diff --git a/ec2api/api/dhcp_options.py b/ec2api/api/dhcp_options.py index 4640ed6e..265e8dfa 100644 --- a/ec2api/api/dhcp_options.py +++ b/ec2api/api/dhcp_options.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import netaddr diff --git a/ec2api/api/ec2client.py b/ec2api/api/ec2client.py index d57d12e9..7672c76d 100644 --- a/ec2api/api/ec2client.py +++ b/ec2api/api/ec2client.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import base64 import hashlib diff --git a/ec2api/api/ec2utils.py b/ec2api/api/ec2utils.py index bfb724a5..79396db2 100644 --- a/ec2api/api/ec2utils.py +++ b/ec2api/api/ec2utils.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import re diff --git a/ec2api/api/faults.py b/ec2api/api/faults.py index 0638ecd4..b3f351cd 100644 --- a/ec2api/api/faults.py +++ b/ec2api/api/faults.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from xml.sax import saxutils diff --git a/ec2api/api/instance.py b/ec2api/api/instance.py index 949cd81b..325cc302 100644 --- a/ec2api/api/instance.py +++ b/ec2api/api/instance.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections diff --git a/ec2api/api/internet_gateway.py b/ec2api/api/internet_gateway.py index 3abcd2b2..c6f0db6f 100644 --- a/ec2api/api/internet_gateway.py +++ b/ec2api/api/internet_gateway.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ Cloud Controller: Implementation of EC2 REST API calls, which are diff --git a/ec2api/api/key_pair.py b/ec2api/api/key_pair.py index 2839b1a0..8ad1f258 100644 --- a/ec2api/api/key_pair.py +++ b/ec2api/api/key_pair.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import base64 diff --git a/ec2api/api/network_interface.py b/ec2api/api/network_interface.py index b1009aef..ac89b529 100644 --- a/ec2api/api/network_interface.py +++ b/ec2api/api/network_interface.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections diff --git a/ec2api/api/proxy.py b/ec2api/api/proxy.py index 87645e19..6188aa44 100644 --- a/ec2api/api/proxy.py +++ b/ec2api/api/proxy.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from ec2api.api import ec2client diff --git a/ec2api/api/route_table.py b/ec2api/api/route_table.py index 709c87ad..5c957bf5 100644 --- a/ec2api/api/route_table.py +++ b/ec2api/api/route_table.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections import copy diff --git a/ec2api/api/security_group.py b/ec2api/api/security_group.py index b601448f..a2938d91 100644 --- a/ec2api/api/security_group.py +++ b/ec2api/api/security_group.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from neutronclient.common import exceptions as neutron_exception diff --git a/ec2api/api/subnet.py b/ec2api/api/subnet.py index 3b2c98f0..7a30307a 100644 --- a/ec2api/api/subnet.py +++ b/ec2api/api/subnet.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import netaddr diff --git a/ec2api/api/utils.py b/ec2api/api/utils.py index cde58909..ddba88a3 100644 --- a/ec2api/api/utils.py +++ b/ec2api/api/utils.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from ec2api import exception diff --git a/ec2api/api/validator.py b/ec2api/api/validator.py index 01745faf..b8459eb8 100644 --- a/ec2api/api/validator.py +++ b/ec2api/api/validator.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import base64 import re diff --git a/ec2api/api/vpc.py b/ec2api/api/vpc.py index 09089ece..3da80b51 100644 --- a/ec2api/api/vpc.py +++ b/ec2api/api/vpc.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from neutronclient.common import exceptions as neutron_exception diff --git a/ec2api/cmd/__init__.py b/ec2api/cmd/__init__.py index e7cf12cc..a649cea7 100644 --- a/ec2api/cmd/__init__.py +++ b/ec2api/cmd/__init__.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from ec2api.openstack.common import gettextutils gettextutils.install('ec2api') diff --git a/ec2api/cmd/api.py b/ec2api/cmd/api.py index 42212e13..ec2889f6 100644 --- a/ec2api/cmd/api.py +++ b/ec2api/cmd/api.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ EC2api API Server diff --git a/ec2api/config.py b/ec2api/config.py index a50c1ca7..feaa46b8 100644 --- a/ec2api/config.py +++ b/ec2api/config.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from oslo.config import cfg diff --git a/ec2api/context.py b/ec2api/context.py index a0953dd0..05c2a79f 100644 --- a/ec2api/context.py +++ b/ec2api/context.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """RequestContext: context for requests that persist through all of ec2.""" diff --git a/ec2api/db/sqlalchemy/migration.py b/ec2api/db/sqlalchemy/migration.py index 2953b0c6..a831bcf0 100644 --- a/ec2api/db/sqlalchemy/migration.py +++ b/ec2api/db/sqlalchemy/migration.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import os diff --git a/ec2api/exception.py b/ec2api/exception.py index 21cb3837..e072e3b0 100644 --- a/ec2api/exception.py +++ b/ec2api/exception.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ec2api base exception handling. diff --git a/ec2api/novadb/__init__.py b/ec2api/novadb/__init__.py index bbd4e2cc..aaeb5fda 100644 --- a/ec2api/novadb/__init__.py +++ b/ec2api/novadb/__init__.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ DB abstraction for Nova diff --git a/ec2api/paths.py b/ec2api/paths.py index aac44876..22a28bf1 100644 --- a/ec2api/paths.py +++ b/ec2api/paths.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import os import sys diff --git a/ec2api/service.py b/ec2api/service.py index ecaa430b..34d5164e 100644 --- a/ec2api/service.py +++ b/ec2api/service.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """Generic Node base class for all workers that run on hosts.""" diff --git a/ec2api/tests/__init__.py b/ec2api/tests/__init__.py index 831705e9..ec619ea3 100644 --- a/ec2api/tests/__init__.py +++ b/ec2api/tests/__init__.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """ :mod:`ec2api.tests` -- EC2api Unittests diff --git a/ec2api/tests/base.py b/ec2api/tests/base.py index 24cdcb22..d1075b94 100644 --- a/ec2api/tests/base.py +++ b/ec2api/tests/base.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import mock diff --git a/ec2api/tests/fakes.py b/ec2api/tests/fakes.py index 86240ed1..eff48d45 100644 --- a/ec2api/tests/fakes.py +++ b/ec2api/tests/fakes.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import copy diff --git a/ec2api/tests/fakes_request_response.py b/ec2api/tests/fakes_request_response.py index 76e2b50d..07890644 100644 --- a/ec2api/tests/fakes_request_response.py +++ b/ec2api/tests/fakes_request_response.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. from ec2api.tests import tools diff --git a/ec2api/tests/matchers.py b/ec2api/tests/matchers.py index 2ddc0437..9373ea3a 100644 --- a/ec2api/tests/matchers.py +++ b/ec2api/tests/matchers.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """Matcher classes to be used inside of the testtools assertThat framework.""" diff --git a/ec2api/tests/test_address.py b/ec2api/tests/test_address.py index 763e801b..18716a98 100644 --- a/ec2api/tests/test_address.py +++ b/ec2api/tests/test_address.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import copy diff --git a/ec2api/tests/test_api_init.py b/ec2api/tests/test_api_init.py index a3f76602..a4e01b2f 100644 --- a/ec2api/tests/test_api_init.py +++ b/ec2api/tests/test_api_init.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections import uuid diff --git a/ec2api/tests/test_apirequest.py b/ec2api/tests/test_apirequest.py index 43599749..f0cd535a 100644 --- a/ec2api/tests/test_apirequest.py +++ b/ec2api/tests/test_apirequest.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections import uuid diff --git a/ec2api/tests/test_dhcp_options.py b/ec2api/tests/test_dhcp_options.py index aba2d302..4d9f035d 100644 --- a/ec2api/tests/test_dhcp_options.py +++ b/ec2api/tests/test_dhcp_options.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import mock diff --git a/ec2api/tests/test_ec2client.py b/ec2api/tests/test_ec2client.py index 55e0b73a..db250fe5 100644 --- a/ec2api/tests/test_ec2client.py +++ b/ec2api/tests/test_ec2client.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections diff --git a/ec2api/tests/test_ec2utils.py b/ec2api/tests/test_ec2utils.py index 9aa0d8b0..32954d22 100644 --- a/ec2api/tests/test_ec2utils.py +++ b/ec2api/tests/test_ec2utils.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import mock diff --git a/ec2api/tests/test_instance.py b/ec2api/tests/test_instance.py index 972d9611..0b1c7261 100644 --- a/ec2api/tests/test_instance.py +++ b/ec2api/tests/test_instance.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections diff --git a/ec2api/tests/test_internet_gateway.py b/ec2api/tests/test_internet_gateway.py index 74187380..f6c3de40 100644 --- a/ec2api/tests/test_internet_gateway.py +++ b/ec2api/tests/test_internet_gateway.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import mock diff --git a/ec2api/tests/test_network_interface.py b/ec2api/tests/test_network_interface.py index 091ae358..4dab8021 100644 --- a/ec2api/tests/test_network_interface.py +++ b/ec2api/tests/test_network_interface.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import copy diff --git a/ec2api/tests/test_route_table.py b/ec2api/tests/test_route_table.py index 3c9527ee..deda522f 100644 --- a/ec2api/tests/test_route_table.py +++ b/ec2api/tests/test_route_table.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import collections import copy diff --git a/ec2api/tests/test_security_group.py b/ec2api/tests/test_security_group.py index 0cf0a1b8..ca356f1b 100644 --- a/ec2api/tests/test_security_group.py +++ b/ec2api/tests/test_security_group.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import copy diff --git a/ec2api/tests/test_subnet.py b/ec2api/tests/test_subnet.py index f3ac80eb..fde2b450 100644 --- a/ec2api/tests/test_subnet.py +++ b/ec2api/tests/test_subnet.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import mock from neutronclient.common import exceptions as neutron_exception diff --git a/ec2api/tests/test_tools.py b/ec2api/tests/test_tools.py index 9ec3bb96..b1202ac2 100644 --- a/ec2api/tests/test_tools.py +++ b/ec2api/tests/test_tools.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import testtools diff --git a/ec2api/tests/test_vpc.py b/ec2api/tests/test_vpc.py index 849378b0..6e479805 100644 --- a/ec2api/tests/test_vpc.py +++ b/ec2api/tests/test_vpc.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import mock diff --git a/ec2api/tests/tools.py b/ec2api/tests/tools.py index e68361ef..52a6d605 100644 --- a/ec2api/tests/tools.py +++ b/ec2api/tests/tools.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import copy diff --git a/ec2api/utils.py b/ec2api/utils.py index 2e79b630..f66389dd 100644 --- a/ec2api/utils.py +++ b/ec2api/utils.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """Utilities and helper functions.""" diff --git a/ec2api/version.py b/ec2api/version.py index 1b1ea8b9..0567fe22 100644 --- a/ec2api/version.py +++ b/ec2api/version.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. import pbr.version diff --git a/ec2api/wsgi.py b/ec2api/wsgi.py index 8898dbcc..b763523b 100644 --- a/ec2api/wsgi.py +++ b/ec2api/wsgi.py @@ -1,16 +1,16 @@ -# Copyright 2014 Cloudscaling Group, Inc +# Copyright 2014 +# The Cloudscaling Group, 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 +# 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. """Utility methods for working with WSGI servers."""