From a8684d38fbbb8b3751a86e4aa737b84fa944905e Mon Sep 17 00:00:00 2001 From: Mark McClain Date: Thu, 26 May 2016 15:47:40 -0400 Subject: [PATCH] remove import compatibility from akanda.* Code compatibility modules were left to assist with inplace upgrades. These were designated to be removed in Newton, so this change removes them. Change-Id: Idd675fb4e362e78e51c1170e06625c2f38c8d846 Closes-bug: 1586152 --- akanda/__init__.py | 18 ------------------ akanda/neutron/__init__.py | 0 akanda/neutron/extensions/__init__.py | 0 akanda/neutron/extensions/_authzbase.py | 16 ---------------- .../neutron/extensions/loadbalancerstatus.py | 16 ---------------- akanda/neutron/extensions/routerstatus.py | 16 ---------------- akanda/neutron/plugins/__init__.py | 0 akanda/neutron/plugins/decorators.py | 16 ---------------- akanda/neutron/plugins/floatingip.py | 16 ---------------- akanda/neutron/plugins/lbaas_neutron_plugin.py | 16 ---------------- akanda/neutron/plugins/ml2_neutron_plugin.py | 16 ---------------- akanda/neutron/plugins/nsx_neutron_plugin.py | 16 ---------------- 12 files changed, 146 deletions(-) delete mode 100644 akanda/__init__.py delete mode 100644 akanda/neutron/__init__.py delete mode 100644 akanda/neutron/extensions/__init__.py delete mode 100644 akanda/neutron/extensions/_authzbase.py delete mode 100644 akanda/neutron/extensions/loadbalancerstatus.py delete mode 100644 akanda/neutron/extensions/routerstatus.py delete mode 100644 akanda/neutron/plugins/__init__.py delete mode 100644 akanda/neutron/plugins/decorators.py delete mode 100644 akanda/neutron/plugins/floatingip.py delete mode 100644 akanda/neutron/plugins/lbaas_neutron_plugin.py delete mode 100644 akanda/neutron/plugins/ml2_neutron_plugin.py delete mode 100644 akanda/neutron/plugins/nsx_neutron_plugin.py diff --git a/akanda/__init__.py b/akanda/__init__.py deleted file mode 100644 index 59a5c81..0000000 --- a/akanda/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2014 DreamHost, LLC -# -# Author: DreamHost, LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -__import__('pkg_resources').declare_namespace(__name__) diff --git a/akanda/neutron/__init__.py b/akanda/neutron/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/akanda/neutron/extensions/__init__.py b/akanda/neutron/extensions/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/akanda/neutron/extensions/_authzbase.py b/akanda/neutron/extensions/_authzbase.py deleted file mode 100644 index 34d32c8..0000000 --- a/akanda/neutron/extensions/_authzbase.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.extensions._authzbase import * # noqa diff --git a/akanda/neutron/extensions/loadbalancerstatus.py b/akanda/neutron/extensions/loadbalancerstatus.py deleted file mode 100644 index e42df5b..0000000 --- a/akanda/neutron/extensions/loadbalancerstatus.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.extensions.loadbalancerstatus import * # noqa diff --git a/akanda/neutron/extensions/routerstatus.py b/akanda/neutron/extensions/routerstatus.py deleted file mode 100644 index fd7667d..0000000 --- a/akanda/neutron/extensions/routerstatus.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.extensions.routerstatus import * # noqa diff --git a/akanda/neutron/plugins/__init__.py b/akanda/neutron/plugins/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/akanda/neutron/plugins/decorators.py b/akanda/neutron/plugins/decorators.py deleted file mode 100644 index fb9bd21..0000000 --- a/akanda/neutron/plugins/decorators.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.plugins.decorators import * # noqa diff --git a/akanda/neutron/plugins/floatingip.py b/akanda/neutron/plugins/floatingip.py deleted file mode 100644 index ef1b433..0000000 --- a/akanda/neutron/plugins/floatingip.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.plugins.floatingip import * # noqa diff --git a/akanda/neutron/plugins/lbaas_neutron_plugin.py b/akanda/neutron/plugins/lbaas_neutron_plugin.py deleted file mode 100644 index 360b3d8..0000000 --- a/akanda/neutron/plugins/lbaas_neutron_plugin.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.plugins.lbaas_neutron_plugin import * # noqa diff --git a/akanda/neutron/plugins/ml2_neutron_plugin.py b/akanda/neutron/plugins/ml2_neutron_plugin.py deleted file mode 100644 index 38e6450..0000000 --- a/akanda/neutron/plugins/ml2_neutron_plugin.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.plugins.ml2_neutron_plugin import * # noqa diff --git a/akanda/neutron/plugins/nsx_neutron_plugin.py b/akanda/neutron/plugins/nsx_neutron_plugin.py deleted file mode 100644 index 9de316f..0000000 --- a/akanda/neutron/plugins/nsx_neutron_plugin.py +++ /dev/null @@ -1,16 +0,0 @@ - -# Copyright (c) 2015 Akanda, Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from astara_neutron.plugins.nsx_neutron_plugin import * # noqa