x/cloudcafe
Code Issues Proposed changes

Fixing cafe deprecation issues for Meniscus

Browse Source 
Change-Id: I9bda6dc20792203986256be2c980c7b4e73e77c9
This commit is contained in:
John Vrbanac 2014-01-06 10:06:19 -06:00
parent 774310b7c0
commit dcc9f62cd1
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudcafe/meniscus/common/cleanup_client.py
View File

@ -13,7 +13,7 @@ WITHOUT 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 cafe.engine.clients.mongo import BaseMongoClient
from cafe.engine.mongo.client import BaseMongoClient
class MeniscusDbClient(BaseMongoClient):

4
cloudcafe/meniscus/coordinator_api/client.py
View File

@ -13,7 +13,7 @@ WITHOUT 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 cafe.engine.clients.rest import AutoMarshallingRestClient
from cafe.engine.http.client import AutoMarshallingHTTPClient
from cloudcafe.meniscus.common.models.system \
import SystemInfo, DiskUsage, LoadAverage
from cloudcafe.meniscus.coordinator_api.models.pairing \
@ -22,7 +22,7 @@ from cloudcafe.meniscus.coordinator_api.models.routing import AllRoutes
from cloudcafe.meniscus.coordinator_api.models.status import UpdateStatus
class PairingClient(AutoMarshallingRestClient):
class PairingClient(AutoMarshallingHTTPClient):
def __init__(self, url, api_version, auth_token, serialize_format=None,
deserialize_format=None):
super(PairingClient, self).__init__(serialize_format,

4
cloudcafe/meniscus/correlator_api/client.py
View File

@ -15,10 +15,10 @@ limitations under the License.
"""
from cloudcafe.meniscus.correlator_api.models.publish \
import PublishMessage, JobInformation
from cafe.engine.clients.rest import AutoMarshallingRestClient
from cafe.engine.http.client import AutoMarshallingHTTPClient
class PublishingClient(AutoMarshallingRestClient):
class PublishingClient(AutoMarshallingHTTPClient):
def __init__(self, url, api_version, serialize_format=None,
deserialize_format=None):

4
cloudcafe/meniscus/status_api/client.py
View File

@ -13,14 +13,14 @@ WITHOUT 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 cafe.engine.clients.rest import AutoMarshallingRestClient
from cafe.engine.http.client import AutoMarshallingHTTPClient
from cloudcafe.meniscus.common.models.system import SystemInfo
from cloudcafe.meniscus.status_api.models.status \
import (AllWorkersStatus, WorkerStatus, WorkerLoadAverage,
WorkerDiskUsage, WorkerStatusUpdate)
class WorkerStatusClient(AutoMarshallingRestClient):
class WorkerStatusClient(AutoMarshallingHTTPClient):
def __init__(self, url, api_version, serialize_format,
deserialize_format):

4
cloudcafe/meniscus/tenant_api/client.py
View File

@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from cafe.engine.clients.rest import AutoMarshallingRestClient
from cafe.engine.http.client import AutoMarshallingHTTPClient
from cloudcafe.meniscus.tenant_api.models.tenant import \
Tenant, CreateTenant, ResetToken
from cloudcafe.meniscus.tenant_api.models.producer import \
CreateProducer, UpdateProducer, AllProducers, Producer
class MeniscusClient(AutoMarshallingRestClient):
class MeniscusClient(AutoMarshallingHTTPClient):
def __init__(self, url, api_version, use_alternate=False,
serialize_format=None, deserialize_format=None):

4
cloudcafe/meniscus/version_api/client.py
View File

@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from cafe.engine.clients.rest import AutoMarshallingRestClient
from cafe.engine.http.client import AutoMarshallingHTTPClient
from cloudcafe.meniscus.version_api.models.version import Version
class VersionClient(AutoMarshallingRestClient):
class VersionClient(AutoMarshallingHTTPClient):
def __init__(self, url, serialize_format=None, deserialize_format=None):
"""
@param url: Base URL of meniscus api