Procházet zdrojové kódy

Fixed travis build

nuwan_ag před 10 roky
rodič
revize
be8e654cda

+ 1 - 2
.travis.yml

@@ -4,7 +4,6 @@ os:
   - linux
   - osx
 env:
-  - TOX_ENV=py26
   - TOX_ENV=py27
   - TOX_ENV=py32
   - TOX_ENV=py33
@@ -15,4 +14,4 @@ env:
 install:
   - pip install tox
 script:
-  - tox -e $TOX_ENV
+  - tox -e $TOX_ENV

+ 32 - 1
cloudbridge/providers/base.py

@@ -1,4 +1,6 @@
 from cloudbridge.providers.interfaces import CloudProvider
+from cloudbridge.providers.interfaces import KeyPair
+from cloudbridge.providers.interfaces import SecurityGroup
 
 
 class BaseCloudProvider(CloudProvider):
@@ -21,4 +23,33 @@ class BaseCloudProvider(CloudProvider):
                 return True
         except AttributeError:
             pass  # Undefined service type
-        return False
+        return False
+
+
+class BaseKeyPair(KeyPair):
+
+    def __init__(self, name, material=None):
+        self.name = name
+        self.material = material
+
+    def __repr__(self):
+        return "<CBKeyPair: {0}>".format(self.name)
+
+    # def name(self):
+    #     """
+    #     Return the name of this key pair.
+
+    #     :rtype: str
+    #     :return: A name of this ssh key pair
+    #     """
+    #     raise NotImplementedError(
+    #         'name not implemented by this provider')
+
+
+class BaseSecurityGroup(SecurityGroup):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __repr__(self):
+        return "<CBSecurityGroup: {0}>".format(self.name)

+ 1 - 1
cloudbridge/providers/openstack/__init__.py

@@ -9,9 +9,9 @@ from keystoneclient import session
 from keystoneclient.auth.identity import Password
 
 from cloudbridge.providers.base import BaseCloudProvider
+from cloudbridge.providers.base import BaseSecurityGroup
 from cloudbridge.providers.interfaces import SecurityService
 from cloudbridge.providers.interfaces import KeyPair
-from cloudbridge.providers.common import BaseSecurityGroup
 
 
 class OpenStackCloudProviderV1(BaseCloudProvider):