diff options
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 2 | ||||
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 29 | ||||
| -rw-r--r-- | setup.cfg | 7 | ||||
| -rw-r--r-- | setup.py | 26 |
5 files changed, 39 insertions, 29 deletions
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 1e7f489..14a72d3 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -141,8 +141,6 @@ OpenStack NAT does not work. Instances created in subnets that are connected to the public network via a gateway should have external connectivity. This does not work and can be worked around by assigning a Floating IP to the instance [1]. -For Apex the peering with the virtual Peer is not working due to limitation -of apex networking. Workarounds ----------- diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..5543064 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +pbr>=1.8 # Apache-2.0 +requests!=2.12.2,>=2.10.0 # Apache-2.0 +opnfv +PyYAML>=3.10.0 # MIT diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 85a8827..dbbdb59 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -262,26 +262,23 @@ def main(): results.add_failure(testcase) results.add_to_summary(0, "=") - # TODO remove this and include apex again - installer_type = str(os.environ['INSTALLER_TYPE'].lower()) - if installer_type != "apex": - - results.add_to_summary(0, '-') - results.add_to_summary(1, "Peer Quagga with OpenDaylight") - results.add_to_summary(0, '-') - - neighbor = quagga.odl_add_neighbor(fake_fip['fip_addr'], - controller_ext_ip, - controller) - peer = quagga.check_for_peering(controller) - if neighbor and peer: - results.add_success("Peering with quagga") - else: - results.add_failure("Peering with quagga") + results.add_to_summary(0, '-') + results.add_to_summary(1, "Peer Quagga with OpenDaylight") + results.add_to_summary(0, '-') + + neighbor = quagga.odl_add_neighbor(fake_fip['fip_addr'], + controller_ext_ip, + controller) + peer = quagga.check_for_peering(controller) finally: test_utils.detach_instance_from_ext_br(quagga_vm, compute) + if neighbor and peer: + results.add_success("Peering with quagga") + else: + results.add_failure("Peering with quagga") + test_utils.cleanup_nova(nova_client, floatingip_ids, instance_ids, image_ids) test_utils.cleanup_neutron(neutron_client, bgpvpn_ids, interfaces, diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..e26266c --- /dev/null +++ b/setup.cfg @@ -0,0 +1,7 @@ +[metadata] +name = sdnvpn +version = 5 +home-page = https://wiki.opnfv.org/display/sdnvpn/SDNVPN+project+main+page + +[files] +packages = sdnvpn @@ -1,18 +1,22 @@ -############################################################################## +#!/usr/bin/env python + +# Copyright (c) 2017 Orange 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 -############################################################################## - -from setuptools import setup, find_packages +import setuptools +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass -setup( - name="sdnvpn", - version="danube", - packages=find_packages(), - include_package_data=True, - package_data={}, - url="https://www.opnfv.org") +setuptools.setup( + setup_requires=['pbr>=1.8'], + pbr=True) |