From bf0ba7de8ab4aa43cf590c9c46a5d4cc73166d47 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Wed, 12 Oct 2016 08:42:58 -0700 Subject: [PATCH] Refactor flow service test Change OVS 2.0 -> OVS 2.5 Add table miss feature for OVS 2.5 Adjust FRS test to check functionality (add flow stats delay) This change requires https://git.opendaylight.org/gerrit/#/c/46797 Change-Id: Ida2bfc316f1770358d9f7e604f4201d5813cb6c0 Signed-off-by: Luis Gomez --- .../openflowplugin-csit-flow-services-frs.yaml | 10 +++++++--- .../openflowplugin-csit-flow-services-old.yaml | 5 ++++- .../openflowplugin-csit-flow-services.yaml | 5 ++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml index 9d6e59516..a5cc21f91 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml @@ -23,10 +23,14 @@ scope: 'only' # Features to install - install-features: 'odl-restconf,odl-openflowplugin-app-config-pusher,odl-openflowplugin-app-topology,odl-openflowplugin-app-forwardingrules-sync' + install-features: 'odl-restconf,odl-openflowplugin-app-config-pusher,odl-openflowplugin-app-topology,odl-openflowplugin-app-forwardingrules-sync,odl-openflowplugin-app-table-miss-enforcer' - # Robot custom options - robot-options: '' + # Robot custom options. + # We need this delay to verify proper functionality. THIS HAS TO BE REMOVED BEFORE FRS GETS RELEASED. + robot-options: '-v flow_update_time:30s' + + # mininet image + mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml index 19985f2a0..87398148d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml @@ -22,10 +22,13 @@ scope: 'all' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' + install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer' # Robot custom options robot-options: '' + # mininet image + mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' + # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index d6c1ed29b..08134d3d6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -26,10 +26,13 @@ scope: 'all' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' + install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer' # Robot custom options robot-options: '' + # mininet image + mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' + # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' -- 2.36.6