From 2b868477e04ec3b7a1bf3e3a678a12fef3325263 Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Thu, 28 Apr 2016 04:05:38 -0400 Subject: bugfix for braces and testcase name Change-Id: Ic8731de1f9c62465a28225df4dd5b4b079cb6f49 Signed-off-by: MatthewLi --- run_tests.sh | 4 +- testsuites/rubbos/run_rubbos.py | 2 +- testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml | 300 +++++++++++++++++++++ testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml | 300 --------------------- testsuites/rubbos/testsuite_story/rubbos_story1 | 2 +- testsuites/rubbos/testsuite_story/rubbos_story2 | 4 +- 6 files changed, 306 insertions(+), 306 deletions(-) create mode 100755 testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml delete mode 100755 testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml diff --git a/run_tests.sh b/run_tests.sh index 38e5c16f..19312935 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -78,7 +78,7 @@ function run_test(){ check_testcase -rubbos $i #adjust config parameters, different test suite has different methods, take rubbos as an example #run test case, different test suite has different methods - file={$BASEDIR}/testsuites/rubbos/testcase_cfg/{$i}.yaml + file=${BASEDIR}/testsuites/rubbos/testcase_cfg/${i}.yaml python /home/opnfv/bottlenecks/testsuites/rubbos/run_rubbos.py -c $file done ;; @@ -95,7 +95,7 @@ function run_test(){ check_testcase -vstf $i #adjust config parameters #run test case - file={$BASEDIR}/testsuites/vstf/testcase_cfg/{$i}.yaml + file=${BASEDIR}/testsuites/vstf/testcase_cfg/${i}.yaml python /home/opnfv/bottlenecks/testsuites/vstf/run_vstf.py -c $file done ;; diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py index 32221f72..904cd8a2 100755 --- a/testsuites/rubbos/run_rubbos.py +++ b/testsuites/rubbos/run_rubbos.py @@ -25,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="/home/opnfv/bottlenecks/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml") + default="/home/opnfv/bottlenecks/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml") args = parser.parse_args() #-------------------------------------------------- diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml new file mode 100755 index 00000000..dd6d5c94 --- /dev/null +++ b/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml @@ -0,0 +1,300 @@ +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 nine servers into the new network. The template also + assigns floating IP addresses to rubbos_control server so it is routable from the + public network. +parameters: + key_name: + type: string + description: Name of keypair to assign to servers + default: bottlenecks_rubbos_keypair + image: + type: string + description: Name of image to use for servers + default: bottlenecks-trusty-server + flavor: + type: string + description: Flavor to use for servers + default: bottlenecks_rubbos_flavor + public_net: + type: string + description: > + ID or name of public network for which floating IP addresses will be allocated + default: net04_ext + private_net_name: + type: string + description: Name of private network to be created + default: bottlenecks-private + private_net_cidr: + type: string + description: Private network address (CIDR notation) + default: "10.0.10.0/24" + private_net_gateway: + type: string + description: Private network gateway address + default: "10.0.10.1" + private_net_pool_start: + type: string + description: Start of private network IP address allocation pool + default: "10.0.10.2" + private_net_pool_end: + type: string + description: End of private network IP address allocation pool + default: "10.0.10.199" + +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 } + + rubbos_control: + type: OS::Nova::Server + properties: + name: rubbos_control + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_control_port } + admin_user: ubuntu + + rubbos_control_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_control_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network: { get_param: public_net } + port_id: { get_resource: rubbos_control_port } + + rubbos_httpd: + type: OS::Nova::Server + properties: + name: rubbos_httpd + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_httpd_port } + admin_user: ubuntu + + rubbos_httpd_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_mysql1: + type: OS::Nova::Server + properties: + name: rubbos_mysql1 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_mysql1_port } + admin_user: ubuntu + + rubbos_mysql1_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_tomcat1: + type: OS::Nova::Server + properties: + name: rubbos_tomcat1 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_tomcat1_port } + admin_user: ubuntu + + rubbos_tomcat1_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_client1: + type: OS::Nova::Server + properties: + name: rubbos_client1 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_client1_port } + admin_user: ubuntu + + rubbos_client1_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_client2: + type: OS::Nova::Server + properties: + name: rubbos_client2 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_client2_port } + admin_user: ubuntu + + rubbos_client2_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_client3: + type: OS::Nova::Server + properties: + name: rubbos_client3 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_client3_port } + admin_user: ubuntu + + rubbos_client3_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_client4: + type: OS::Nova::Server + properties: + name: rubbos_client4 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_client4_port } + admin_user: ubuntu + + rubbos_client4_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + rubbos_benchmark: + type: OS::Nova::Server + properties: + name: rubbos_benchmark + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: rubbos_benchmark_port } + admin_user: ubuntu + + rubbos_benchmark_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + security_groups: [{ get_resource: server_security_group }] + + server_security_group: + type: OS::Neutron::SecurityGroup + properties: + description: Rubbos group for servers access. + name: rubbos-security-group + rules: [ + {remote_ip_prefix: 0.0.0.0/0, + protocol: tcp, + port_range_min: 1, + port_range_max: 65535}, + {remote_ip_prefix: 0.0.0.0/0, + protocol: udp, + port_range_min: 1, + port_range_max: 65535}, + {remote_ip_prefix: 0.0.0.0/0, + protocol: icmp}] + +outputs: + rubbos_control_private_ip: + description: IP address of rubbos_control in private network + value: { get_attr: [ rubbos_control, first_address ] } + rubbos_control_public_ip: + description: Floating IP address of rubbos_control in public network + value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } + rubbos_httpd_private_ip: + description: IP address of rubbos_httpd in private network + value: { get_attr: [ rubbos_httpd, first_address ] } + rubbos_mysql1_private_ip: + description: IP address of rubbos_mysql1 in private network + value: { get_attr: [ rubbos_mysql1, first_address ] } + rubbos_tomcat1_private_ip: + description: IP address of rubbos_tomcat1 in private network + value: { get_attr: [ rubbos_tomcat1, first_address ] } + rubbos_client1_private_ip: + description: IP address of rubbos_client1 in private network + value: { get_attr: [ rubbos_client1, first_address ] } + rubbos_client2_private_ip: + description: IP address of rubbos_client2 in private network + value: { get_attr: [ rubbos_client2, first_address ] } + rubbos_client3_private_ip: + description: IP address of rubbos_client3 in private network + value: { get_attr: [ rubbos_client3, first_address ] } + rubbos_client4_private_ip: + description: IP address of rubbos_client4 in private network + value: { get_attr: [ rubbos_client4, first_address ] } + rubbos_benchmark_private_ip: + description: IP address of rubbos_benchmark in private network + value: { get_attr: [ rubbos_benchmark, first_address ] } + diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml deleted file mode 100755 index dd6d5c94..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml +++ /dev/null @@ -1,300 +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 nine servers into the new network. The template also - assigns floating IP addresses to rubbos_control server so it is routable from the - public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - -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 } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos_control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos_httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos_mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos_tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos_client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client2: - type: OS::Nova::Server - properties: - name: rubbos_client2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - - rubbos_client2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client3: - type: OS::Nova::Server - properties: - name: rubbos_client3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client3_port } - admin_user: ubuntu - - rubbos_client3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client4: - type: OS::Nova::Server - properties: - name: rubbos_client4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client4_port } - admin_user: ubuntu - - rubbos_client4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_benchmark: - type: OS::Nova::Server - properties: - name: rubbos_benchmark - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_benchmark_port } - admin_user: ubuntu - - rubbos_benchmark_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } - rubbos_client2_private_ip: - description: IP address of rubbos_client2 in private network - value: { get_attr: [ rubbos_client2, first_address ] } - rubbos_client3_private_ip: - description: IP address of rubbos_client3 in private network - value: { get_attr: [ rubbos_client3, first_address ] } - rubbos_client4_private_ip: - description: IP address of rubbos_client4 in private network - value: { get_attr: [ rubbos_client4, first_address ] } - rubbos_benchmark_private_ip: - description: IP address of rubbos_benchmark in private network - value: { get_attr: [ rubbos_benchmark, first_address ] } - diff --git a/testsuites/rubbos/testsuite_story/rubbos_story1 b/testsuites/rubbos/testsuite_story/rubbos_story1 index c3b1e921..af143e30 100755 --- a/testsuites/rubbos/testsuite_story/rubbos_story1 +++ b/testsuites/rubbos/testsuite_story/rubbos_story1 @@ -1 +1 @@ -rubbos_1-1-1 +rubbos_1-1-0-1 diff --git a/testsuites/rubbos/testsuite_story/rubbos_story2 b/testsuites/rubbos/testsuite_story/rubbos_story2 index 40eb5f02..b35fbdd7 100755 --- a/testsuites/rubbos/testsuite_story/rubbos_story2 +++ b/testsuites/rubbos/testsuite_story/rubbos_story2 @@ -1,2 +1,2 @@ -rubbos_1-1-1 -rubbos_1-1-2 +rubbos_1-1-0-1 +rubbos_1-2-0-1 -- cgit 1.2.3-korg