summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO4
-rw-r--r--requirements.txt11
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/README28
-rw-r--r--setup.py23
-rw-r--r--sfc/tests/functest/docker/Dockerfile18
-rw-r--r--sfc/tests/functest/docker/testcases.yaml26
6 files changed, 78 insertions, 32 deletions
diff --git a/INFO b/INFO
index fc507b5c..afa3d1c5 100644
--- a/INFO
+++ b/INFO
@@ -12,9 +12,7 @@ repository: sfc
Committers:
bjohnson@inocybe.com
-rapenno@gmail.com
-jguichar@cisco.com
shague@redhat.com
trozet@redhat.com
-vmurgai@cisco.com
mbuil@suse.com
+mardim@intracom-telecom.com
diff --git a/requirements.txt b/requirements.txt
index 1a0814bd..239c0b1b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,13 @@
-pbr>=1.8 # Apache-2.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
paramiko>=2.0 # LGPLv2.1+
-python-glanceclient>=2.5.0 # Apache-2.0
-requests!=2.12.2,>=2.10.0 # Apache-2.0
+python-glanceclient>=2.8.0 # Apache-2.0
+requests>=2.14.2 # Apache-2.0
xmltodict>=0.10.1 # MIT
python-keystoneclient>=3.8.0 # Apache-2.0
-python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0
+python-novaclient>=9.0.0 # Apache-2.0
python-tackerclient>=0.8.0 # Apache-2.0
PyYAML>=3.10.0 # MIT
opnfv
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/README b/scenarios/os-odl-sfc/role/os-odl-sfc/README
index 1104b339..6d3147ba 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/README
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/README
@@ -11,12 +11,15 @@ This role currently works with:
## os-odl-sfc-noha ##
To run os-odl-sfc-noha you should export the following variables before
-running xci-deploy.sh:
+running xci-deploy.sh. Note that you should change xxxx by the path where
+your releng-xci code is:
export XCI_FLAVOR=noha
export OPNFV_SCENARIO=os-odl-sfc
export OPENSTACK_OSA_VERSION=stable/ocata
export VM_MEMORY_SIZE=16384
+export OPNFV_RELENG_DEV_PATH=/xxxxx/releng-xci
+
## os-odl-sfc-ha ##
@@ -27,6 +30,8 @@ export XCI_FLAVOR=ha
export OPNFV_SCENARIO=os-odl-sfc
export OPENSTACK_OSA_VERSION=stable/ocata
export VM_MEMORY_SIZE=20480
+export OPNFV_RELENG_DEV_PATH=/xxxxx/releng-xci
+
# LIMITATIONS #
@@ -37,25 +42,14 @@ are using:
https://github.com/mardim91/openstack-ansible-os_neutron/tree/ocata-backport-automated-twentyfourth-august
-We will stop doing this as soon as the patches are merged upstream. For example:
-
-https://review.openstack.org/#/c/496231/
-https://review.openstack.org/#/c/497458/
+We will stop doing this as soon as the patches are merged upstream
-2 - Tacker is missing in this integration. Hopefully, it will be added in the
-following days
+2 - It is using a private branch for tacker code because a bug does not
+allow SSL. We will stop doing this as soon as the bug is fixed
# IN PROGRESS/FUTURE #
-1 - Adding tacker to the scenarios
-
-https://gerrit.opnfv.org/gerrit/#/c/39511/
-
-2 - Supporting stable/Pike
-
-Waiting for the release to be ready
-
-3 - Supporting ODL Nitrogen SR1
+1 - Supporting stable/Pike
-Waiting for the release to be ready (7th of September)
+2 - Support openSUSE
diff --git a/setup.py b/setup.py
index a1e9b3bb..566d8443 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,19 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Orange and others.
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
@@ -18,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr>=1.8'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)
diff --git a/sfc/tests/functest/docker/Dockerfile b/sfc/tests/functest/docker/Dockerfile
new file mode 100644
index 00000000..02300294
--- /dev/null
+++ b/sfc/tests/functest/docker/Dockerfile
@@ -0,0 +1,18 @@
+FROM opnfv/functest-core
+
+ARG REF=master
+ARG OPNFV_TAG=master
+ARG OPENSTACK_TAG=stable/pike
+
+RUN apk --no-cache add --update sshpass && \
+ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG | \
+ sed /#egg=sfc/d \
+ > upper-constraints.txt && \
+ git clone https://gerrit.opnfv.org/gerrit/sfc /src/sfc && \
+ (cd /src/sfc && git fetch origin $REF && git checkout FETCH_HEAD) && \
+ pip install --no-cache-dir -cupper-constraints.txt \
+ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+ /src/sfc && \
+ rm -r upper-constraints.txt /src/sfc
+COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
+CMD ["run_tests", "-t", "all"]
diff --git a/sfc/tests/functest/docker/testcases.yaml b/sfc/tests/functest/docker/testcases.yaml
new file mode 100644
index 00000000..64b20461
--- /dev/null
+++ b/sfc/tests/functest/docker/testcases.yaml
@@ -0,0 +1,26 @@
+---
+tiers:
+ -
+ name: features
+ order: 2
+ ci_loop: '(daily)|(weekly)'
+ description: >-
+ Test suites from feature projects
+ integrated in functest
+ testcases:
+ -
+ case_name: functest-odl-sfc
+ project_name: sfc
+ criteria: 100
+ blocking: false
+ description: >-
+ Test suite for odl-sfc to test two chains with one SF and
+ one chain with two SFs
+ dependencies:
+ installer: ''
+ scenario: 'odl.*sfc'
+ run:
+ module: 'functest.core.feature'
+ class: 'BashFeature'
+ args:
+ cmd: 'run_sfc_tests.py'