Pārlūkot izejas kodu

Improved python3 compatibility and added list_security_groups to ec2
provider

nuwan_ag 10 gadi atpakaļ
vecāks
revīzija
c9b9bfe2b8

+ 1 - 1
README.md

@@ -15,5 +15,5 @@ config = Bunch(access_key='a_key',
                secret_key='s_key')
 
 provider = CloudProviderFactory().create_provider(ProviderList.EC2, config)
-print provider.security.list_key_pairs()
+print(provider.security.list_key_pairs())
 ```

+ 11 - 0
cloudbridge/providers/ec2/__init__.py

@@ -7,6 +7,7 @@ import os
 from boto.ec2.regioninfo import RegionInfo
 
 from cloudbridge.providers.base import BaseCloudProvider
+from cloudbridge.providers.base import BaseSecurityGroup
 from cloudbridge.providers.interfaces import SecurityService
 from cloudbridge.providers.interfaces import KeyPair
 
@@ -80,3 +81,13 @@ class EC2SecurityService(SecurityService):
         """
         key_pairs = self.provider.ec2_conn.get_all_key_pairs()
         return [KeyPair(kp.name) for kp in key_pairs]
+
+    def list_security_groups(self):
+        """
+        Create a new security group
+
+        :rtype: ``list`` of :class:`.KeyPair`
+        :return:  list of KeyPair objects
+        """
+        groups = self.provider.ec2_conn.get_all_security_groups()
+        return [BaseSecurityGroup(group.name) for group in groups]

+ 2 - 2
test/__init__.py

@@ -22,8 +22,8 @@ unittest and nose2's automatic discovery.
 (The test generator will automatically add unittest.TestCase as a base class to each combination)
 """
 
-from helpers import ProviderTestCaseGenerator
-from testprovidersecurityservice import ProviderSecurityServiceTestCase
+from test.helpers import ProviderTestCaseGenerator
+from test.testprovidersecurityservice import ProviderSecurityServiceTestCase
 
 PROVIDER_TESTS = [ProviderSecurityServiceTestCase]
 

+ 1 - 1
test/testprovidersecurityservice.py

@@ -2,7 +2,7 @@ import unittest
 from cloudbridge.providers.factory import CloudProviderFactory
 from cloudbridge.providers.factory import ProviderList
 from cloudbridge.providers import interfaces
-from helpers import ProviderTestBase
+from test.helpers import ProviderTestBase
 
 
 class ProviderSecurityServiceTestCase(ProviderTestBase):