From ac25239d2d121071953223cb0973de3f629d3251 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 31 Jan 2008 20:11:02 +0000 Subject: [PATCH] no longer rely on plcsh. Config will either import PLC.Shell or use xmlrpc, so use config.api --- qaapi/qa/tests/add_test_data.py | 45 ++++++++++------------------ qaapi/qa/tests/boot_node.py | 8 +++-- qaapi/qa/tests/check_boot_state.pyc | Bin 0 -> 1999 bytes qaapi/qa/tests/delete_test_data.py | 9 ++++-- qaapi/qa/tests/get_boot_state.py | 1 + qaapi/qa/tests/sync_person_key.py | 14 +++++---- 6 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 qaapi/qa/tests/check_boot_state.pyc diff --git a/qaapi/qa/tests/add_test_data.py b/qaapi/qa/tests/add_test_data.py index d4983d6..9dc84ed 100644 --- a/qaapi/qa/tests/add_test_data.py +++ b/qaapi/qa/tests/add_test_data.py @@ -1,5 +1,4 @@ -#!/usr/bin/env /usr/share/plc_api/plcsh - +#!/usr/bin/python import os,sys from Test import Test from qa import utils @@ -9,7 +8,8 @@ class add_test_data(Test): Adds the test data found in config to the plc db """ def call(self): - + 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'] required_node_fields = ['TEST_NODE_TYPE', 'TEST_NODE_METHOD', 'TEST_NODE_HOSTNAME', 'TEST_NODE_IP', @@ -70,11 +70,9 @@ class add_test_data(Test): # Add Test site - #sites = api.GetSites(auth, {'login_base': site_fields['login_base']}) - sites = GetSites({'login_base': site_fields['login_base']}) + sites = api.GetSites(auth, {'login_base': site_fields['login_base']}) if not sites: - #site_id = api.AddSite(auth, site_fields) - site_id = AddSite(site_fields) + site_id = api.AddSite(auth, site_fields) site_fields['site_id'] = site_id site = site_fields if self.config.verbose: @@ -86,11 +84,9 @@ class add_test_data(Test): # Add Test nodes for node_fields in node_list: - #nodes = api.GetNodes(auth, [node_fields['hostname']]) - nodes = GetNodes([node_fields['hostname']]) + nodes = api.GetNodes(auth, [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_id = api.AddNode(auth, site_fields['login_base'], node_fields) node_fields['node_id'] = node_id node = node_fields nodes.append(node_fields) @@ -103,8 +99,7 @@ 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 = AddNodeNetwork(node_fields['hostname'], node_fields) + nodenetwork_id = api.AddNodeNetwork(auth, node_fields['hostname'], node_fields) if self.config.verbose: utils.header("Added test nodenetwork") else: @@ -112,11 +107,9 @@ class add_test_data(Test): utils.header("Nodenetwork found") # Add Test slice - #slices = api.GetSlices(auth, [slice_fields['name']]) - slices = GetSlices([slice_fields['name']]) + slices = api.GetSlices(auth, [slice_fields['name']]) if not slices: - #slice_id = api.AddSlice(auth, slice_fields) - slice_id = AddSlice(slice_fields) + slice_id = api.AddSlice(auth, slice_fields) slice_fields['slice_id'] = slice_id slice = slice_fields if self.config.verbose: @@ -130,8 +123,7 @@ 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) - AddSliceToNodes(slice['name'], node_ids) + api.AddSliceToNodes(auth, slice['name'], node_ids) if self.config.verbose: utils.header("Added test slice to test nodes") else: @@ -139,11 +131,9 @@ class add_test_data(Test): utils.header("Test slice found on test nodes") # Add test person - #persons = api.GetPersons(auth, [person_fields['email']]) - persons = GetPersons([person_fields['email']]) + persons = api.GetPersons(auth, [person_fields['email']]) if not persons: - #person_id = api.AddPerson(auth, person_fields) - person_id = AddPerson(person_fields) + person_id = api.AddPerson(auth, person_fields) person_fields['person_id'] = person_id person = person_fields if self.config.verbose: @@ -154,12 +144,10 @@ class add_test_data(Test): utils.header("Test person found") # Add roles to person - #api.AddRoleToPerson(auth, 'user', person['email']) - AddRoleToPerson('user', person['email']) + api.AddRoleToPerson(auth, 'user', person['email']) # Add person to site if site['site_id'] not in person['site_ids']: - #api.AddPersonToSite(auth, person['email'], site['login_base']) - AddPersonToSite(person['email'], site['login_base']) + api.AddPersonToSite(auth, person['email'], site['login_base']) if self.config.verbose: utils.header("Added test person to test site") else: @@ -168,8 +156,7 @@ 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']) - AddPersonToSlice(person_fields['email'], slice_fields['name']) + api.AddPersonToSlice(auth, person_fields['email'], slice_fields['name']) if self.config.verbose: utils.header("Added test person to slice") else: diff --git a/qaapi/qa/tests/boot_node.py b/qaapi/qa/tests/boot_node.py index 5d043c5..cc56c87 100644 --- a/qaapi/qa/tests/boot_node.py +++ b/qaapi/qa/tests/boot_node.py @@ -1,4 +1,4 @@ -#!/usr/bin/env /usr/share/plc_api/plcsh +#!/usr/bin/python import os,sys import base64 @@ -13,14 +13,16 @@ class boot_node(Test): """ def call(self, hostname, image_type = 'node-iso', disk_size="4G"): + api = self.config.api + auth = self.config.auth tdir = "/tmp/" # validate hostname - nodes = GetNodes([hostname], ['hostname']) + nodes = api.GetNodes(auth, [hostname], ['hostname']) if not nodes: raise Exception, "No such node %(hostname)s" % locals() - bootimage = GetBootMedium(hostname, image_type, '') + bootimage = api.GetBootMedium(auth, hostname, image_type, '') bootimage_path = '/%(tdir)s/%(hostname)s-bootcd.iso' % locals() if self.config.verbose: diff --git a/qaapi/qa/tests/check_boot_state.pyc b/qaapi/qa/tests/check_boot_state.pyc new file mode 100644 index 0000000000000000000000000000000000000000..61c50bbe6c3f9d661fbf05ae16a57921c632a067 GIT binary patch literal 1999 zcmZWq&2Aev5dOIOv(|PR$4=@rXhReYAftr^VwN7QWfG0lX#8d>=qQrF@p2JIAT# zjOmUyKgjJb0WdZmH1tgb)56CHqZX30fdKm76cB5z^($AhE$gf(u5>{6nx~|1OlUU_ z62G9_jx8BoIzzfH*%kqTEKjKlI^m?EET57O5a0b@Z0Nk6XxCf_0Bq;vYSz|o?wV5_ zhm*IPlZqAn>J3*e+IGtQ00n z%5|b}-NHJ?D#qdniu+Om9829j`ZaKieSBq)hHzK-iXXrpO4V=7UaO|qR~?uh%nl|IF1m0r6d#Fu%jGRn zt3ECOchHC)V%35G1fBo1-)$mt0QV9b;E4*THw5~(2`ou%iN&|&5|C8~XMBF{Tnyl*XROQ^e*)mP=Iy4kUOyY$TsZM8DHj1t zHH0Sd-+l^^yQ-p`iz{tQ&skBB(OGE%Fqy#hj=|Eg9@o;^f=p)cNVtlDpR&SJut^^* zhlQtN%w4HMSB~w3Wk6;N8_u$try(w{iQhOwK9Nxskfe@1_W}I)A*TgfR|b^A$%=l#jqBlCDHJC*pAOKtAD`4B3HXFMRj~fZ^25X~^>|pA9cvH5)Q{ z_Cv1fayDFM*}@K&*+%&3d_G-V1%`Q66h~4M&jnj`)t=gGJyAV%6z!>dQ42lwM8zsr z`|3D4RIxf#2hnb8U)@*7(Qy=Jb_i3NN>!$52xpqkov91iio0oQT%M-M7hC!_jwFx8 zL$NLXhBswzA8G?R&up2dGHMW7fF(xGhYIjlKKV>CA+lwbJe0NMNZzD?m^=}Y6cyKt zqA9AZn!FEMSvB$DaSIodXF@}7xdh