import random
import string
import unittest
-import sfa.util.xmlrpcprotocol as xmlrpc
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
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.util.rspec import *
+from sfa.trust.sfaticket import SfaTicket
from sfa.client import sfi
def random_string(size):
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.registry = xmlrpcprotocol.server_proxy(config.SFI_REGISTRY, key_file, cert_file)
+ self.aggregate = xmlrpcprotocol.server_proxy(SFI_AGGREGATE, key_file, cert_file)
+ self.sm = xmlrpcprotocol.server_proxy(config.SFI_SM, key_file, cert_file)
+ self.cm = xmlrpcprotocol.server_proxy(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
server_exception = False
try:
callable(self.credential)
- except ServerException:
+ except xmlrpcprotocol.ServerException:
server_exception = True
finally:
if self.type in ['user'] and not server_exception:
BasicTestCase.setUp(self)
def testGetSlices(self):
- self.aggregate.get_slices(self.credential)
+ self.aggregate.ListSlices(self.credential)
def testGetResources(self):
# available 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, self.slice['hrn'], rspec)
+ 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'])
+ 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')
class ComponentTest(BasicTestCase):
def setUp(self):
BasicTestCase.setUp(self)
+ self.slice_cred = self.client.get_credential(self.slice['hrn'], 'slice')
def testStartSlice(self):
- self.cm.start_slice(self.slice['hrn'])
+ self.cm.start_slice(self.slice_cred, self.slice['hrn'])
def testStopSlice(self):
- self.cm.stop_slice(self.slice['hrn'])
+ self.cm.stop_slice(self.slice_cred, self.slice['hrn'])
def testDeleteSlice(self):
- self.cm.delete_slice(self.slice['hrn'])
+ self.cm.DeleteSliver(self.slice_cred, self.slice['hrn'],"call-id-delete-slice-cm")
def testRestartSlice(self):
- self.cm.restart_slice(self.slice['hrn'])
+ self.cm.restart_slice(self.slice_cred, self.slice['hrn'])
def testGetSlices(self):
- self.cm.get_slices(self.slice['hrn'])
+ self.cm.ListSlices(self.slice_cred, 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)
+ ticket = self.aggregate.get_ticket(slice_cred, self.slice['hrn'], rspec)
+ self.cm.redeem_ticket(slice_cred, ticket)
def test_names(testcase):
return [name for name in dir(testcase) if name.startswith('test')]
-def create_slice(client):
+def CreateSliver(client):
# register a slice that will be used for some test
authority = get_authority(client.hrn)
auth_cred = client.get_credential(authority, 'authority')
client.registry.register(auth_cred, slice_record)
return slice_record
-def delete_slice(cleint, slice):
+def DeleteSliver(client, slice):
authority = get_authority(client.hrn)
auth_cred = client.get_credential(authority, 'authority')
if slice:
# create the test slice if necessary
if options.all or options.slicemgr or options.aggregate \
or options.component:
- test_slice = create_slice(client)
+ test_slice = CreateSliver(client)
if options.registry or options.all:
for name in test_names(RegistryTest):
unittest.TextTestRunner(verbosity=2).run(suite)
# remove teset slice
- delete_slice(client, test_slice)
+ DeleteSliver(client, test_slice)