Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/AdmDisassociatePowerControlUnitPort.py b/PLC/Methods/AdmDisassociatePowerControlUnitPort.py
index 0b52c7e..5f7c448 100644 (file)
--- a/PLC/Methods/AdmDisassociatePowerControlUnitPort.py
+++ b/PLC/Methods/AdmDisassociatePowerControlUnitPort.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.PCUs import PCU, PCUs
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 from PLC.Methods.DeleteNodeFromPCU import DeleteNodeFromPCU
 
 class AdmDisassociatePowerControlUnitPort(DeleteNodeFromPCU):
@@ -16,7 +16,7 @@ class AdmDisassociatePowerControlUnitPort(DeleteNodeFromPCU):
     roles = ['admin', 'pi', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         PCU.fields['pcu_id'],
         Parameter(int, 'PCU port number'),
         ]
@@ -24,11 +24,11 @@ class AdmDisassociatePowerControlUnitPort(DeleteNodeFromPCU):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, pcu_id, port):
-        pcus = PCUs(self.api, [pcu_id]).values()
+        pcus = PCUs(self.api, [pcu_id])
         if not pcus:
             raise PLCInvalidArgument, "No such PCU"
 
-        pcu = pcus.values()[0]
+        pcu = pcus[0]
 
         ports = dict(zip(pcu['ports'], pcu['node_ids']))
         if port not in ports: