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 <ecelgp@gmail.com>

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
index 9d6e59516b9d7db63160fedb5098e66f01f9d58d..a5cc21f91a2c0c1f1942bb1720a1e7568165fb0f 100644 (file)
--- 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 19985f2a05d5147f381fb45c0e033902c5c91744..87398148d3ae16955e98c1b419102f367c650b78 100644 (file)
--- 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 d6c1ed29bb6367f46fe9fdfc58c2c0dbdfadf80a..08134d3d6f85757a769488e912120c7bed620587 100644 (file)
--- 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}'