Merge "Update secgroup API for new get/list/search API"

shade/__init__.py

@@ -839,6 +839,10 @@ class OpenStackCloud(object):
         flavors = self.list_flavors()
         return self._filter_list(flavors, name_or_id, filters)
 
+    def search_security_groups(self, name_or_id=None, filters=None):
+        groups = self.list_security_groups()
+        return self._filter_list(groups, name_or_id, filters)
+
     def list_networks(self):
         return self.manager.submitTask(_tasks.NetworkList())['networks']
 
@@ -863,6 +867,11 @@ class OpenStackCloud(object):
             self.manager.submitTask(_tasks.FlavorList())
         )
 
+    def list_security_groups(self):
+        return meta.obj_list_to_dict(
+            self.manager.submitTask(_tasks.SecurityGroupList())
+        )
+
     def get_network(self, name_or_id, filters=None):
         return self._get_entity(self.search_networks, name_or_id, filters)
 
@@ -878,6 +887,10 @@ class OpenStackCloud(object):
     def get_flavor(self, name_or_id, filters=None):
         return self._get_entity(self.search_flavors, name_or_id, filters)
 
+    def get_security_group(self, name_or_id, filters=None):
+        return self._get_entity(self.search_security_groups,
+                                name_or_id, filters)
+
     # TODO(Shrews): This will eventually need to support tenant ID and
     # provider networks, which are admin-level params.
     def create_network(self, name, shared=False, admin_state_up=True):
@@ -1509,12 +1522,6 @@ class OpenStackCloud(object):
         groups = meta.get_groups_from_server(self, server, server_vars)
         return dict(server_vars=server_vars, groups=groups)
 
-    def get_security_group(self, name_or_id):
-        for secgroup in self.manager.submitTask(_tasks.SecurityGroupList()):
-            if name_or_id in (secgroup.name, secgroup.id):
-                return secgroup
-        return None
-
     def get_openstack_vars(self, server):
         return meta.get_hostvars_from_server(self, server)