From 39342467e5e647ae605f40bed04c5a3b3bc50f5e Mon Sep 17 00:00:00 2001 From: Mofassir Arif Date: Tue, 22 Dec 2015 04:17:57 -0800 Subject: [PATCH] Restructured QTIP directories and CLI I have changed the arguments for the CLI and now QTIP takes a file along withthe name of the lab to run on Right now only the config files for the dell lab have been added, These will increase when we make QTIP available for other labs. I have also added the provision of changing the public network from the config file and some leftover files from previous verisons have been remove Change-Id: Ifeb01d80099eab06dc77a7b2e07097ebb17a13a2 Signed-off-by: Mofassir Arif --- benchmarks/playbooks/sys_info_pbook.yaml | 2 +- benchmarks/playbooks/whetstone.yaml | 16 +-- data/hosts | 6 +- data/my_key.pem | 50 ++++---- func/cli.py | 75 +++++++----- func/env_setup.py | 8 ++ func/spawn_vm.py | 18 +-- heat/HeatTemplate.yaml | 120 ------------------- heat/SampleHeat.yaml | 8 +- heat/TEST.yaml | 133 --------------------- heat/WorkingTemplate.yaml | 70 ----------- heat/heat.yaml | 91 -------------- test_cases/SampleHeat.yaml | 103 ---------------- test_cases/TESTER.yaml | 36 ------ .../compute/.whetstone_serial.yaml.swp | Bin .../compute/dhrystone_parallel.yaml | 0 .../compute/dhrystone_serial.yaml | 0 .../compute/dpi_parallel.yaml | 6 +- .../{ => dell_santa_clara}/compute/dpi_serial.yaml | 8 -- .../compute/ssl_parallel.yaml | 0 .../{ => dell_santa_clara}/compute/ssl_serial.yaml | 0 .../compute/whetstone_parallel.yaml | 0 .../compute/whetstone_serial.yaml | 0 .../network/iperf_topology_1.yaml | 0 .../network/iperf_topology_2.yaml | 0 .../network/iperf_topology_3.yaml | 0 .../{ => dell_santa_clara}/network/netperf.yaml | 0 .../{ => dell_santa_clara}/network/pktgen.yaml | 0 .../{ => dell_santa_clara}/storage/fio_2.yaml | 0 .../storage/fio_parallel.yaml | 0 test_list/compute.txt | 2 + test_list/network.txt | 0 test_list/storage.txt | 0 33 files changed, 102 insertions(+), 650 deletions(-) delete mode 100644 heat/HeatTemplate.yaml delete mode 100644 heat/TEST.yaml delete mode 100644 heat/WorkingTemplate.yaml delete mode 100644 heat/heat.yaml delete mode 100644 test_cases/SampleHeat.yaml delete mode 100644 test_cases/TESTER.yaml rename test_cases/{ => dell_santa_clara}/compute/.whetstone_serial.yaml.swp (100%) rename test_cases/{ => dell_santa_clara}/compute/dhrystone_parallel.yaml (100%) rename test_cases/{ => dell_santa_clara}/compute/dhrystone_serial.yaml (100%) rename test_cases/{ => dell_santa_clara}/compute/dpi_parallel.yaml (89%) rename test_cases/{ => dell_santa_clara}/compute/dpi_serial.yaml (77%) rename test_cases/{ => dell_santa_clara}/compute/ssl_parallel.yaml (100%) rename test_cases/{ => dell_santa_clara}/compute/ssl_serial.yaml (100%) rename test_cases/{ => dell_santa_clara}/compute/whetstone_parallel.yaml (100%) rename test_cases/{ => dell_santa_clara}/compute/whetstone_serial.yaml (100%) rename test_cases/{ => dell_santa_clara}/network/iperf_topology_1.yaml (100%) rename test_cases/{ => dell_santa_clara}/network/iperf_topology_2.yaml (100%) rename test_cases/{ => dell_santa_clara}/network/iperf_topology_3.yaml (100%) rename test_cases/{ => dell_santa_clara}/network/netperf.yaml (100%) rename test_cases/{ => dell_santa_clara}/network/pktgen.yaml (100%) rename test_cases/{ => dell_santa_clara}/storage/fio_2.yaml (100%) rename test_cases/{ => dell_santa_clara}/storage/fio_parallel.yaml (100%) create mode 100644 test_list/compute.txt create mode 100644 test_list/network.txt create mode 100644 test_list/storage.txt diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml index 19c811c7..12c735e9 100644 --- a/benchmarks/playbooks/sys_info_pbook.yaml +++ b/benchmarks/playbooks/sys_info_pbook.yaml @@ -11,7 +11,7 @@ shell: yum install libselinux-python -y when: ansible_os_family == "RedHat" - name: Install ansiblle copy dependencies if remote host has selinux enaled - shell: apt-get install libselinux-python -y + shell: apt-get install python-selinux -y when: ansible_os_family == "Debian" - name: system_info script copy copy: src=./info_script/info_collect.py dest={{home_dir.stdout}}/qtip_result/ diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml index c22ea433..847474fd 100644 --- a/benchmarks/playbooks/whetstone.yaml +++ b/benchmarks/playbooks/whetstone.yaml @@ -2,9 +2,9 @@ connection: local tasks: - name: making whetstone directory - file: path={{Dest_dir}}/whetstone state=directory + file: path=../../{{Dest_dir}}/whetstone state=directory - name: making temporary whetstone directory - file: path={{Dest_dir}}/whetstone/whetstone_temp state=directory + file: path=../../{{Dest_dir}}/whetstone/whetstone_temp state=directory - hosts: "{{role}}" @@ -54,13 +54,13 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/whetstone/whetstone_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/log/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{Dest_dir}}/whetstone/whetstone_temp + fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp with_items: copy_log_results.stdout_lines - name: cleaning tempT shell: rm -rf $HOME/tempT @@ -72,10 +72,10 @@ connection: local tasks: - name: extracting_json - shell: ( find {{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/whetstone/) + shell: ( find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/whetstone/) - name: making_logs_folder - shell: mkdir -p {{Dest_dir}}/whetstone/logs + shell: mkdir -p ../../{{Dest_dir}}/whetstone/logs - name: extracting_log - shell: ( find {{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/whetstone/logs) + shell: ( find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t ../../{{Dest_dir}}/whetstone/logs) - name: removing whetstone_temp - shell: rm -rf {{Dest_dir}}/whetstone/whetstone_temp + shell: rm -rf ../../{{Dest_dir}}/whetstone/whetstone_temp diff --git a/data/hosts b/data/hosts index 383d4109..5d73834b 100644 --- a/data/hosts +++ b/data/hosts @@ -1,3 +1,3 @@ -[host] -172.18.0.94 -172.18.0.93 +[1Run] +172.18.0.100 +172.18.0.99 diff --git a/data/my_key.pem b/data/my_key.pem index d0ffddcd..50a6b861 100644 --- a/data/my_key.pem +++ b/data/my_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/func/cli.py b/func/cli.py index 83a7c36f..87b205a0 100644 --- a/func/cli.py +++ b/func/cli.py @@ -16,41 +16,50 @@ import argparse class cli(): - + + def _getfile(self, filepath): + with open('test_list/'+filepath,'r') as finput: + _benchmarks=finput.readlines() + for items in range( len(_benchmarks)): + _benchmarks[items]=_benchmarks[items].rstrip() + return _benchmarks + def _getsuite(self, filepath): + for suites in range (len(filepath)): + xindex= filepath[suites].find('.') + filepath[suites]=filepath[suites][0:xindex] + return filepath def __init__(self): - + suite=[] parser = argparse.ArgumentParser() - - parser.add_argument('-s ', '--suite', help='compute network storage ') - parser.add_argument('-b', '--benchmark', - help='''COMPUTE: - dhrystone_serial.yaml \n - dhrystone_paralle.yaml \n - whetstone_serial.yaml \n - whetstone_parllel.yaml \n - dpi_serial.yaml \n - dpi_paralle.yaml \n - ssl_serial.yaml \n - ssl_parallel.yaml ''') + parser.add_argument('-l ', '--lab', help='Name of Lab on which being tested ') + parser.add_argument('-f', '--file', help = 'File in test_list with the list ' \ + 'of tests') args = parser.parse_args() - if not (args.suite or args.benchmark): - parser.error('Not enough arguments, -h, --help ') - sys.exit(0) - if (args.suite and args.benchmark): - obj = Env_setup() - if os.path.isfile('./test_cases/' + args.suite + - '/' + args.benchmark): + benchmarks = self._getfile(args.file) + suite.append(args.file) + suite=self._getsuite(suite) + for items in range (len(benchmarks)): + if (suite and benchmarks): - [benchmark, roles, vm_info, benchmark_details, pip] = obj.parse('./test_cases/' + args.suite - + '/' + args.benchmark) + roles='' + vm_info='' + benchmark_details='' + pip='' + obj='' + obj = Env_setup() + if os.path.isfile('./test_cases/'+args.lab.lower()+'/'+suite[0]+'/' +benchmarks[items]): + [benchmark, roles, vm_info, benchmark_details, pip] = obj.parse('./test_cases/' + +args.lab.lower()+'/'+suite[0]+'/'+benchmarks[items]) - if len(vm_info) != 0: - vmObj = SpawnVM(vm_info) - obj.callpingtest() - obj.callsshtest() - obj.updateAnsible() - dvr = Driver() - dvr.drive_bench(benchmark, obj.roles_dict.items(), benchmark_details, obj.ip_pw_dict.items()) - else: - print (args.benchmark, ' is not a Template in the Directory - \ - Enter a Valid file name. or use qtip.py -h for list') + if len(vm_info) != 0: + vmObj ='' + vmObj = SpawnVM(vm_info) + obj.callpingtest() + obj.callsshtest() + obj.updateAnsible() + dvr = Driver() + dvr.drive_bench(benchmark, obj.roles_dict.items(), benchmark_details, obj.ip_pw_dict.items()) + else: + print (args.benchmark, ' is not a Template in the Directory - \ + Enter a Valid file name. or use qtip.py -h for list') + \ No newline at end of file diff --git a/func/env_setup.py b/func/env_setup.py index 8abf9da2..a888046c 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -26,6 +26,14 @@ class Env_setup(): def __init__(self): print '\nParsing class initiated\n' + self.roles_ip_list[:]=[] + self.ip_pw_list[:] = [] + self.roles_dict.clear() + self.ip_pw_dict.clear() + self.ip_pip_list[:] = [] + self.vm_parameters.clear() + self.benchmark_details.clear() + self.benchmark = '' def writeTofile(self, role): fname2 = open('./data/hosts', 'w') diff --git a/func/spawn_vm.py b/func/spawn_vm.py index e7947008..39587b34 100644 --- a/func/spawn_vm.py +++ b/func/spawn_vm.py @@ -26,8 +26,6 @@ class SpawnVM(Env_setup): def __init__(self, vm_info): print 'SpawnVM Class initiated' - - # def setupVM(self,vm_info): vm_role_ip_dict = vm_info.copy() print 'Generating Heat Template\n' self._keystone_client = None @@ -37,12 +35,12 @@ class SpawnVM(Env_setup): nova =self. _get_nova_client() azoneobj = create_zones() azoneobj.create_agg(vm_info['availability_zone']) - self.Heat_template1 = self.HeatTemplate_vm(vm_info) self.create_stack(vm_role_ip_dict, self.Heat_template1) def HeatTemplate_vm(self, vm_params): try: + Heat_Dic='' with open('./heat/SampleHeat.yaml', 'r+') as H_temp: Heat_Dic = yaml.load(H_temp) except yaml.YAMLError as exc: @@ -51,7 +49,6 @@ class SpawnVM(Env_setup): print 'Error in qtip/heat/SampleHeat.yaml at: (%s,%s)' % (mark.line + 1, mark.column + 1) print 'EXITING PROGRAM. Correct File and restart' sys.exit(0) - #fopen = open('/root/.ssh/id_rsa.pub', 'r') fopen = open('./data/QtipKey.pub', 'r') fopenstr = fopen.read() fopenstr = fopenstr.rstrip() @@ -66,6 +63,10 @@ class SpawnVM(Env_setup): 'name': 'my_key' } } + Heat_Dic['parameters']['public_network'] = { + 'type': 'string', + 'default': vm_params['public_network'][0] + } for x in range(1, len(vm_params['availability_zone']) + 1): avail_zone = vm_params['availability_zone'][x - 1] img = vm_params['OS_image'][x - 1] @@ -215,11 +216,10 @@ class SpawnVM(Env_setup): print '\nStack Creating Started\n' - # try: - heat.stacks.create(stack_name=stackname, template=Heat_template) - - #except: - #print 'Create Failed :( ' + try: + heat.stacks.create(stack_name=stackname, template=Heat_template) + except: + print 'Create Failed :( ' cluster_detail = heat.stacks.get(stackname) while(cluster_detail.status != 'COMPLETE'): diff --git a/heat/HeatTemplate.yaml b/heat/HeatTemplate.yaml deleted file mode 100644 index 4b0aa7aa..00000000 --- a/heat/HeatTemplate.yaml +++ /dev/null @@ -1,120 +0,0 @@ -heat_template_version: 2014-10-16 -outputs: - description: this - instance_ip_1: - description: IP address of the instance - value: - get_attr: - - floating_ip_1 - - floating_ip_address - instance_ip_2: - description: IP address of the instance - value: - get_attr: - - floating_ip_2 - - floating_ip_address -parameters: - availability_zone: - default: compute1 - description: The AvailZone. - type: string - private_net_name: - default: private_network - type: string - public_network: - default: provider_network - description: Public - label: Publi_N_ID - type: string -resources: - demo1_security_Group: - properties: - name: demo1_security_Group - rules: - - port_range_max: 22 - port_range_min: 22 - protocol: tcp - - protocol: icmp - type: OS::Neutron::SecurityGroup - floating_ip_1: - properties: - floating_network: - get_param: public_network - type: OS::Neutron::FloatingIP - floating_ip_2: - properties: - floating_network: - get_param: public_network - type: OS::Neutron::FloatingIP - floating_ip_assoc_1: - properties: - floatingip_id: - get_resource: floating_ip_1 - port_id: - get_resource: public_port_1 - type: OS::Neutron::FloatingIPAssociation - floating_ip_assoc_2: - properties: - floatingip_id: - get_resource: floating_ip_2 - port_id: - get_resource: public_port_2 - type: OS::Neutron::FloatingIPAssociation - my_instance_1: - properties: - availability_zone: nova - flavor: m1.small - image: Cirros - networks: - - port: - get_resource: public_port_1 - type: OS::Nova::Server - my_instance_2: - properties: - availability_zone: nova - flavor: m1.small - image: Cirros - networks: - - port: - get_resource: public_port_2 - type: OS::Nova::Server - private_network: - type: OS::Neutron::Net - private_subnet: - properties: - cidr: 10.10.17.0/24 - dns_nameservers: [ "8.8.8.8" ] - network_id: { get_resource: private_network } - type: OS::Neutron::Subnet - public_port_1: - properties: - fixed_ips: - - subnet_id: - get_resource: private_subnet - network: - get_resource: private_network - security_groups: - - get_resource: demo1_security_Group - type: OS::Neutron::Port - public_port_2: - properties: - fixed_ips: - - subnet_id: - get_resource: private_subnet - network: - get_resource: private_network - security_groups: - - get_resource: demo1_security_Group - type: OS::Neutron::Port - router_1: - properties: - external_gateway_info: - network: { get_param: public_network } - type: OS::Neutron::Router - router_interface: - properties: - router_id: { get_resource: router_1 } - subnet: { get_resource: private_subnet } - type: OS::Neutron::RouterInterface -outputs: - description: 'none' diff --git a/heat/SampleHeat.yaml b/heat/SampleHeat.yaml index f0e4761e..ae9f5667 100644 --- a/heat/SampleHeat.yaml +++ b/heat/SampleHeat.yaml @@ -1,16 +1,10 @@ heat_template_version: 2014-10-16 parameters: - public_network: - type: string - label: Publi_N_ID - description: Public - default: 'net04_ext' - private_net_name: type: string default: 'private_network' - + availability_zone: type: string description: The AvailZone. diff --git a/heat/TEST.yaml b/heat/TEST.yaml deleted file mode 100644 index 17ba9cc8..00000000 --- a/heat/TEST.yaml +++ /dev/null @@ -1,133 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a new neutron network plus a router to the public - network, and for deploying two servers into the new network. The template also - assigns floating IP addresses to each server so they are routable from the - public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: 'key' - image: - type: string - description: Name of image to use for servers - default: 'QTIP_CentOS' - flavor: - type: string - description: Flavor to use for servers - default: 'm1.large' - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: 'provider_network' - private_net_name: - type: string - description: Name of private network to be created - default: 'private_network' - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: '10.10.17.0/24' - private_net_gateway: - type: string - description: Private network gateway address - default: '10.10.17.1' - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: '10.10.17.2' - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: '10.10.17.200' - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - server1: - type: OS::Nova::Server - properties: - name: Server1 - image: { get_param: image } - flavor: { get_param: flavor } - - networks: - - port: { get_resource: server1_port } - - server1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - - server1_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: server1_port } - - server2: - type: OS::Nova::Server - properties: - name: Server2 - image: { get_param: image } - flavor: { get_param: flavor } - - networks: - - port: { get_resource: server2_port } - - server2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - - server2_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: server2_port } - -outputs: - server1_private_ip: - description: IP address of server1 in private network - value: { get_attr: [ server1, first_address ] } - server1_public_ip: - description: Floating IP address of server1 in public network - value: { get_attr: [ server1_floating_ip, floating_ip_address ] } - server2_private_ip: - description: IP address of server2 in private network - value: { get_attr: [ server2, first_address ] } - server2_public_ip: - description: Floating IP address of server2 in public network - value: { get_attr: [ server2_floating_ip, floating_ip_address ] } diff --git a/heat/WorkingTemplate.yaml b/heat/WorkingTemplate.yaml deleted file mode 100644 index 299962d4..00000000 --- a/heat/WorkingTemplate.yaml +++ /dev/null @@ -1,70 +0,0 @@ -heat_template_version: 2014-10-16 -outputs: - - instance_ip_1: - description: IP address of the instance - value: {get_attr: [floating_ip_1, floating_ip_address]} -parameters: - availability_zone: - default: compute1 - description: The AvailZone. - type: string - private_net_name: - default: private_network - type: string - public_network: - default: provider_network - description: Public - label: Publi_N_ID - type: string -resources: - demo1_security_Group: - properties: - name: demo1_security_Group - rules: - - port_range_max: 22 - port_range_min: 22 - protocol: tcp - - protocol: icmp - type: OS::Neutron::SecurityGroup - floating_ip_1: - properties: - floating_network: {get_param: public_network} - type: OS::Neutron::FloatingIP - floating_ip_assoc_1: - properties: - floatingip_id: {get_resource: floating_ip_1} - port_id: {get_resource: public_port_1} - type: OS::Neutron::FloatingIPAssociation - my_instance_1: - properties: - availability_zone: nova - flavor: m1.small - image: Cirros - networks: - - port: {get_resource: public_port_1} - type: OS::Nova::Server - private_network: - type: OS::Neutron::Net - private_subnet: - properties: - cidr: 10.10.17.0/24 - dns_nameservers: - - 8.8.8.8 - network_id: { get_resource: private_network } - type: OS::Neutron::Subnet - public_port_1: - properties: - network: {get_resource: private_network} - security_groups: [{get_resource: demo1_security_Group}] - type: OS::Neutron::Port - router_1: - properties: - external_gateway_info: - network: { get_param: public_network } - type: OS::Neutron::Router - router_interface: - properties: - router_id: { get_resource: router_1 } - subnet: { get_resource: private_subnet } - type: OS::Neutron::RouterInterface diff --git a/heat/heat.yaml b/heat/heat.yaml deleted file mode 100644 index 2ed45429..00000000 --- a/heat/heat.yaml +++ /dev/null @@ -1,91 +0,0 @@ - heat_template_version: 2014-10-16 - - description: Test10 - - parameters: - - public_network: - type: string - label: Public Network name or ID - description: Public network with floating IPs - default: "provider_network" - - private_net_name: - type: string - default: "private_network" - - flavor: - type: string - label: Flavor - default: m1.large - - image: - type: string - label: Image name - default: CentOS - - availability_zone: - type: string - description: The Availability Zone to launch the instance. - default: compute1 - - resources: - - private_network: - type: OS::Neutron::Net - - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_network } - cidr: 10.10.17.0/24 - dns_nameservers: - - 8.8.8.8 - - router_1: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_network } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router_1 } - subnet: { get_resource: private_subnet } - - public_port: - type: OS::Neutron::Port - properties: - network: { get_resource: private_network } - security_groups: [{ get_resource: demo1_security_Group }] - - floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_network } - - floating_ip_assoc: - type: OS::Neutron::FloatingIPAssociation - properties: - floatingip_id: { get_resource: floating_ip } - port_id: { get_resource: public_port } - - demo1_security_Group: - type: OS::Neutron::SecurityGroup - properties: - name: demo1_security_Group - rules: - - protocol: tcp - port_range_min: 22 - port_range_max: 22 - - protocol: icmp - outputs: - instance_ip: - description: IP address of the instance - value: { get_attr: [floating_ip, floating_ip_address] } - - - - diff --git a/test_cases/SampleHeat.yaml b/test_cases/SampleHeat.yaml deleted file mode 100644 index 95b9a137..00000000 --- a/test_cases/SampleHeat.yaml +++ /dev/null @@ -1,103 +0,0 @@ - heat_template_version: 2014-10-16 - - description: Test10 - - parameters: - - public_network: - type: string - label: Public Network name or ID - description: Public network with floating IPs - default: "provider_network" - - private_net_name: - type: string - default: "private_network" - - flavor: - type: string - label: Flavor - default: m1.large - - image: - type: string - label: Image name - default: CentOS - - availability_zone: - type: string - description: The Availability Zone to launch the instance. - default: compute1 - - resources: - - private_network: - type: OS::Neutron::Net - - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_network } - cidr: 10.10.17.0/24 - dns_nameservers: - - 8.8.8.8 - - router_1: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_network } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router_1 } - subnet: { get_resource: private_subnet } - - public_port: - type: OS::Neutron::Port - properties: - network: { get_resource: private_network } - security_groups: [{ get_resource: demo1_security_Group }] - - floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_network } - - floating_ip_assoc: - type: OS::Neutron::FloatingIPAssociation - properties: - floatingip_id: { get_resource: floating_ip } - port_id: { get_resource: public_port } - - demo1_security_Group: - type: OS::Neutron::SecurityGroup - properties: - name: demo1_security_Group - rules: - - protocol: tcp - port_range_min: 22 - port_range_max: 22 - - protocol: icmp - - my_instance: - type: OS::Nova::Server - properties: - image: { get_param: image} - flavor: { get_param: flavor} - availability_zone: { get_param: availability_zone } - networks: - - port: { get_resource: public_port } - - - - outputs: - instance_ip: - description: IP address of the instance - value: { get_attr: [floating_ip, floating_ip_address] } - - - - diff --git a/test_cases/TESTER.yaml b/test_cases/TESTER.yaml deleted file mode 100644 index 5a3f2d33..00000000 --- a/test_cases/TESTER.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: dpi - host: virtualmachine_1 - server: virtualmachine_2 - pointless: -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: nova - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: iiihost - flavor: m1.large - virtualmachine_2: - availability_zone: nova - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: server - flavor: m1.large - -Test_Description: - Test_category: "Compute" - Benchmark: "dpi" - Overview: > - '''This test will run the DPI benchmark in serial on virutalmachine_1 and virtualmachine_2.\n - if you wish to add a host machine add the following information under the Host_Machine tag - - machine_1: - ip: - pw: - role: - ''' - diff --git a/test_cases/compute/.whetstone_serial.yaml.swp b/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp similarity index 100% rename from test_cases/compute/.whetstone_serial.yaml.swp rename to test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp diff --git a/test_cases/compute/dhrystone_parallel.yaml b/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml similarity index 100% rename from test_cases/compute/dhrystone_parallel.yaml rename to test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml diff --git a/test_cases/compute/dhrystone_serial.yaml b/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml similarity index 100% rename from test_cases/compute/dhrystone_serial.yaml rename to test_cases/dell_santa_clara/compute/dhrystone_serial.yaml diff --git a/test_cases/compute/dpi_parallel.yaml b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml similarity index 89% rename from test_cases/compute/dpi_parallel.yaml rename to test_cases/dell_santa_clara/compute/dpi_parallel.yaml index 01905f57..0f6afdce 100644 --- a/test_cases/compute/dpi_parallel.yaml +++ b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml @@ -11,16 +11,16 @@ Context: virtualmachine_1: availability_zone: compute1 OS_image: QTIP_CentOS - public_network: 'provider_network' + public_network: 'net04_ext' role: 1Run flavor: m1.large virtualmachine_2: availability_zone: compute4 OS_image: QTIP_CentOS - public_network: 'provider_network' + public_network: 'net04_ext' role: 1Run flavor: m1.large - + Test_Description: Test_category: "Compute" Benchmark: "dpi" diff --git a/test_cases/compute/dpi_serial.yaml b/test_cases/dell_santa_clara/compute/dpi_serial.yaml similarity index 77% rename from test_cases/compute/dpi_serial.yaml rename to test_cases/dell_santa_clara/compute/dpi_serial.yaml index e8f34627..b39597a2 100644 --- a/test_cases/compute/dpi_serial.yaml +++ b/test_cases/dell_santa_clara/compute/dpi_serial.yaml @@ -25,14 +25,6 @@ Test_Description: OS_image: QTIP_CentOS public_network: 'provider_network' - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 2host - flavor: m1.large - role: 1host flavor: m1.large machine_1: diff --git a/test_cases/compute/ssl_parallel.yaml b/test_cases/dell_santa_clara/compute/ssl_parallel.yaml similarity index 100% rename from test_cases/compute/ssl_parallel.yaml rename to test_cases/dell_santa_clara/compute/ssl_parallel.yaml diff --git a/test_cases/compute/ssl_serial.yaml b/test_cases/dell_santa_clara/compute/ssl_serial.yaml similarity index 100% rename from test_cases/compute/ssl_serial.yaml rename to test_cases/dell_santa_clara/compute/ssl_serial.yaml diff --git a/test_cases/compute/whetstone_parallel.yaml b/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml similarity index 100% rename from test_cases/compute/whetstone_parallel.yaml rename to test_cases/dell_santa_clara/compute/whetstone_parallel.yaml diff --git a/test_cases/compute/whetstone_serial.yaml b/test_cases/dell_santa_clara/compute/whetstone_serial.yaml similarity index 100% rename from test_cases/compute/whetstone_serial.yaml rename to test_cases/dell_santa_clara/compute/whetstone_serial.yaml diff --git a/test_cases/network/iperf_topology_1.yaml b/test_cases/dell_santa_clara/network/iperf_topology_1.yaml similarity index 100% rename from test_cases/network/iperf_topology_1.yaml rename to test_cases/dell_santa_clara/network/iperf_topology_1.yaml diff --git a/test_cases/network/iperf_topology_2.yaml b/test_cases/dell_santa_clara/network/iperf_topology_2.yaml similarity index 100% rename from test_cases/network/iperf_topology_2.yaml rename to test_cases/dell_santa_clara/network/iperf_topology_2.yaml diff --git a/test_cases/network/iperf_topology_3.yaml b/test_cases/dell_santa_clara/network/iperf_topology_3.yaml similarity index 100% rename from test_cases/network/iperf_topology_3.yaml rename to test_cases/dell_santa_clara/network/iperf_topology_3.yaml diff --git a/test_cases/network/netperf.yaml b/test_cases/dell_santa_clara/network/netperf.yaml similarity index 100% rename from test_cases/network/netperf.yaml rename to test_cases/dell_santa_clara/network/netperf.yaml diff --git a/test_cases/network/pktgen.yaml b/test_cases/dell_santa_clara/network/pktgen.yaml similarity index 100% rename from test_cases/network/pktgen.yaml rename to test_cases/dell_santa_clara/network/pktgen.yaml diff --git a/test_cases/storage/fio_2.yaml b/test_cases/dell_santa_clara/storage/fio_2.yaml similarity index 100% rename from test_cases/storage/fio_2.yaml rename to test_cases/dell_santa_clara/storage/fio_2.yaml diff --git a/test_cases/storage/fio_parallel.yaml b/test_cases/dell_santa_clara/storage/fio_parallel.yaml similarity index 100% rename from test_cases/storage/fio_parallel.yaml rename to test_cases/dell_santa_clara/storage/fio_parallel.yaml diff --git a/test_list/compute.txt b/test_list/compute.txt new file mode 100644 index 00000000..30d904e3 --- /dev/null +++ b/test_list/compute.txt @@ -0,0 +1,2 @@ +dpi_parallel.yaml +ssl_parallel.yaml diff --git a/test_list/network.txt b/test_list/network.txt new file mode 100644 index 00000000..e69de29b diff --git a/test_list/storage.txt b/test_list/storage.txt new file mode 100644 index 00000000..e69de29b -- 2.16.6