diff options
| -rw-r--r-- | build/opnfv-apex-common.spec | 9 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 13 | ||||
| -rwxr-xr-x | ci/deploy.sh | 18 | ||||
| -rwxr-xr-x | ci/dev_deploy_check.sh | 6 | ||||
| -rwxr-xr-x | ci/test.sh | 19 | ||||
| -rw-r--r-- | tests/test_apex_ip_utils.py | 36 |
6 files changed, 75 insertions, 26 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index db795f84..958cb14a 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -8,10 +8,11 @@ License: Apache 2.0 URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-common.tar.gz -BuildArch: noarch -BuildRequires: python-docutils python34-devel -Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 +BuildArch: noarch +BuildRequires: python-docutils python34-devel +Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 +Requires: ipxe-roms-qemu >= 20160127-1 %description Scripts for OPNFV deployment using RDO Manager diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index fe67c287..1a8d8461 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -28,6 +28,14 @@ pushd opnfv-puppet-tripleo > /dev/null git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar.gz popd > /dev/null +# download customized os-net-config +git clone https://github.com/trozet/os-net-config.git -b hiera_nic_mapping +pushd os-net-config > /dev/null +pushd os_net_config > /dev/null +git archive --format=tar.gz --prefix=os_net_config/ HEAD > ../../os-net-config.tar.gz +popd > /dev/null +popd > /dev/null + pushd images > /dev/null dpdk_pkg_str='' @@ -45,6 +53,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ --run-command "mkdir /root/dpdk_rpms" \ $dpdk_pkg_str \ + --install "centos-release-qemu-ev" \ + --run-command "yum update -y" \ + --run-command "yum remove -y qemu-system-x86" \ + --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ + --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 diff --git a/ci/deploy.sh b/ci/deploy.sh index 5fcc3887..05e2fa2b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -527,7 +527,7 @@ EOF for n in private_network public_network storage_network api_network; do if [[ $enabled_network_list =~ $n ]]; then echo -n "$n " - virsh attach-interface --domain baremetal${i} --type network --source $n --model rtl8139 --config + virsh attach-interface --domain baremetal${i} --type network --source $n --model virtio --config fi done else @@ -1001,6 +1001,22 @@ if ! heat stack-list | grep CREATE_COMPLETE 1>/dev/null; then fi EOI + # Configure DPDK + if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI || (echo "DPDK config failed, exiting..."; exit 1) +source stackrc +set -o errexit +for node in \$(nova list | grep novacompute | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+"); do +echo "Running DPDK test app on \$node" +ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF +set -o errexit +sudo dpdk_helloworld --no-pci +sudo dpdk_nic_bind -s +EOF +done +EOI + fi + if [ "$debug" == 'TRUE' ]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source overcloudrc diff --git a/ci/dev_deploy_check.sh b/ci/dev_deploy_check.sh index 8ba46ab0..831ff1fd 100755 --- a/ci/dev_deploy_check.sh +++ b/ci/dev_deploy_check.sh @@ -25,6 +25,12 @@ if ! sudo yum $rdo_action -y https://www.rdoproject.org/repos/rdo-release.rpm; exit 1 fi +# update ipxe-roms-qemu +if ! sudo yum update -y ipxe-roms-qemu; then + echo "Failed to update ipxe-roms-qemu package..." + exit 1 +fi + # check for other packages for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python; do # Make sure deploy deps are installed @@ -10,19 +10,22 @@ set -e -# Make sure python is installed -if ! rpm -q python34-devel > /dev/null; then - sudo yum install -y epel-release - if ! sudo yum install -y python34-devel; then - echo "Failed to install python34-devel package..." - exit 1 +# Make sure python dependencies are installed +for pkg in epel-release python34-devel python34-nose; do + if ! rpm -q ${pkg} > /dev/null; then + if ! sudo yum install -y ${pkg}; then + echo "Failed to install ${pkg} package..." + exit 1 fi -fi + fi +done # Make sure coverage is installed if ! python3 -c "import coverage" &> /dev/null; then sudo easy_install-3.4 coverage; fi +pushd ../build/ > /dev/null make python-tests +popd > /dev/null pushd ../tests/ > /dev/null percent=$(coverage3 report --include '*lib/python/*' -m | grep TOTAL | tr -s ' ' | awk '{ print $4 }' | cut -d % -f 1) if [[ percent -lt 80 ]]; then @@ -30,4 +33,4 @@ if [[ percent -lt 80 ]]; then echo "Does not meet 80% requirement" exit 1 fi -popd > /dev/nul +popd > /dev/null diff --git a/tests/test_apex_ip_utils.py b/tests/test_apex_ip_utils.py index 0b44bdd0..dc3aadf7 100644 --- a/tests/test_apex_ip_utils.py +++ b/tests/test_apex_ip_utils.py @@ -26,7 +26,9 @@ from ipaddress import ip_network ip4_pattern = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}') -ip4_range_pattern = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3},\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}') +ip4_range_pattern = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3},\d{1,' + '3}\.\d{1,3}\.\d{1,3}\.\d{1,3}') + def get_default_gateway_linux(): """Read the default gateway directly from /proc.""" @@ -61,9 +63,9 @@ class TestIpUtils(object): assert_is_instance(get_interface( self.iface_name, address_family=4), IPv4Address) - assert_is_instance(get_interface( - self.iface_name, - address_family=6), IPv6Address) +# assert_is_instance(get_interface( +# self.iface_name, +# address_family=6), IPv6Address) assert_raises(IPUtilsException, get_interface, self.iface_name, 0) @@ -77,19 +79,27 @@ class TestIpUtils(object): assert_regexp_matches(get_ip(1, interface=self.iface), ip4_pattern) assert_raises(IPUtilsException, get_ip, 1) - def test_get_ip_range_raises(self): assert_raises(IPUtilsException, get_ip_range) assert_raises(IPUtilsException, get_ip_range, interface=self.iface) def test_get_ip_range_with_interface(self): - assert_regexp_matches(get_ip_range(interface=self.iface, start_offset=1, end_offset=20), ip4_range_pattern) - assert_regexp_matches(get_ip_range(interface=self.iface, start_offset=1, count=10), ip4_range_pattern) - assert_regexp_matches(get_ip_range(interface=self.iface, end_offset=20, count=10), ip4_range_pattern) - - def test_get_ip_range_with_cidr(self): + assert_regexp_matches(get_ip_range(interface=self.iface, + start_offset=1, end_offset=20), + ip4_range_pattern) + assert_regexp_matches(get_ip_range(interface=self.iface, + start_offset=1, count=10), + ip4_range_pattern) + assert_regexp_matches(get_ip_range(interface=self.iface, end_offset=20, + count=10), ip4_range_pattern) + + @staticmethod + def test_get_ip_range_with_cidr(): cidr = ip_network('10.10.10.0/24') assert_raises(IPUtilsException, get_ip_range, cidr=cidr) - assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1, end_offset=20), ip4_pattern) - assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1, count=10), ip4_pattern) - assert_regexp_matches(get_ip_range(cidr=cidr, end_offset=20, count=10), ip4_pattern) + assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1, + end_offset=20), ip4_pattern) + assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1, + count=10), ip4_pattern) + assert_regexp_matches(get_ip_range(cidr=cidr, end_offset=20, + count=10), ip4_pattern) |