Enis Afgan 10 лет назад
Родитель
Сommit
e366538b35

+ 3 - 3
cloudbridge/providers/aws/services.py

@@ -39,10 +39,10 @@ class AWSSecurityService(SecurityService):
 
 
     def list_security_groups(self):
     def list_security_groups(self):
         """
         """
-        Create a new security group
+        List all security groups associated with this account.
 
 
-        :rtype: ``list`` of :class:`.KeyPair`
-        :return:  list of KeyPair objects
+        :rtype: ``list`` of :class:`.SecurityGroup`
+        :return:  list of SecurityGroup objects
         """
         """
         groups = self.provider.ec2_conn.get_all_security_groups()
         groups = self.provider.ec2_conn.get_all_security_groups()
         return [BaseSecurityGroup(group.name) for group in groups]
         return [BaseSecurityGroup(group.name) for group in groups]

+ 5 - 5
cloudbridge/providers/interfaces/services.py

@@ -393,10 +393,10 @@ class SecurityService(ProviderService):
 
 
     def list_security_groups(self):
     def list_security_groups(self):
         """
         """
-        Create a new SecurityGroup.
+        List all security groups associated with this account.
 
 
-        :rtype: ``object`` of :class:`.SecurityGroup`
-        :return:  A SecurityGroup instance
+        :rtype: ``list`` of :class:`.SecurityGroup`
+        :return:  list of SecurityGroup objects
         """
         """
         raise NotImplementedError(
         raise NotImplementedError(
             'list_security_groups not implemented by this provider')
             'list_security_groups not implemented by this provider')
@@ -406,7 +406,7 @@ class SecurityService(ProviderService):
         Create a new SecurityGroup.
         Create a new SecurityGroup.
 
 
         :rtype: ``object`` of :class:`.KeyPair`
         :rtype: ``object`` of :class:`.KeyPair`
-        :return:  A keypair instance
+        :return:  A SecurityGroup instance
         """
         """
         raise NotImplementedError(
         raise NotImplementedError(
             'create_security_group not implemented by this provider')
             'create_security_group not implemented by this provider')
@@ -416,7 +416,7 @@ class SecurityService(ProviderService):
         Delete an existing SecurityGroup.
         Delete an existing SecurityGroup.
 
 
         :rtype: ``bool``
         :rtype: ``bool``
-        :return:  True if successful, false otherwise
+        :return:  ``True`` if successful, ``False`` otherwise
         """
         """
         raise NotImplementedError(
         raise NotImplementedError(
             'delete_security_group not implemented by this provider')
             'delete_security_group not implemented by this provider')

+ 3 - 3
cloudbridge/providers/openstack/services.py

@@ -44,10 +44,10 @@ class OpenStackSecurityService(SecurityService):
 
 
     def list_security_groups(self):
     def list_security_groups(self):
         """
         """
-        Create a new security group
+        List all security groups associated with this account.
 
 
-        :rtype: ``list`` of :class:`.KeyPair`
-        :return:  list of KeyPair objects
+        :rtype: ``list`` of :class:`.SecurityGroup`
+        :return:  list of SecurityGroup objects
         """
         """
         groups = self.provider.nova.security_groups.list()
         groups = self.provider.nova.security_groups.list()
         return [BaseSecurityGroup(group.name) for group in groups]
         return [BaseSecurityGroup(group.name) for group in groups]