diff --git a/octavia/amphorae/__init__.py b/octavia/amphorae/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/__init__.py +++ b/octavia/amphorae/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/backends/__init__.py b/octavia/amphorae/backends/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/backends/__init__.py +++ b/octavia/amphorae/backends/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/backends/agent/__init__.py b/octavia/amphorae/backends/agent/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/backends/agent/__init__.py +++ b/octavia/amphorae/backends/agent/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/backends/agent/api_server/listener.py b/octavia/amphorae/backends/agent/api_server/listener.py index ad87cf7fc3..42237bc41c 100644 --- a/octavia/amphorae/backends/agent/api_server/listener.py +++ b/octavia/amphorae/backends/agent/api_server/listener.py @@ -195,11 +195,10 @@ class Listener(object): if not os.path.exists(netns_path): with os.fdopen(os.open(netns_path, flags, mode), 'w') as text_file: - text = JINJA_ENV.get_template(AMPHORA_NETNS + - '.systemd.j2').render( + text = JINJA_ENV.get_template( + AMPHORA_NETNS + '.systemd.j2').render( amphora_nsname=consts.AMPHORA_NAMESPACE, - HasIFUPAll=self._osutils.has_ifup_all() - ) + HasIFUPAll=self._osutils.has_ifup_all()) text_file.write(text) if not os.path.exists(init_path): diff --git a/octavia/amphorae/backends/health_daemon/__init__.py b/octavia/amphorae/backends/health_daemon/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/backends/health_daemon/__init__.py +++ b/octavia/amphorae/backends/health_daemon/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/backends/utils/__init__.py b/octavia/amphorae/backends/utils/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/backends/utils/__init__.py +++ b/octavia/amphorae/backends/utils/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/driver_exceptions/__init__.py b/octavia/amphorae/driver_exceptions/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/driver_exceptions/__init__.py +++ b/octavia/amphorae/driver_exceptions/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/drivers/__init__.py b/octavia/amphorae/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/drivers/__init__.py +++ b/octavia/amphorae/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/drivers/haproxy/__init__.py b/octavia/amphorae/drivers/haproxy/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/drivers/haproxy/__init__.py +++ b/octavia/amphorae/drivers/haproxy/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/drivers/health/__init__.py b/octavia/amphorae/drivers/health/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/drivers/health/__init__.py +++ b/octavia/amphorae/drivers/health/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/drivers/keepalived/__init__.py b/octavia/amphorae/drivers/keepalived/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/drivers/keepalived/__init__.py +++ b/octavia/amphorae/drivers/keepalived/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/drivers/keepalived/jinja/__init__.py b/octavia/amphorae/drivers/keepalived/jinja/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/drivers/keepalived/jinja/__init__.py +++ b/octavia/amphorae/drivers/keepalived/jinja/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/amphorae/drivers/noop_driver/__init__.py b/octavia/amphorae/drivers/noop_driver/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/amphorae/drivers/noop_driver/__init__.py +++ b/octavia/amphorae/drivers/noop_driver/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/__init__.py b/octavia/api/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/__init__.py +++ b/octavia/api/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/common/__init__.py b/octavia/api/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/common/__init__.py +++ b/octavia/api/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/common/pagination.py b/octavia/api/common/pagination.py index bf18341232..8b7d1e54ec 100644 --- a/octavia/api/common/pagination.py +++ b/octavia/api/common/pagination.py @@ -205,8 +205,8 @@ class PaginationHelper(object): # Add filtering if CONF.api_settings.allow_filtering: # Exclude (valid) arguments that are not used for data filtering - filter_params = {k: v for k, v in self.params.items( - ) if k not in self._auxiliary_arguments} + filter_params = {k: v for k, v in self.params.items() + if k not in self._auxiliary_arguments} secondary_query_filter = filter_params.pop( "project_id", None) if (model == models.Amphora) else None diff --git a/octavia/api/handlers/__init__.py b/octavia/api/handlers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/handlers/__init__.py +++ b/octavia/api/handlers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/handlers/controller_simulator/__init__.py b/octavia/api/handlers/controller_simulator/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/handlers/controller_simulator/__init__.py +++ b/octavia/api/handlers/controller_simulator/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/handlers/queue/__init__.py b/octavia/api/handlers/queue/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/handlers/queue/__init__.py +++ b/octavia/api/handlers/queue/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/v1/__init__.py b/octavia/api/v1/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/v1/__init__.py +++ b/octavia/api/v1/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/v1/types/__init__.py b/octavia/api/v1/types/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/v1/types/__init__.py +++ b/octavia/api/v1/types/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/v2/__init__.py b/octavia/api/v2/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/v2/__init__.py +++ b/octavia/api/v2/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/api/v2/types/__init__.py b/octavia/api/v2/types/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/api/v2/types/__init__.py +++ b/octavia/api/v2/types/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/certificates/__init__.py b/octavia/certificates/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/certificates/__init__.py +++ b/octavia/certificates/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/certificates/common/__init__.py b/octavia/certificates/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/certificates/common/__init__.py +++ b/octavia/certificates/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/certificates/common/auth/__init__.py b/octavia/certificates/common/auth/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/certificates/common/auth/__init__.py +++ b/octavia/certificates/common/auth/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/certificates/generator/__init__.py b/octavia/certificates/generator/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/certificates/generator/__init__.py +++ b/octavia/certificates/generator/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/certificates/manager/__init__.py b/octavia/certificates/manager/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/certificates/manager/__init__.py +++ b/octavia/certificates/manager/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/cmd/__init__.py b/octavia/cmd/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/cmd/__init__.py +++ b/octavia/cmd/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/common/__init__.py b/octavia/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/common/__init__.py +++ b/octavia/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/common/jinja/__init__.py b/octavia/common/jinja/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/common/jinja/__init__.py +++ b/octavia/common/jinja/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/common/jinja/haproxy/__init__.py b/octavia/common/jinja/haproxy/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/common/jinja/haproxy/__init__.py +++ b/octavia/common/jinja/haproxy/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/common/tls_utils/__init__.py b/octavia/common/tls_utils/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/common/tls_utils/__init__.py +++ b/octavia/common/tls_utils/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/compute/__init__.py b/octavia/compute/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/compute/__init__.py +++ b/octavia/compute/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/compute/drivers/__init__.py b/octavia/compute/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/compute/drivers/__init__.py +++ b/octavia/compute/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/compute/drivers/noop_driver/__init__.py b/octavia/compute/drivers/noop_driver/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/compute/drivers/noop_driver/__init__.py +++ b/octavia/compute/drivers/noop_driver/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/__init__.py b/octavia/controller/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/__init__.py +++ b/octavia/controller/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/healthmanager/__init__.py b/octavia/controller/healthmanager/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/healthmanager/__init__.py +++ b/octavia/controller/healthmanager/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/housekeeping/__init__.py b/octavia/controller/housekeeping/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/housekeeping/__init__.py +++ b/octavia/controller/housekeeping/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/queue/__init__.py b/octavia/controller/queue/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/queue/__init__.py +++ b/octavia/controller/queue/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/worker/__init__.py b/octavia/controller/worker/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/worker/__init__.py +++ b/octavia/controller/worker/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/worker/flows/__init__.py b/octavia/controller/worker/flows/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/worker/flows/__init__.py +++ b/octavia/controller/worker/flows/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/worker/tasks/__init__.py b/octavia/controller/worker/tasks/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/controller/worker/tasks/__init__.py +++ b/octavia/controller/worker/tasks/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/controller/worker/tasks/compute_tasks.py b/octavia/controller/worker/tasks/compute_tasks.py index e00ef5e31c..e6cc50a05d 100644 --- a/octavia/controller/worker/tasks/compute_tasks.py +++ b/octavia/controller/worker/tasks/compute_tasks.py @@ -141,8 +141,7 @@ class CertComputeCreate(ComputeCreate): return super(CertComputeCreate, self).execute( amphora_id, config_drive_files=config_drive_files, build_type_priority=build_type_priority, - server_group_id=server_group_id, ports=ports, - ) + server_group_id=server_group_id, ports=ports) class DeleteAmphoraeOnLoadBalancer(BaseComputeTask): diff --git a/octavia/db/__init__.py b/octavia/db/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/db/__init__.py +++ b/octavia/db/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/db/migration/__init__.py b/octavia/db/migration/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/db/migration/__init__.py +++ b/octavia/db/migration/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/distributor/__init__.py b/octavia/distributor/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/distributor/__init__.py +++ b/octavia/distributor/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/distributor/drivers/__init__.py b/octavia/distributor/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/distributor/drivers/__init__.py +++ b/octavia/distributor/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/distributor/drivers/noop_driver/__init__.py b/octavia/distributor/drivers/noop_driver/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/distributor/drivers/noop_driver/__init__.py +++ b/octavia/distributor/drivers/noop_driver/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/hacking/__init__.py b/octavia/hacking/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/hacking/__init__.py +++ b/octavia/hacking/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/network/__init__.py b/octavia/network/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/network/__init__.py +++ b/octavia/network/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/network/drivers/__init__.py b/octavia/network/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/network/drivers/__init__.py +++ b/octavia/network/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/network/drivers/neutron/__init__.py b/octavia/network/drivers/neutron/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/network/drivers/neutron/__init__.py +++ b/octavia/network/drivers/neutron/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/network/drivers/noop_driver/__init__.py b/octavia/network/drivers/noop_driver/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/network/drivers/noop_driver/__init__.py +++ b/octavia/network/drivers/noop_driver/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/__init__.py b/octavia/tests/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/__init__.py +++ b/octavia/tests/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/common/__init__.py b/octavia/tests/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/common/__init__.py +++ b/octavia/tests/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/__init__.py b/octavia/tests/functional/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/__init__.py +++ b/octavia/tests/functional/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/amphorae/__init__.py b/octavia/tests/functional/amphorae/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/amphorae/__init__.py +++ b/octavia/tests/functional/amphorae/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/amphorae/backend/__init__.py b/octavia/tests/functional/amphorae/backend/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/amphorae/backend/__init__.py +++ b/octavia/tests/functional/amphorae/backend/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/amphorae/backend/agent/__init__.py b/octavia/tests/functional/amphorae/backend/agent/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/amphorae/backend/agent/__init__.py +++ b/octavia/tests/functional/amphorae/backend/agent/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/amphorae/backend/agent/api_server/__init__.py b/octavia/tests/functional/amphorae/backend/agent/api_server/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/amphorae/backend/agent/api_server/__init__.py +++ b/octavia/tests/functional/amphorae/backend/agent/api_server/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/api/__init__.py b/octavia/tests/functional/api/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/api/__init__.py +++ b/octavia/tests/functional/api/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/api/v1/__init__.py b/octavia/tests/functional/api/v1/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/api/v1/__init__.py +++ b/octavia/tests/functional/api/v1/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/api/v2/__init__.py b/octavia/tests/functional/api/v2/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/api/v2/__init__.py +++ b/octavia/tests/functional/api/v2/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/functional/api/v2/test_listener.py b/octavia/tests/functional/api/v2/test_listener.py index 318dd47036..1f1393d8cb 100644 --- a/octavia/tests/functional/api/v2/test_listener.py +++ b/octavia/tests/functional/api/v2/test_listener.py @@ -1152,7 +1152,7 @@ class TestListener(base.BaseAPITest): def _getStats(self, listener_id): res = self.get(self.LISTENER_PATH.format( - listener_id=listener_id + "/stats")) + listener_id=listener_id + "/stats")) return res.json.get('stats') def test_statistics(self): @@ -1250,6 +1250,6 @@ class TestListener(base.BaseAPITest): with mock.patch.object(octavia.common.context.Context, 'project_id', uuidutils.generate_uuid()): res = self.get(self.LISTENER_PATH.format( - listener_id=li['id'] + "/stats"), status=403) + listener_id=li['id'] + "/stats"), status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) self.assertEqual(self.NOT_AUTHORIZED_BODY, res.json) diff --git a/octavia/tests/functional/db/__init__.py b/octavia/tests/functional/db/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/functional/db/__init__.py +++ b/octavia/tests/functional/db/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/__init__.py b/octavia/tests/tempest/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/__init__.py +++ b/octavia/tests/tempest/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/common/__init__.py b/octavia/tests/tempest/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/common/__init__.py +++ b/octavia/tests/tempest/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/v1/__init__.py b/octavia/tests/tempest/v1/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/v1/__init__.py +++ b/octavia/tests/tempest/v1/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/v1/clients/__init__.py b/octavia/tests/tempest/v1/clients/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/v1/clients/__init__.py +++ b/octavia/tests/tempest/v1/clients/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/v1/scenario/__init__.py b/octavia/tests/tempest/v1/scenario/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/v1/scenario/__init__.py +++ b/octavia/tests/tempest/v1/scenario/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/v2/__init__.py b/octavia/tests/tempest/v2/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/v2/__init__.py +++ b/octavia/tests/tempest/v2/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/v2/clients/__init__.py b/octavia/tests/tempest/v2/clients/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/v2/clients/__init__.py +++ b/octavia/tests/tempest/v2/clients/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/tempest/v2/scenario/__init__.py b/octavia/tests/tempest/v2/scenario/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/tempest/v2/scenario/__init__.py +++ b/octavia/tests/tempest/v2/scenario/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/__init__.py b/octavia/tests/unit/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/__init__.py +++ b/octavia/tests/unit/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/__init__.py b/octavia/tests/unit/amphorae/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/__init__.py +++ b/octavia/tests/unit/amphorae/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/backends/__init__.py b/octavia/tests/unit/amphorae/backends/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/backends/__init__.py +++ b/octavia/tests/unit/amphorae/backends/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/backends/agent/__init__.py b/octavia/tests/unit/amphorae/backends/agent/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/backends/agent/__init__.py +++ b/octavia/tests/unit/amphorae/backends/agent/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/backends/agent/api_server/__init__.py b/octavia/tests/unit/amphorae/backends/agent/api_server/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/__init__.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/backends/health_daemon/__init__.py b/octavia/tests/unit/amphorae/backends/health_daemon/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/backends/health_daemon/__init__.py +++ b/octavia/tests/unit/amphorae/backends/health_daemon/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/backends/utils/__init__.py b/octavia/tests/unit/amphorae/backends/utils/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/backends/utils/__init__.py +++ b/octavia/tests/unit/amphorae/backends/utils/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/drivers/__init__.py b/octavia/tests/unit/amphorae/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/drivers/__init__.py +++ b/octavia/tests/unit/amphorae/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/drivers/haproxy/__init__.py b/octavia/tests/unit/amphorae/drivers/haproxy/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/drivers/haproxy/__init__.py +++ b/octavia/tests/unit/amphorae/drivers/haproxy/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/drivers/health/__init__.py b/octavia/tests/unit/amphorae/drivers/health/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/drivers/health/__init__.py +++ b/octavia/tests/unit/amphorae/drivers/health/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/drivers/keepalived/__init__.py b/octavia/tests/unit/amphorae/drivers/keepalived/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/drivers/keepalived/__init__.py +++ b/octavia/tests/unit/amphorae/drivers/keepalived/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/amphorae/drivers/keepalived/jinja/__init__.py b/octavia/tests/unit/amphorae/drivers/keepalived/jinja/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/amphorae/drivers/keepalived/jinja/__init__.py +++ b/octavia/tests/unit/amphorae/drivers/keepalived/jinja/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/__init__.py b/octavia/tests/unit/api/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/__init__.py +++ b/octavia/tests/unit/api/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/common/__init__.py b/octavia/tests/unit/api/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/common/__init__.py +++ b/octavia/tests/unit/api/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/handlers/__init__.py b/octavia/tests/unit/api/handlers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/handlers/__init__.py +++ b/octavia/tests/unit/api/handlers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/handlers/queue/__init__.py b/octavia/tests/unit/api/handlers/queue/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/handlers/queue/__init__.py +++ b/octavia/tests/unit/api/handlers/queue/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/hooks/__init__.py b/octavia/tests/unit/api/hooks/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/hooks/__init__.py +++ b/octavia/tests/unit/api/hooks/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/v1/__init__.py b/octavia/tests/unit/api/v1/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/v1/__init__.py +++ b/octavia/tests/unit/api/v1/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/v1/types/__init__.py b/octavia/tests/unit/api/v1/types/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/v1/types/__init__.py +++ b/octavia/tests/unit/api/v1/types/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/v2/__init__.py b/octavia/tests/unit/api/v2/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/v2/__init__.py +++ b/octavia/tests/unit/api/v2/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/api/v2/types/__init__.py b/octavia/tests/unit/api/v2/types/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/api/v2/types/__init__.py +++ b/octavia/tests/unit/api/v2/types/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/certificates/__init__.py b/octavia/tests/unit/certificates/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/certificates/__init__.py +++ b/octavia/tests/unit/certificates/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/certificates/common/__init__.py b/octavia/tests/unit/certificates/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/certificates/common/__init__.py +++ b/octavia/tests/unit/certificates/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/certificates/common/auth/__init__.py b/octavia/tests/unit/certificates/common/auth/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/certificates/common/auth/__init__.py +++ b/octavia/tests/unit/certificates/common/auth/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/certificates/generator/__init__.py b/octavia/tests/unit/certificates/generator/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/certificates/generator/__init__.py +++ b/octavia/tests/unit/certificates/generator/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/certificates/manager/__init__.py b/octavia/tests/unit/certificates/manager/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/certificates/manager/__init__.py +++ b/octavia/tests/unit/certificates/manager/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/cmd/__init__.py b/octavia/tests/unit/cmd/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/cmd/__init__.py +++ b/octavia/tests/unit/cmd/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/common/__init__.py b/octavia/tests/unit/common/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/common/__init__.py +++ b/octavia/tests/unit/common/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/common/jinja/__init__.py b/octavia/tests/unit/common/jinja/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/common/jinja/__init__.py +++ b/octavia/tests/unit/common/jinja/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/common/jinja/haproxy/__init__.py b/octavia/tests/unit/common/jinja/haproxy/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/common/jinja/haproxy/__init__.py +++ b/octavia/tests/unit/common/jinja/haproxy/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/common/sample_configs/__init__.py b/octavia/tests/unit/common/sample_configs/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/common/sample_configs/__init__.py +++ b/octavia/tests/unit/common/sample_configs/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/common/test_validations.py b/octavia/tests/unit/common/test_validations.py index fec401d111..e0d57b8311 100644 --- a/octavia/tests/unit/common/test_validations.py +++ b/octavia/tests/unit/common/test_validations.py @@ -274,7 +274,7 @@ class TestValidations(base.TestCase): device_id = uuidutils.generate_uuid() port = network_models.Port(id=port_id, device_id=device_id) with mock.patch( - 'octavia.common.utils.get_network_driver') as net_mock: + 'octavia.common.utils.get_network_driver') as net_mock: net_mock.return_value.get_port.device_id = port self.assertRaises( exceptions.ValidationException, diff --git a/octavia/tests/unit/common/tls_utils/__init__.py b/octavia/tests/unit/common/tls_utils/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/common/tls_utils/__init__.py +++ b/octavia/tests/unit/common/tls_utils/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/compute/__init__.py b/octavia/tests/unit/compute/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/compute/__init__.py +++ b/octavia/tests/unit/compute/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/compute/drivers/__init__.py b/octavia/tests/unit/compute/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/compute/drivers/__init__.py +++ b/octavia/tests/unit/compute/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/__init__.py b/octavia/tests/unit/controller/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/__init__.py +++ b/octavia/tests/unit/controller/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/healthmanager/__init__.py b/octavia/tests/unit/controller/healthmanager/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/healthmanager/__init__.py +++ b/octavia/tests/unit/controller/healthmanager/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/housekeeping/__init__.py b/octavia/tests/unit/controller/housekeeping/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/housekeeping/__init__.py +++ b/octavia/tests/unit/controller/housekeeping/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/queue/__init__.py b/octavia/tests/unit/controller/queue/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/queue/__init__.py +++ b/octavia/tests/unit/controller/queue/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/worker/__init__.py b/octavia/tests/unit/controller/worker/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/worker/__init__.py +++ b/octavia/tests/unit/controller/worker/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/worker/flows/__init__.py b/octavia/tests/unit/controller/worker/flows/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/worker/flows/__init__.py +++ b/octavia/tests/unit/controller/worker/flows/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/controller/worker/tasks/__init__.py b/octavia/tests/unit/controller/worker/tasks/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/controller/worker/tasks/__init__.py +++ b/octavia/tests/unit/controller/worker/tasks/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/db/__init__.py b/octavia/tests/unit/db/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/db/__init__.py +++ b/octavia/tests/unit/db/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/network/__init__.py b/octavia/tests/unit/network/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/network/__init__.py +++ b/octavia/tests/unit/network/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/network/drivers/__init__.py b/octavia/tests/unit/network/drivers/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/network/drivers/__init__.py +++ b/octavia/tests/unit/network/drivers/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/network/drivers/neutron/__init__.py b/octavia/tests/unit/network/drivers/neutron/__init__.py index e69de29bb2..94e731d201 100644 --- a/octavia/tests/unit/network/drivers/neutron/__init__.py +++ b/octavia/tests/unit/network/drivers/neutron/__init__.py @@ -0,0 +1,11 @@ +# 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/octavia/tests/unit/network/drivers/neutron/test_base.py b/octavia/tests/unit/network/drivers/neutron/test_base.py index 900ddc0a11..a825152fc4 100644 --- a/octavia/tests/unit/network/drivers/neutron/test_base.py +++ b/octavia/tests/unit/network/drivers/neutron/test_base.py @@ -75,9 +75,9 @@ class TestBaseNeutronNetworkDriver(base.TestCase): self.driver._add_allowed_address_pair_to_port( t_constants.MOCK_PORT_ID, t_constants.MOCK_IP_ADDRESS) expected_aap_dict = { - 'port': { - 'allowed_address_pairs': [ - {'ip_address': t_constants.MOCK_IP_ADDRESS}]}} + 'port': { + 'allowed_address_pairs': [ + {'ip_address': t_constants.MOCK_IP_ADDRESS}]}} self.driver.neutron_client.update_port.assert_has_calls([ mock.call(t_constants.MOCK_PORT_ID, expected_aap_dict)]) diff --git a/tox.ini b/tox.ini index c4bbb784f4..b3d6c23125 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ deps = -r{toxinidir}/doc/requirements.txt whitelist_externals = rm commands = - rm -rf doc/build api-guide/build api-ref/build + rm -rf doc/build api-guide/build api-ref/build doc/source/contributor/modules sphinx-build -W -b html doc/source doc/build/html sphinx-build -W -b html api-ref/source api-ref/build/html @@ -121,7 +121,7 @@ commands = commands = bandit -r octavia -ll -ii -x octavia/tests {posargs} [flake8] -ignore = +ignore = H104 show-source = true builtins = _ exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build