You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by pq...@apache.org on 2010/05/11 22:26:14 UTC
svn commit: r943274 - in /incubator/libcloud/trunk: libcloud/base.py
libcloud/drivers/dummy.py libcloud/drivers/ecp.py libcloud/interface.py
test/test_base.py
Author: pquerna
Date: Tue May 11 20:26:13 2010
New Revision: 943274
URL: http://svn.apache.org/viewvc?rev=943274&view=rev
Log:
Remove all uses of zope.interface.
Removed:
incubator/libcloud/trunk/libcloud/interface.py
Modified:
incubator/libcloud/trunk/libcloud/base.py
incubator/libcloud/trunk/libcloud/drivers/dummy.py
incubator/libcloud/trunk/libcloud/drivers/ecp.py
incubator/libcloud/trunk/test/test_base.py
Modified: incubator/libcloud/trunk/libcloud/base.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/base.py?rev=943274&r1=943273&r2=943274&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/base.py (original)
+++ incubator/libcloud/trunk/libcloud/base.py Tue May 11 20:26:13 2010
@@ -18,14 +18,6 @@ Provides base classes for working with d
"""
import httplib, urllib
import libcloud
-from zope import interface
-from libcloud.interface import IConnectionUserAndKey, IResponse
-from libcloud.interface import IConnectionKey, IConnectionKeyFactory
-from libcloud.interface import IConnectionUserAndKeyFactory, IResponseFactory
-from libcloud.interface import INodeDriverFactory, INodeDriver
-from libcloud.interface import INodeFactory, INode
-from libcloud.interface import INodeSizeFactory, INodeSize
-from libcloud.interface import INodeImageFactory, INodeImage
from libcloud.types import NodeState, DeploymentException
from libcloud.ssh import SSHClient
import time
@@ -42,9 +34,6 @@ class Node(object):
A Base Node class to derive from.
"""
- interface.implements(INode)
- interface.classProvides(INodeFactory)
-
def __init__(self, id, name, state, public_ip, private_ip,
driver, extra=None):
self.id = id
@@ -89,9 +78,6 @@ class NodeSize(object):
A Base NodeSize class to derive from.
"""
- interface.implements(INodeSize)
- interface.classProvides(INodeSizeFactory)
-
def __init__(self, id, name, ram, disk, bandwidth, price, driver):
self.id = id
self.name = name
@@ -112,9 +98,6 @@ class NodeImage(object):
A Base NodeImage class to derive from.
"""
- interface.implements(INodeImage)
- interface.classProvides(INodeImageFactory)
-
def __init__(self, id, name, driver, extra=None):
self.id = id
self.name = name
@@ -131,8 +114,7 @@ class NodeLocation(object):
"""
A base NodeLocation class to derive from.
"""
- interface.implements(INodeImage)
- interface.classProvides(INodeImageFactory)
+
def __init__(self, id, name, country, driver):
self.id = id
self.name = name
@@ -164,9 +146,6 @@ class Response(object):
"""
A Base Response class to derive from.
"""
- interface.implements(IResponse)
- interface.classProvides(IResponseFactory)
-
NODE_STATE_MAP = {}
object = None
@@ -328,9 +307,6 @@ class ConnectionKey(object):
"""
A Base Connection class to derive from.
"""
- interface.implementsOnly(IConnectionKey)
- interface.classProvides(IConnectionKeyFactory)
-
#conn_classes = (httplib.LoggingHTTPConnection, LoggingHTTPSConnection)
conn_classes = (httplib.HTTPConnection, httplib.HTTPSConnection)
@@ -488,8 +464,6 @@ class ConnectionUserAndKey(ConnectionKey
"""
Base connection which accepts a user_id and key
"""
- interface.implementsOnly(IConnectionUserAndKey)
- interface.classProvides(IConnectionUserAndKeyFactory)
user_id = None
@@ -502,8 +476,6 @@ class NodeDriver(object):
"""
A base NodeDriver class to derive from
"""
- interface.implements(INodeDriver)
- interface.classProvides(INodeDriverFactory)
connectionCls = ConnectionKey
name = None
Modified: incubator/libcloud/trunk/libcloud/drivers/dummy.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/dummy.py?rev=943274&r1=943273&r2=943274&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/dummy.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/dummy.py Tue May 11 20:26:13 2010
@@ -17,11 +17,9 @@ Dummy Driver
@note: This driver is out of date
"""
-from libcloud.interface import INodeDriver
from libcloud.base import ConnectionKey, NodeDriver, NodeSize, NodeLocation
from libcloud.base import NodeImage, Node
from libcloud.types import Provider,NodeState
-from zope.interface import implements
import uuid
@@ -41,8 +39,6 @@ class DummyNodeDriver(NodeDriver):
name = "Dummy Node Provider"
type = Provider.DUMMY
- implements(INodeDriver)
-
def __init__(self, creds):
self.creds = creds
self.nl = [
Modified: incubator/libcloud/trunk/libcloud/drivers/ecp.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ecp.py?rev=943274&r1=943273&r2=943274&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ecp.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ecp.py Tue May 11 20:26:13 2010
@@ -16,13 +16,11 @@
"""
Enomaly ECP driver
"""
-from libcloud.interface import INodeDriver
from libcloud.base import NodeDriver, NodeSize, NodeLocation
from libcloud.base import NodeImage, Node
from libcloud.base import Response, ConnectionUserAndKey
from libcloud.types import Provider, NodeState, InvalidCredsException
from libcloud.base import is_private_subnet
-from zope.interface import implements
import time
import base64
@@ -120,7 +118,6 @@ class ECPNodeDriver(NodeDriver):
name = "Enomaly Elastic Computing Platform"
type = Provider.ECP
connectionCls = ECPConnection
- implements(INodeDriver)
def list_nodes(self):
"""
Modified: incubator/libcloud/trunk/test/test_base.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_base.py?rev=943274&r1=943273&r2=943274&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_base.py (original)
+++ incubator/libcloud/trunk/test/test_base.py Tue May 11 20:26:13 2010
@@ -15,10 +15,6 @@
import sys
import unittest
-from zope.interface.verify import verifyObject
-
-from libcloud.interface import IResponse, INode, INodeSize, INodeImage, INodeDriver
-from libcloud.interface import IConnectionKey, IConnectionUserAndKey
from libcloud.base import Response, Node, NodeSize, NodeImage, NodeDriver
from libcloud.base import ConnectionKey, ConnectionUserAndKey
@@ -32,32 +28,25 @@ class BaseTests(unittest.TestCase):
def test_base_node(self):
node = Node(id=0, name=0, state=0, public_ip=0, private_ip=0,
driver=FakeDriver())
- verifyObject(INode, node)
def test_base_node_size(self):
node_size = NodeSize(id=0, name=0, ram=0, disk=0, bandwidth=0, price=0,
driver=FakeDriver())
- verifyObject(INodeSize, node_size)
def test_base_node_image(self):
node_image = NodeImage(id=0, name=0, driver=FakeDriver())
- verifyObject(INodeImage, node_image)
def test_base_response(self):
- verifyObject(IResponse, Response(MockResponse(status=200,
- body='foo')))
+ resp = Response(MockResponse(status=200, body='foo'))
def test_base_node_driver(self):
node_driver = NodeDriver('foo')
- verifyObject(INodeDriver, node_driver)
def test_base_connection_key(self):
conn = ConnectionKey('foo')
- verifyObject(IConnectionKey, conn)
def test_base_connection_userkey(self):
conn = ConnectionUserAndKey('foo', 'bar')
- verifyObject(IConnectionUserAndKey, conn)
# def test_drivers_interface(self):
# failures = []