moving back to pl_netflow

[tests.git] / qaapi / qa / tests / delete_test_data.py

diff --git a/qaapi/qa/tests/delete_test_data.py b/qaapi/qa/tests/delete_test_data.py
index d831f0a..ee92ae2 100644 (file)
--- a/qaapi/qa/tests/delete_test_data.py
+++ b/qaapi/qa/tests/delete_test_data.py
@@ -13,13 +13,7 @@ class delete_test_data(Test):
     def call(self, plc_name = None):
 
        # Determine which plc to talk to 
-        plc = PLC(self.config)
-        plcs = getattr(self.config, 'plcs', [])
-        for p in plcs:
-            if p['name'] in [plc_name]:
-                plc.update(p)
-        plc.config.update_api(plc)
-
+       plc = self.config.get_plc(plc_name)
         api = plc.config.api
         auth = plc.config.auth
        
@@ -30,7 +24,8 @@ class delete_test_data(Test):
                                   'plc' in object and object['plc'] == plc['name'] or \
                                   object['plc'] == None
 
-       sitelist = filter(this_plc, self.config.sites)
+       sitelist = filter(this_plc, self.config.sites.values())
+       nodegrouplist = filter(this_plc, self.config.nodegroups.values())
                
        # Deleting the site should delete everything associated with it
        # including nodes, persons
@@ -38,10 +33,19 @@ class delete_test_data(Test):
            try:
                api.DeleteSite(auth, site['login_base'])
                if self.config.verbose:
-                   utils.header("Test data deleted")
+                   utils.header("Test data deleted", logfile = self.config.logfile)
+           except:
+               if self.config.verbose:
+                   utils.header("Error deleting %s" % site['login_base'], logfile = self.config.logfile)               
+       # Delete nodegroups
+       for nodegroup in nodegrouplist:
+           try:
+               api.DeleteNodeGroup(auth, nodegroup['name'])
+               if self.config.verbose:
+                   utils.header("NodeGroups deleted", logfile = self.config.logfile)
            except:
                if self.config.verbose:
-                   utils.header("Error deleting %s" % site['login_base'])              
+                   utils.header("Error deleting %s" % nodegroup['name'], logfile = self.config.logfile)        
        return 1 
        
 if __name__ == '__main__':