X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=tests%2FtestInterfaces.py;h=520d94ad4e61a0f4dbed19b5a08004483b830390;hp=61c0e2d35fe74d3a10667897ed19193108a170f2;hb=HEAD;hpb=bf6667e58e514e3cace7e795772b5bde3aeed1aa diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index 61c0e2d3..520d94ad 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -1,19 +1,19 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import sys import os import random import string import unittest -import sfa.util.xmlrpcprotocol as xmlrpc + from unittest import TestCase from optparse import OptionParser -from sfa.util.xmlrpcprotocol import ServerException -from sfa.util.namespace import * +from sfa.util.xrn import get_authority from sfa.util.config import * from sfa.trust.certificate import * from sfa.trust.credential import * -from sfa.util.sfaticket import * +from sfa.trust.sfaticket import SfaTicket from sfa.client import sfi +from sfa.client.sfaserverproxy import SfaServerProxy, ServerException def random_string(size): return "".join(random.sample(string.letters, size)) @@ -23,15 +23,14 @@ class Client: aggregate = None sm = None cm = None - user = None key = None cert = None credential = None - type = None + type = None def __init__(self, options): try: self.config = config = Config(options.config_file) except: - print "failed to read config_file %s" % options.config_file + print("failed to read config_file %s" % options.config_file) sys.exit(1) key_path = os.path.dirname(options.config_file) user_name = self.config.SFI_USER.split('.')[-1:][0] @@ -42,44 +41,46 @@ class Client: self.cert.set_pubkey(self.key) self.cert.set_issuer(self.key, self.config.SFI_USER) self.cert.sign() - self.cert.save_to_file(cert_file) + self.cert.save_to_file(cert_file) SFI_AGGREGATE = config.SFI_SM.replace('12347', '12346') SFI_CM = 'http://' + options.cm_host + ':12346' - self.registry = xmlrpc.get_server(config.SFI_REGISTRY, key_file, cert_file) - self.aggregate = xmlrpc.get_server(SFI_AGGREGATE, key_file, cert_file) - self.sm = xmlrpc.get_server(config.SFI_SM, key_file, cert_file) - self.cm = xmlrpc.get_server(SFI_CM, key_file, cert_file) - self.user = config.SFI_USER + self.registry = SfaServerProxy(config.SFI_REGISTRY, key_file, cert_file) + self.aggregate = SfaServerProxy(SFI_AGGREGATE, key_file, cert_file) + self.sm = SfaServerProxy(config.SFI_SM, key_file, cert_file) + self.cm = SfaServerProxy(SFI_CM, key_file, cert_file) + self.hrn = config.SFI_USER # XX defaulting to user, but this should be configurable so we can # test from components persepctive self.type = 'user' - - def get_credential(self, hrn = None, type = 'user'): - if not hrn: hrn = self.user - if hrn == self.user: + self.credential = self.GetCredential(self.hrn) + + def GetCredential(self, hrn = None, type = 'user'): + if not hrn: hrn = self.hrn + if hrn == self.hrn: cert = self.cert.save_to_string(save_parents=True) request_hash = self.key.compute_hash([cert, 'user', hrn]) - self.credential = self.registry.get_self_credential(cert, type, hrn, request_hash) - return self.credential + credential = self.registry.get_self_credential(cert, type, hrn, request_hash) + return credential else: if not self.credential: - self.get_credential(self.user, 'user') - return self.registry.get_credential(self.credential, type, hrn) + self.credential = self.GetCredential(self.hrn, 'user') + return self.registry.GetCredential(self.credential, type, hrn) class BasicTestCase(unittest.TestCase): - def __init__(self, testname, client): + def __init__(self, testname, client, test_slice=None): unittest.TestCase.__init__(self, testname) self.client = client - + self.slice = test_slice + def setUp(self): self.registry = self.client.registry self.aggregate = self.client.aggregate self.sm = self.client.sm self.cm = self.client.cm self.credential = self.client.credential - self.hrn = self.client.user - self.type = self.client.type - + self.hrn = self.client.hrn + self.type = self.client.type + # Registry tests class RegistryTest(BasicTestCase): @@ -90,72 +91,84 @@ class RegistryTest(BasicTestCase): BasicTestCase.setUp(self) def testGetSelfCredential(self): - cred = self.client.get_credential() + cred = self.client.GetCredential() # this will raise an openssl error if the credential string isnt valid Credential(string=cred) def testRegister(self): authority = get_authority(self.hrn) - auth_record = {'hrn': ".".join([authority, random_string(10)]), + auth_cred = self.client.GetCredential(authority, 'authority') + auth_record = {'hrn': '.'.join([authority, random_string(10).lower()]), 'type': 'authority'} - node_record = {'hrn': ".".join([authority, random_string(10)]), - 'type': 'node'} - slice_record = {'hrn': ".".join([authority, random_string(10)]), + node_record = {'hrn': '.'.join([authority, random_string(10)]), + 'type': 'node', + 'hostname': random_string(6) + '.' + random_string(6)} + slice_record = {'hrn': '.'.join([authority, random_string(10)]), 'type': 'slice', 'researcher': [self.hrn]} - user_record = {'hrn': ".".join([authority, random_string(10)]), - 'type': 'user'} + user_record = {'hrn': '.'.join([authority, random_string(10)]), + 'type': 'user', + 'email': random_string(6) +'@'+ random_string(5) +'.'+ random_string(3), + 'first_name': random_string(7), + 'last_name': random_string(7)} all_records = [auth_record, node_record, slice_record, user_record] for record in all_records: try: - self.registry.register(self.cred, record) - self.registry.resolve(self.cred, record['hrn']) + self.registry.Register(auth_cred, record) + self.registry.Resolve(self.credential, record['hrn']) except: raise finally: - self.registry.remove(record['hrn']) + try: self.registry.Remove(auth_cred, record['type'], record['hrn']) + except: pass + - def testRegisterPeerObject(self): assert True - + def testUpdate(self): - record = self.registry.resolve(self.credential, self.hrn) - self.registry.update(record) + authority = get_authority(self.hrn) + auth_cred = self.client.GetCredential(authority, 'authority') + records = self.registry.Resolve(self.credential, self.hrn) + if not records: assert False + record = records[0] + self.registry.update(auth_cred, record) def testResolve(self): authority = get_authority(self.hrn) - self.registry.resolve(self.credential, self.hrn) - + self.registry.Resolve(self.credential, self.hrn) + def testRemove(self): + authority = get_authority(self.hrn) + auth_cred = self.client.GetCredential(authority, 'authority') record = {'hrn': ".".join([authority, random_string(10)]), - 'type': 'user'} - self.registry.register(self.credential, user_record) - self.registry.remove(self.credential, user_record['hrn']) + 'type': 'slice'} + self.registry.Register(auth_cred, record) + self.registry.Remove(auth_cred, record['type'], record['hrn']) # should generate an exception try: - self.registry.resolve(self.credential, record['hrn']) + self.registry.Resolve(self.credential, record['hrn']) assert False - except: + except: assert True - + def testRemovePeerObject(self): assert True def testList(self): - authority = get_authority(self.client.user) - self.registry.list(self.credential, authority) - + authority = get_authority(self.client.hrn) + self.registry.List(self.credential, authority) + def testGetRegistries(self): self.registry.get_registries(self.credential) - + def testGetAggregates(self): self.registry.get_aggregates(self.credential) def testGetTrustedCerts(self): # this should fail unless we are a node callable = self.registry.get_trusted_certs - server_exception = False + server_exception = False try: callable(self.credential) except ServerException: @@ -163,27 +176,14 @@ class RegistryTest(BasicTestCase): finally: if self.type in ['user'] and not server_exception: assert False - - class AggregateTest(BasicTestCase): - slice = None def setUp(self): BasicTestCase.setUp(self) - - # register a slice that will be used for some test - slice_record = {'hrn': ".".join([authority, random_string(10)]), - 'type': 'slice', 'researcher': [self.hrn]} - self.registry.register(self.credential, slice_record) - self.slice = slice_record - - def tearDown(self): - # remove the test slice - self.registry.remove(self.credential, self.slice['hrn']) def testGetSlices(self): - self.aggregate.get_slices(self.credential) + self.aggregate.ListSlices(self.credential) def testGetResources(self): # available resources @@ -195,63 +195,40 @@ class AggregateTest(BasicTestCase): RSpec(xml=slice_rspec) def testCreateSlice(self): - # get availabel resources + # get availabel resources rspec = self.aggregate.get_resources(self.credential) - slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') - self.aggregate.create_slice(slice_credential, rspec) + slice_credential = self.client.GetCredential(self.slice['hrn'], 'slice') + self.aggregate.CreateSliver(slice_credential, self.slice['hrn'], rspec) def testDeleteSlice(self): - slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') - self.aggregate.delete_slice(slice_credential, self.slice['hrn']) + slice_credential = self.client.GetCredential(self.slice['hrn'], 'slice') + self.aggregate.DeleteSliver(slice_credential, self.slice['hrn'],"call-id-delete-slice") def testGetTicket(self): - slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') + slice_credential = self.client.GetCredential(self.slice['hrn'], 'slice') rspec = self.aggregate.get_resources(self.credential) - ticket = self.aggregate.get_ticket(slice_credential, self.slice['hrn'], rspec) + ticket = self.aggregate.GetTicket(slice_credential, self.slice['hrn'], rspec) # will raise an exception if the ticket inst valid - SfaTicket(string=ticket) - -class SlicemgrTest(AggregateTest): - def setUp(self): - AggregateTest.setUp(self) - - # force calls to go through slice manager - self.aggregate = self.sm - -class ComponentTest(BasicTestCase): - slice = None - def setUp(self): - BasicTestCase.setUp(self) - AggregateTest.setUp(self) - - def tearDown(self): - AggregateTest.tearDown(self) - - def testStartSlice(self): - self.cm.start_slice(self.slice['hrn']) - - def testStopSlice(self): - self.cm.stop_slice(self.slice['hrn']) - - def testDeleteSlice(self): - self.cm.delete_slice(self.slice['hrn']) - - def testRestartSlice(self): - self.cm.restart_slice(self.slice['hrn']) - - def testGetSlices(self): - self.cm.get_slices(self.slice['hrn']) - - def testRedeemTicket(self): - slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') - rspec = self.aggregate.get_resources(self.credential) - ticket = self.aggregate.get_ticket(slice_credential, self.slice['hrn'], rspec) - self.cm.redeem_ticket(slice_credential, ticket) - + SfaTicket(string=ticket) def test_names(testcase): return [name for name in dir(testcase) if name.startswith('test')] - + +def CreateSliver(client): + # register a slice that will be used for some test + authority = get_authority(client.hrn) + auth_cred = client.GetCredential(authority, 'authority') + slice_record = {'hrn': ".".join([authority, random_string(10)]), + 'type': 'slice', 'researcher': [client.hrn]} + client.registry.Register(auth_cred, slice_record) + return slice_record + +def DeleteSliver(client, slice): + authority = get_authority(client.hrn) + auth_cred = client.GetCredential(authority, 'authority') + if slice: + client.registry.Remove(auth_cred, 'slice', slice['hrn']) + if __name__ == '__main__': args = sys.argv @@ -265,36 +242,36 @@ if __name__ == '__main__': default=False, help='run registry tests') parser.add_option('-a', '--aggregate', dest='aggregate', action='store_true', default=False, help='run aggregate tests') - parser.add_option('-s', '--slicemgr', dest='slicemgr', action='store_true', - default=False, help='run slicemgr tests') parser.add_option('-c', '--component', dest='component', action='store_true', default=False, help='run component tests') - parser.add_option('-d', '--cm_host', dest='cm_host', default=default_cm, + parser.add_option('-d', '--cm_host', dest='cm_host', default=default_cm, help='dns name of component to test. default is %s' % default_cm) parser.add_option('-A', '--all', dest='all', action='store_true', default=False, help='run component tests') - + options, args = parser.parse_args() suite = unittest.TestSuite() client = Client(options) - # bootstrap the users credential - client.get_credential() + test_slice = {} + + # create the test slice if necessary + if options.all or options.aggregate or options.component: + test_slice = CreateSliver(client) if options.registry or options.all: for name in test_names(RegistryTest): suite.addTest(RegistryTest(name, client)) - if options.aggregate or options.all: + if options.aggregate or options.all: for name in test_names(AggregateTest): - suite.addTest(AggregateTest(name, client)) - - if options.slicemgr or options.all: - for name in test_names(SlicemgrTest): - suite.addTest(SlicemgrTest(name, client)) + suite.addTest(AggregateTest(name, client, test_slice)) - if options.component or options.all: + if options.component or options.all: for name in test_names(ComponentTest): - suite.addTest(ComponentTest(name, client)) + suite.addTest(ComponentTest(name, client, test_slice)) + # run tests unittest.TextTestRunner(verbosity=2).run(suite) + # remove teset slice + DeleteSliver(client, test_slice)