- added 'message' instance variable (high level description of this event)

[plcapi.git] / PLC / Methods / AdmQuerySite.py

diff --git a/PLC/Methods/AdmQuerySite.py b/PLC/Methods/AdmQuerySite.py
index ef3a2eb..cad6b8c 100644 (file)
--- a/PLC/Methods/AdmQuerySite.py
+++ b/PLC/Methods/AdmQuerySite.py
@@ -6,7 +6,7 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
 from PLC.Nodes import Node, Nodes
 from PLC.NodeNetworks import NodeNetwork, NodeNetworks, valid_ip
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class AdmQuerySite(Method):
     """
@@ -19,7 +19,7 @@ class AdmQuerySite(Method):
     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         {'site_name': Site.fields['name'],
          'site_abbreviatedname': Site.fields['abbreviated_name'],
          'site_loginbase': Site.fields['login_base'],
@@ -33,9 +33,9 @@ class AdmQuerySite(Method):
 
     def call(self, auth, search_vals):
         if 'site_loginbase' in search_vals:
-            sites = Sites(self.api, [search_vals['site_loginbase']]).values()
+            sites = Sites(self.api, [search_vals['site_loginbase']])
         else:
-            sites = Sites(self.api).values()
+            sites = Sites(self.api)
             
         if 'site_name' in search_vals:
             sites = filter(lambda site: \
@@ -60,12 +60,12 @@ class AdmQuerySite(Method):
                 site['ips'] = []
                 site['macs'] = []
                 if site['node_ids']:
-                    nodes = Nodes(self.api, site['node_ids']).values()
+                    nodes = Nodes(self.api, site['node_ids'])
                     for node in nodes:
                         site['hostnames'].append(node['hostname'])
                         if 'nodenetwork_ip' in search_vals or \
                            'nodenetwork_mac' in search_vals:
-                            nodenetworks = NodeNetworks(self.api, node['nodenetwork_ids']).values()
+                            nodenetworks = NodeNetworks(self.api, node['nodenetwork_ids'])
                             site['ips'] += [nodenetwork['ip'] for nodenetwork in nodenetworks]
                             site['macs'] += [nodenetwork['mac'] for nodenetwork in nodenetworks]