X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testsuites%2Frubbos%2Frun_rubbos.py;h=904cd8a23e356a254b16f1d709c7aa431a96582a;hb=2b868477e04ec3b7a1bf3e3a678a12fef3325263;hp=c17f0d3fab9f7e87e31b7e20f0052fab502244dd;hpb=4773636be28c52e57f8b9ca24ed5d13c047129cf;p=bottlenecks.git diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py index c17f0d3f..904cd8a2 100755 --- a/testsuites/rubbos/run_rubbos.py +++ b/testsuites/rubbos/run_rubbos.py @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - import os import argparse import time @@ -26,7 +25,7 @@ from novaclient.client import Client as NovaClient parser = argparse.ArgumentParser() parser.add_argument("-c", "--conf", help="configuration files for the testcase, in yaml format", - default="/tmp/rubbos_1-1-1.yaml") + default="/home/opnfv/bottlenecks/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml") args = parser.parse_args() #-------------------------------------------------- @@ -81,10 +80,10 @@ def rubbos_stack_satisfy(name="bottlenecks_rubbos_stack", status="CREATE_COMPLET for stack in heat.stacks.list(): if status == None and stack.stack_name == name: # Found target stack - print "Found stack, name=" + stack.stack_name + print "Found stack, name=" + str(stack.stack_name) return True elif stack.stack_name == name and stack.stack_status==status: - print "Found stack, name=" + stack.stack_name + ", status=" + stack.stack_status + print "Found stack, name=" + str(stack.stack_name) + ", status=" + str(stack.stack_status) return True return False @@ -105,17 +104,17 @@ def rubbos_env_cleanup(): for keypair in nova.keypairs.list(): if keypair.name.find("bottlenecks_rubbos") >= 0: - print "Delete keypair, id:" + keypair.id + ", name:" + keypair.name + print "Delete keypair, id:" + str(keypair.id) + ", name:" + str(keypair.name) nova.keypairs.delete(keypair.id) for flavor in nova.flavors.list(): if flavor.name.find("bottlenecks_rubbos") >= 0: - print "Delete flavor, id:" + str(flavor.id) + ", name:" + flavor.name + print "Delete flavor, id:" + str(flavor.id) + ", name:" + str(flavor.name) nova.flavors.delete(flavor.id) for stack in heat.stacks.list(): if stack.stack_name.find("bottlenecks_rubbos") >= 0: - print "Delete stack, id: " + str(stack.id) + ", name:" + str(stack.stack_name + print "Delete stack, id: " + str(stack.id) + ", name:" + str(stack.stack_name) heat.stacks.delete(stack.id) timeInProgress = 0 @@ -165,7 +164,7 @@ def rubbos_create_flavors(name="bottlenecks_rubbos_flavor", ram=4096, vcpus=2, d nova = _get_nova_client() nova.flavors.create(name=name, ram=ram, vcpus=vcpus, disk=disk) -def rubbos_create_instance(template_file, rubbos_parameters=None, stack_name="bottlenecks_rubbos_stack"): +def rubbos_create_instances(template_file, rubbos_parameters=None, stack_name="bottlenecks_rubbos_stack"): print "========== Create rubbos instances ==========" heat = _get_heat_client() @@ -175,7 +174,7 @@ def rubbos_create_instance(template_file, rubbos_parameters=None, stack_name="bo stack_id = stack['stack']['id'] stack_status = heat.stacks.get(stack_id).stack_status - print "Created stack, id=" + stack_id + ", status=" + stack_status + print "Created stack, id=" + str(stack_id) + ", status=" + str(stack_status) timeInProgress= 0 while stack_status == "CREATE_IN_PROGRESS" and timeInProgress < 150: @@ -187,16 +186,76 @@ def rubbos_create_instance(template_file, rubbos_parameters=None, stack_name="bo print "After %d seconds, the stack's status is [%s]" %(timeInProgress, stack_status) return True if stack_status == "CREATE_COMPLETE" else False +def get_instances(nova_client): + try: + instances = nova_client.servers.list(search_opts={'all_tenants': 1}) + return instances + except Exception, e: + print "Error [get_instances(nova_client)]:", e + return None + def rubbos_run(): - pass + print "========== run rubbos ===========" + + nova = _get_nova_client() + + instances = get_instances(nova) + control_servers = [] + client_servers = [] + web_servers = [] + cjdbc_controller = [] + database_servers = [] + for instance in instances: + name = getattr(instance, 'name') + private_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'fixed'] + public_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'floating'] + + if name.find("control") > 0: + control_servers.append(''.join(str(name)+':'+public_ip[0]+':'+private_ip[0])) + if name.find("client") > 0: + client_servers.append(''.join(str(name)+':'+private_ip[0])) + if name.find("tomcat") > 0: + web_servers.append(''.join(str(name)+':'+private_ip[0])) + if name.find("cjdbc") > 0: + cjdbc_controller.append(''.join(str(name)+':'+private_ip[0])) + if name.find("mysql") > 0: + database_servers.append(''.join(str(name)+':'+private_ip[0])) + + f = open('rubbos.conf', 'w') + f.write('[Controller]\n\n') + f.write('controller=') + for i in control_servers: + f.write(i+',') + f.write('\n\n') + f.write('[Hosts]\n\n') + f.write('client_servers=') + for i in client_servers: + f.write(i + ',') + f.write('\n') + f.write('web_servers=') + for i in web_servers: + f.write(i+',') + f.write('\n') + f.write('cjdbc_controller=') + for i in cjdbc_controller: + f.write(i+',') + f.write('\n') + f.write('database_servers=') + for i in database_servers: + f.write(i + ',') + f.close() + f = open('rubbos.conf','r') + line = f.readlines() + f.close() + for i in line: + print(i) def main(): global Heat_template global Bottlenecks_repo_dir global image_url - Bottlenecks_repo_dir = "/tmp/opnfvrepo/bottlenecks" - #Bottlenecks_repo_dir = "/root/wyg/bottlenecks" # Test dir in local env - + Bottlenecks_repo_dir = "/home/opnfv/bottlenecks" # same in Dockerfile, docker directory + image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/bottlenecks-trusty-server.img' if not (args.conf): @@ -205,10 +264,11 @@ def main(): else: Heat_template = args.conf + #TO DO:the parameters are all used defaults here, it should be changed depends on what it is really named parameters={'image': 'bottlenecks_rubbos_image', 'key_name': 'bottlenecks_rubbos_keypair', - 'flavor': 'm1.small', - 'public_net': 'ext-net'} + 'flavor': 'bottlenecks_rubbos_flavor', + 'public_net': os.environ.get('EXTERNAL_NET')} print "Heat_template_file: " + Heat_template print "parameters:\n" + str(parameters)