no longer make api calls using xmlrpc, use plcsh directly

diff --git a/qaapi/qa/tests/add_test_data.py b/qaapi/qa/tests/add_test_data.py
index e334e61..e5d337f 100644 (file)
--- a/qaapi/qa/tests/add_test_data.py
+++ b/qaapi/qa/tests/add_test_data.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env /usr/share/plc_api/plcsh
+
 import os,sys
 from Test import Test
 from qa import utils
@@ -8,8 +10,8 @@ class add_test_data(Test):
     """   
     def call(self):
 
-       api = self.config.api
-       auth = self.config.auth
+       #api = self.config.api
+       #auth = self.config.auth
 
        # Make sure some required fields are in config
        required_fields = ['TEST_SITE_NAME', 'TEST_SITE_LOGIN_BASE', 'TEST_SLICE_NAME', 'TEST_PERSON_EMAIL']
@@ -71,9 +73,11 @@ class add_test_data(Test):
 
 
        # Add Test site
-       sites = api.GetSites(auth, {'login_base': site_fields['login_base']})
+       #sites = api.GetSites(auth, {'login_base': site_fields['login_base']})
+       sites = GetSites({'login_base': site_fields['login_base']})
        if not sites:
-           site_id =  api.AddSite(auth, site_fields)
+           #site_id =  api.AddSite(auth, site_fields)
+           site_id = AddSite(site_fields)
            site_fields['site_id'] = site_id
            site = site_fields
            if self.config.verbose:
@@ -85,9 +89,11 @@ class add_test_data(Test):
 
        # Add Test nodes
        for node_fields in node_list:
-           nodes = api.GetNodes(auth, [node_fields['hostname']])
-           if not nodes:
-               node_id = api.AddNode(auth, site_fields['login_base'], node_fields)
+           #nodes = api.GetNodes(auth, [node_fields['hostname']])
+           nodes = GetNodes([node_fields['hostname']])
+           if not nodes:
+               #node_id = api.AddNode(auth, site_fields['login_base'], node_fields)
+               node_id = AddNode(site_fields['login_base'], node_fields)
                node_fields['node_id'] = node_id
                node = node_fields
                nodes.append(node_fields)
@@ -100,7 +106,8 @@ class add_test_data(Test):
 
            # Add node network
            if not node['nodenetwork_ids']:
-               nodenetwork_id = api.AddNodeNetwork(auth, node_fields['hostname'], node_fields)
+               #nodenetwork_id = api.AddNodeNetwork(auth, node_fields['hostname'], node_fields)
+               nodenetwork_id = AddNodeNetwork(node_fields['hostname'], node_fields)
                if self.config.verbose:
                    utils.header("Added test nodenetwork")
            else:
@@ -108,9 +115,11 @@ class add_test_data(Test):
                    utils.header("Nodenetwork found")   
        
        # Add Test slice
-       slices = api.GetSlices(auth, [slice_fields['name']])
+       #slices = api.GetSlices(auth, [slice_fields['name']])
+       slices = GetSlices([slice_fields['name']])
        if not slices:
-           slice_id = api.AddSlice(auth, slice_fields)
+           #slice_id = api.AddSlice(auth, slice_fields)
+           slice_id = AddSlice(slice_fields)
            slice_fields['slice_id'] = slice_id
            slice = slice_fields
            if self.config.verbose:
@@ -124,7 +133,8 @@ class add_test_data(Test):
        node_ids = [n['node_id'] for n in nodes]
        node_ids = filter(lambda node_id: node_id not in slice['node_ids'], node_ids)
        if node_ids:
-           api.AddSliceToNodes(auth, slice['name'], node_ids)
+           #api.AddSliceToNodes(auth, slice['name'], node_ids)
+           AddSliceToNodes(slice['name'], node_ids)
            if self.config.verbose:
                utils.header("Added test slice to test nodes")
        else:
@@ -132,9 +142,11 @@ class add_test_data(Test):
                utils.header("Test slice found on test nodes")
 
        # Add test person
-       persons = api.GetPersons(auth, [person_fields['email']])
+       #persons = api.GetPersons(auth, [person_fields['email']])
+       persons = GetPersons([person_fields['email']])
        if not persons:
-           person_id = api.AddPerson(auth, person_fields)
+           #person_id = api.AddPerson(auth, person_fields)
+           person_id = AddPerson(person_fields)
            person_fields['person_id'] = person_id
            person = person_fields
            if self.config.verbose:
@@ -145,11 +157,12 @@ class add_test_data(Test):
                utils.header("Test person found")
        
        # Add roles to person
-       api.AddRoleToPerson(auth, 'user', person['email'])
-
+       #api.AddRoleToPerson(auth, 'user', person['email'])
+       AddRoleToPerson('user', person['email'])
        # Add person to site
        if site['site_id'] not in person['site_ids']:   
-           api.AddPersonToSite(auth, person['email'], site['login_base'])
+           #api.AddPersonToSite(auth, person['email'], site['login_base'])
+           AddPersonToSite(person['email'], site['login_base'])
            if self.config.verbose:
                utils.header("Added test person to test site")
        else:
@@ -158,7 +171,8 @@ class add_test_data(Test):
 
        # Add person to slice
        if slice['slice_id'] not in person['slice_ids']:
-            api.AddPersonToSlice(auth, person_fields['email'], slice_fields['name'])
+            #api.AddPersonToSlice(auth, person_fields['email'], slice_fields['name'])
+           AddPersonToSlice(person_fields['email'], slice_fields['name'])
            if self.config.verbose:
                utils.header("Added test person to slice")
        else:
@@ -166,5 +180,5 @@ class add_test_data(Test):
                utils.header("Test person found on test slice")
 
 if __name__ == '__main__':
-    args = typle(sys.argv[1:])
+    args = tuple(sys.argv[1:])
     add_test_data()(*args)