From 315a90e790986721062fe5b7affc313299adae85 Mon Sep 17 00:00:00 2001 From: Jose Idar Date: Tue, 3 May 2016 11:20:29 -0500 Subject: [PATCH] Removes long-deprecated files from cafe/plugins * Affects the http, ssh, and mongo plugins. Change-Id: I669f60c1900ac7c52cd7232e9d965cdbf63a8ab1 --- .../http/cafe/engine/clients/__init__.py | 0 cafe/plugins/http/cafe/engine/clients/rest.py | 28 ------------------- .../mongo/cafe/engine/clients/__init__.py | 0 .../mongo/cafe/engine/clients/mongo.py | 20 ------------- .../ssh/cafe/engine/clients/__init__.py | 0 cafe/plugins/ssh/cafe/engine/clients/ssh.py | 21 -------------- .../ssh/cafe/engine/models/__init__.py | 0 .../ssh/cafe/engine/models/ssh_response.py | 18 ------------ 8 files changed, 87 deletions(-) delete mode 100644 cafe/plugins/http/cafe/engine/clients/__init__.py delete mode 100644 cafe/plugins/http/cafe/engine/clients/rest.py delete mode 100644 cafe/plugins/mongo/cafe/engine/clients/__init__.py delete mode 100644 cafe/plugins/mongo/cafe/engine/clients/mongo.py delete mode 100644 cafe/plugins/ssh/cafe/engine/clients/__init__.py delete mode 100644 cafe/plugins/ssh/cafe/engine/clients/ssh.py delete mode 100644 cafe/plugins/ssh/cafe/engine/models/__init__.py delete mode 100644 cafe/plugins/ssh/cafe/engine/models/ssh_response.py diff --git a/cafe/plugins/http/cafe/engine/clients/__init__.py b/cafe/plugins/http/cafe/engine/clients/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cafe/plugins/http/cafe/engine/clients/rest.py b/cafe/plugins/http/cafe/engine/clients/rest.py deleted file mode 100644 index 50e2bb0..0000000 --- a/cafe/plugins/http/cafe/engine/clients/rest.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2015 Rackspace -# Licensed under the Apache License, Version 2.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 warnings import warn, simplefilter - -from cafe.engine.http.client import ( - BaseClient, requests, time, _inject_exception, _log_transaction, cclogging) - -from cafe.engine.http.client import BaseHTTPClient as BaseRestClient - -from cafe.engine.http.client import \ - AutoMarshallingHTTPClient as AutoMarshallingRestClient - -from cafe.engine.http.client import HTTPClient as RestClient - -simplefilter("default", DeprecationWarning) -warn("cafe.engine.clients.rest has been moved to cafe.engine.http.client", - DeprecationWarning) diff --git a/cafe/plugins/mongo/cafe/engine/clients/__init__.py b/cafe/plugins/mongo/cafe/engine/clients/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cafe/plugins/mongo/cafe/engine/clients/mongo.py b/cafe/plugins/mongo/cafe/engine/clients/mongo.py deleted file mode 100644 index d6a9967..0000000 --- a/cafe/plugins/mongo/cafe/engine/clients/mongo.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2015 Rackspace -# Licensed under the Apache License, Version 2.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 warnings import warn, simplefilter -simplefilter("default", DeprecationWarning) -warn("cafe.engine.clients.mongo has been moved to cafe.engine.mongo.client", - DeprecationWarning) - -from cafe.engine.mongo.client import ( - pymongo, MongoClient, cclogging, BaseClient, BaseMongoClient) diff --git a/cafe/plugins/ssh/cafe/engine/clients/__init__.py b/cafe/plugins/ssh/cafe/engine/clients/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cafe/plugins/ssh/cafe/engine/clients/ssh.py b/cafe/plugins/ssh/cafe/engine/clients/ssh.py deleted file mode 100644 index 9e0eafb..0000000 --- a/cafe/plugins/ssh/cafe/engine/clients/ssh.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2015 Rackspace -# Licensed under the Apache License, Version 2.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 warnings import warn, simplefilter -simplefilter("default", DeprecationWarning) -warn( - "cafe.engine.clients.ssh has been moved to cafe.engine.ssh.client", - DeprecationWarning) - -from cafe.engine.ssh.client import \ - SSHAuthStrategy, ExtendedParamikoSSHClient, BaseSSHClient, SSHClient diff --git a/cafe/plugins/ssh/cafe/engine/models/__init__.py b/cafe/plugins/ssh/cafe/engine/models/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cafe/plugins/ssh/cafe/engine/models/ssh_response.py b/cafe/plugins/ssh/cafe/engine/models/ssh_response.py deleted file mode 100644 index 212736e..0000000 --- a/cafe/plugins/ssh/cafe/engine/models/ssh_response.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2015 Rackspace -# Licensed under the Apache License, Version 2.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 warnings import warn, simplefilter -simplefilter("default", DeprecationWarning) -warn("cafe.engine.models.ssh_response has been moved to " - "cafe.engine.ssh.models.ssh_response", DeprecationWarning) -from cafe.engine.ssh.models.ssh_response import SSHKeyResponse, ExecResponse