diff options
8 files changed, 27 insertions, 18 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml index 1942bb54f..93d6ac018 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml @@ -24,7 +24,7 @@ scenarios: context: name: demo image: cirros-0.3.3 - flavor: m1.tiny + flavor: yardstick-flavor user: cirros placement_groups: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml index b43e56665..403bc344e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml @@ -1,6 +1,7 @@ --- # Yardstick TC055 config file # Collect hardware specification from /proc/cpuinfo +# Measure number of cores, number of threads, available memory size and cache size schema: "yardstick:task:0.1" {% set host = host or "node5.yardstick-TC055" %} diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml index d4a978c1d..fb5a12e8a 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml @@ -1,8 +1,7 @@ --- # Yardstick TC075 config file -# Measure compute capacity and scale. -# Including number of cores, number of threads, available memory size and -# cache size. +# Measure network capacity and scale. +# Measure number of connections, number of frames received schema: "yardstick:task:0.1" {% set host = host or "node1.LF" %} diff --git a/yardstick/benchmark/scenarios/networking/networkcapacity.bash b/yardstick/benchmark/scenarios/networking/networkcapacity.bash index a18f97e0b..e2d3eb745 100644 --- a/yardstick/benchmark/scenarios/networking/networkcapacity.bash +++ b/yardstick/benchmark/scenarios/networking/networkcapacity.bash @@ -9,7 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# Measure compute capacity and scale of a host +# Measure network capacity and scale of a host set -e OUTPUT_FILE=/tmp/netperf-out.log diff --git a/yardstick/benchmark/scenarios/networking/ping6_metadata.txt b/yardstick/benchmark/scenarios/networking/ping6_metadata.txt index 5dc08d30f..82accbff5 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_metadata.txt +++ b/yardstick/benchmark/scenarios/networking/ping6_metadata.txt @@ -45,7 +45,11 @@ write_files: owner: root:root - content: | TYPE="Ethernet" - BOOTPROTO=static + BOOTPROTO="dhcp" + DEFROUTE="no" + PEERDNS="no" + PEERROUTES="no" + IPV4_FAILURE_FATAL="no" IPV6INIT=yes IPV6ADDR="2001:db8:0:2::1/64" NAME=eth1 @@ -56,6 +60,15 @@ write_files: permissions: '0755' owner: root:root - content: | + interface eth0 + { + AdvSendAdvert on; + MinRtrAdvInterval 3; + MaxRtrAdvInterval 10; + AdvDefaultLifetime 0; + route 2001:db8:0:2::/64 { + }; + }; interface eth1 { AdvSendAdvert on; @@ -79,4 +92,4 @@ write_files: IPV6FORWARDING=yes path: /etc/sysconfig/network permissions: '0644' - owner: root:root
\ No newline at end of file + owner: root:root diff --git a/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash b/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash index f40d47d64..a0976e3d5 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash +++ b/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash @@ -8,10 +8,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -sed -i 's/enable_security_group= False/enable_security_group = True/g' /etc/neutron/plugins/ml2/ml2_conf.ini -sed -i 3d /etc/neutron/plugins/ml2/ml2_conf.ini -sed -i 's/firewall_driver= neutron.agent.firewall.NoopFirewallDriver/firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver/g' /etc/neutron/plugins/ml2/ml2_conf.ini -sed -i 's/security_group_api= nova/security_group_api = neutron/g' /etc/nova/nova.conf +cp /etc/neutron/plugins/ml2/ml2_conf.ini_bkp /etc/neutron/plugins/ml2/ml2_conf.ini service neutron-l3-agent restart service neutron-dhcp-agent restart @@ -23,4 +20,4 @@ service nova-conductor restart service nova-consoleauth restart service nova-novncproxy restart service nova-scheduler restart -service nova-compute restart
\ No newline at end of file +service nova-compute restart diff --git a/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash index 4a781d21e..e790a0784 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash +++ b/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash @@ -9,12 +9,11 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -sed -i 's/enable_security_group = True/enable_security_group= False/g' /etc/neutron/plugins/ml2/ml2_conf.ini -sed -i '2a extension_drivers = port_security' /etc/neutron/plugins/ml2/ml2_conf.ini +cp /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugins/ml2/ml2_conf.ini_bkp +sed -i '83a prevent_arp_spoofing = False' /etc/neutron/plugins/ml2/ml2_conf.ini sed -i 's/firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver/firewall_driver= neutron.agent.firewall.NoopFirewallDriver/g' /etc/neutron/plugins/ml2/ml2_conf.ini -sed -i 's/security_group_api = neutron/security_group_api= nova/g' /etc/nova/nova.conf - +# restart nova and neutron service service neutron-l3-agent restart service neutron-dhcp-agent restart service neutron-metadata-agent restart diff --git a/yardstick/benchmark/scenarios/networking/ping6_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_setup.bash index 658e1d3cf..b2f324f76 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_setup.bash +++ b/yardstick/benchmark/scenarios/networking/ping6_setup.bash @@ -24,8 +24,8 @@ neutron router-create ipv6-router # create (ipv4,ipv6)router and net and subnet -neutron net-create --port_security_enabled=False ipv4-int-network1 -neutron net-create --port_security_enabled=False ipv6-int-network2 +neutron net-create ipv4-int-network1 +neutron net-create ipv6-int-network2 # Create IPv4 subnet and associate it to ipv4-router neutron subnet-create --name ipv4-int-subnet1 \ |