diff options
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | apex/clean.py | 3 | ||||
| -rw-r--r-- | apex/network/jumphost.py | 10 | ||||
| -rw-r--r-- | apex/tests/test_apex_network_jumphost.py | 23 | ||||
| -rwxr-xr-x | build/build_ovs_nsh.sh | 28 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 28 |
6 files changed, 32 insertions, 70 deletions
@@ -1,17 +1,11 @@ *~ *.pyc -.*.sw? -.coverage /docs_build/ /docs_output/ /releng/ -.build/ -.cache/ -ci/apex_build.log -ci/apex_deploy.log -.tox/ apex.egg-info/ /apex/tests/playbooks/*.retry coverage.xml nosetests.xml -ci/apex_clean.log +ci/*.log +.* diff --git a/apex/clean.py b/apex/clean.py index 81ae1770..9d0e648e 100644 --- a/apex/clean.py +++ b/apex/clean.py @@ -95,7 +95,7 @@ def clean_ssh_keys(key_file='/root/.ssh/authorized_keys'): def main(): clean_parser = argparse.ArgumentParser() - clean_parser.add_argument('-f', + clean_parser.add_argument('-i', dest='inv_file', required=False, default=None, @@ -134,5 +134,6 @@ def main(): logging.info('Apex clean complete!') + if __name__ == '__main__': main() diff --git a/apex/network/jumphost.py b/apex/network/jumphost.py index 2ecb7f4e..c28c105e 100644 --- a/apex/network/jumphost.py +++ b/apex/network/jumphost.py @@ -227,15 +227,14 @@ def detach_interface_from_ovs(network): orig_ifcfg_file = os.path.join(NET_CFG_PATH, "ifcfg-{}.orig".format(real_interface)) ifcfg_file = orig_ifcfg_file[:-len('.orig')] + bridge_ifcfg_file = os.path.join(NET_CFG_PATH, + "ifcfg-{}".format(bridge)) if os.path.isfile(orig_ifcfg_file): logging.debug("Original interface file found: " "{}".format(orig_ifcfg_file)) - shutil.move(orig_ifcfg_file, ifcfg_file) else: logging.info("No original ifcfg file found...will attempt to use " - "bridge icfg file and re-create") - bridge_ifcfg_file = os.path.join(NET_CFG_PATH, - "ifcfg-{}".format(bridge)) + "bridge ifcfg file and re-create") if os.path.isfile(bridge_ifcfg_file): ifcfg_params = generate_ifcfg_params(bridge_ifcfg_file, network) if_content = """DEVICE={} @@ -298,6 +297,7 @@ def remove_ovs_bridge(network): "ifcfg-{}".format(bridge)) if os.path.isfile(bridge_ifcfg_file): os.remove(bridge_ifcfg_file) - logging.debug("Bridge ifcfg file removed: {}".format) + logging.debug("Bridge ifcfg file removed: {}".format( + bridge_ifcfg_file)) else: logging.debug('Bridge ifcfg file not found') diff --git a/apex/tests/test_apex_network_jumphost.py b/apex/tests/test_apex_network_jumphost.py index a23f1c56..da9703e3 100644 --- a/apex/tests/test_apex_network_jumphost.py +++ b/apex/tests/test_apex_network_jumphost.py @@ -203,6 +203,29 @@ class TestNetworkJumpHost: os.remove(ifcfg_path) @patch('subprocess.check_call') + @patch('apex.network.jumphost.is_ovs_bridge', return_value=True) + @patch('apex.network.jumphost.dump_ovs_ports', return_value=['enpfakes0']) + def test_detach_interface_orig_exists(self, dump_ports_func, + is_bridge_func, subprocess_func): + ifcfg_dir = con.TEST_DUMMY_CONFIG + shutil.copyfile(os.path.join(ifcfg_dir, 'ifcfg-br-dummy'), + os.path.join(ifcfg_dir, 'ifcfg-br-admin')) + shutil.copyfile(os.path.join(ifcfg_dir, 'ifcfg-dummy'), + os.path.join(ifcfg_dir, 'ifcfg-enpfakes0.orig')) + jumphost.NET_CFG_PATH = ifcfg_dir + output = jumphost.detach_interface_from_ovs('admin') + assert output is None + assert os.path.isfile(os.path.join(ifcfg_dir, 'ifcfg-enpfakes0')) + assert os.path.isfile(os.path.join(ifcfg_dir, 'ifcfg-br-admin')) + assert not os.path.isfile(os.path.join(ifcfg_dir, + 'ifcfg-enpfakes0.orig')) + for ifcfg in ('ifcfg-enpfakes0', 'ifcfg-enpfakes0.orig', + 'ifcfg-br-admin'): + ifcfg_path = os.path.join(ifcfg_dir, ifcfg) + if os.path.isfile(ifcfg_path): + os.remove(ifcfg_path) + + @patch('subprocess.check_call') @patch('apex.network.jumphost.is_ovs_bridge', return_value=False) @patch('apex.network.jumphost.dump_ovs_ports', return_value=[]) def test_detach_interface_no_bridge(self, dump_ports_func, diff --git a/build/build_ovs_nsh.sh b/build/build_ovs_nsh.sh deleted file mode 100755 index 2fba43f5..00000000 --- a/build/build_ovs_nsh.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -############################################################################## -# Copyright (c) 2016 Tim Rozet (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e - -yum -y install rpm-build autoconf automake libtool systemd-units \ -openssl openssl-devel python python-twisted-core python-zope-interface \ -python-six desktop-file-utils groff graphviz procps-ng libcap-ng \ -libcap-ng-devel PyQt4 selinux-policy-devel -./boot.sh -libtoolize --force -aclocal -autoheader -automake --force-missing --add-missing -autoconf -./configure -yum -y install rpmdevtools -# hack due to build pulling in kernel vxlan header -kernel_vxlan="/usr/src/kernels/$(rpm -q kernel | grep -Eo '[0-9].*x86_64')/include/net/vxlan.h" -sed -i '/struct vxlan_metadata {/a\ u32 gpe;' $kernel_vxlan -make rpm-fedora RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\" --without check" -make rpm-fedora-kmod RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\"" diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 6fdc32d6..cc335c82 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -152,34 +152,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ # upload and install barometer packages barometer_pkgs overcloud-full_build.qcow2 - # Build OVS with NSH - rm -rf ovs_nsh_patches - rm -rf ovs - git clone https://github.com/yyang13/ovs_nsh_patches.git - git clone https://github.com/openvswitch/ovs.git - pushd ovs > /dev/null - git checkout v2.6.1 - cp ../ovs_nsh_patches/v2.6.1/*.patch ./ - cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.patch ./ - # Hack for build servers that have no git config - git config user.email "apex@opnfv.com" - git config user.name "apex" - git am *.patch - popd > /dev/null - tar czf ovs.tar.gz ovs - - -LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ${BUILD_ROOT}/CentOS-Updates.repo:/etc/yum.repos.d/ \ - --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ - --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ - --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ - --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ - --upload ovs.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf ovs.tar.gz" \ - --run-command "cd /root/ovs && /root/build_ovs_nsh.sh" \ - -a overcloud-full_build.qcow2 - fi # end x86_64 specific items mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 |