diff options
| -rwxr-xr-x | tests/ci/prepare_env.sh | 14 | ||||
| -rwxr-xr-x | tests/ci/yardstick-verify | 14 | ||||
| -rwxr-xr-x | tools/yardstick-img-modify | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping6_metadata.txt | 17 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash | 7 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash | 7 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping6_setup.bash | 4 |
7 files changed, 37 insertions, 28 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index bbd7b5553..9c949ec4f 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -15,7 +15,6 @@ : ${NODE_NAME:='unknown'} : ${EXTERNAL_NETWORK:='admin_floating_net'} - # Extract network name from EXTERNAL_NETWORK # e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24' export EXTERNAL_NETWORK=$(echo $EXTERNAL_NETWORK | cut -f1 -d \;) @@ -75,6 +74,13 @@ verify_connectivity() { error "Can not talk to $ip." } +YARD_IMG_ARCH=amd64 +export YARD_IMG_ARCH + +if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then + sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers +fi + ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" if [ "$INSTALLER_TYPE" == "fuel" ]; then @@ -85,13 +91,7 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch" - YARD_IMG_ARCH=amd64 sshpass -p r00tme ssh $ssh_options -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64 - export YARD_IMG_ARCH - - if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then - sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers - fi sshpass -p r00tme ssh 2>/dev/null $ssh_options \ root@${INSTALLER_IP} fuel node>fuel_node diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index e3d81f9f7..37d0a9036 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -197,7 +197,7 @@ load_cirros_image() output=$(glance image-create \ --name cirros-0.3.3 \ - --disk-format qcow2 \ + --disk-format $DISK_FORMAT \ --container-format bare \ --file $image_file) echo "$output" @@ -270,12 +270,6 @@ load_yardstick_image() cd $YARDSTICK_REPO_DIR fi - if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then - DISK_FORMAT="raw" - else - DISK_FORMAT="qcow2" - fi - output=$(eval glance --os-image-api-version 1 image-create \ --name yardstick-trusty-server \ --is-public true --disk-format $DISK_FORMAT \ @@ -488,6 +482,12 @@ main() QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img" + if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then + DISK_FORMAT="raw" + else + DISK_FORMAT="qcow2" + fi + build_yardstick_image load_yardstick_image if [ $YARD_IMG_ARCH = "arm64" ]; then diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index b9ecbddd8..07f10b3ce 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -104,7 +104,7 @@ setup() { kpartx -av $raw_imgfile if [ $YARD_IMG_ARCH = "arm64" ]; then - e2fsck -f /dev/mapper/$loopdevice + e2fsck -p -f /dev/mapper/$loopdevice resize2fs /dev/mapper/$loopdevice fi # for trouble shooting 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 \ |