Merge "Update SFC netvirt CSIT with fluorine and queens"

diff --combined jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 8ae71e49b1d3811f5c702389b7ae2463f3759849,d889e5838abe2809aa92cccea95f7adfef4cd9ce..02475d741d793ed0b7799d9af5b7e687d900bab4
--- 1/jjb/netvirt/netvirt-csit-multi-openstack.yaml
--- 2/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@@ -12,9 -12,9 +12,9 @@@
      enable-openstack-services: 'placement-api,tempest'
      enable-openstack-compute-services: 'placement-client'
      security-group-mode: 'stateful'
 -    odl_system_flavor: v2-standard-8
 -    openstack_system_flavor: v2-standard-8
 -    openstack_system2_flavor: v2-standard-4
 +    odl_system_flavor: odl-standard-8
 +    openstack_system_flavor: odl-standard-8
 +    openstack_system2_flavor: odl-standard-4
  
      topology:
        - 1node:
@@@ -71,9 -71,9 +71,9 @@@
      enable-openstack-services: 'placement-api,tempest'
      enable-openstack-compute-services: 'placement-client'
      security-group-mode: 'stateful'
 -    odl_system_flavor: v2-standard-8
 -    openstack_system_flavor: v2-standard-8
 -    openstack_system2_flavor: v2-standard-4
 +    odl_system_flavor: odl-standard-8
 +    openstack_system_flavor: odl-standard-8
 +    openstack_system2_flavor: odl-standard-4
  
      topology:
        - 1node:
@@@ -129,9 -129,9 +129,9 @@@
      enable-openstack-services: 'placement-api,tempest'
      enable-openstack-compute-services: 'placement-client'
      security-group-mode: 'stateful'
 -    odl_system_flavor: v2-standard-8
 -    openstack_system_flavor: v2-standard-8
 -    openstack_system2_flavor: v2-standard-4
 +    odl_system_flavor: odl-standard-8
 +    openstack_system_flavor: odl-standard-8
 +    openstack_system2_flavor: odl-standard-4
  
      topology:
        - 1node:
@@@ -184,9 -184,9 +184,9 @@@
      enable-openstack-services: 'placement-api,tempest'
      enable-openstack-compute-services: 'placement-client'
      security-group-mode: 'stateful'
 -    odl_system_flavor: v2-standard-8
 -    openstack_system_flavor: v2-standard-8
 -    openstack_system2_flavor: v2-standard-4
 +    odl_system_flavor: odl-standard-8
 +    openstack_system_flavor: odl-standard-8
 +    openstack_system2_flavor: odl-standard-4
  
      topology:
        - 1node:
@@@ -232,8 -232,8 +232,8 @@@
  
      project: 'netvirt'
      security-group-mode: 'stateful'
 -    odl_system_flavor: v2-standard-4
 -    openstack_system2_flavor: v2-standard-2
 +    odl_system_flavor: odl-standard-4
 +    openstack_system2_flavor: odl-standard-2
  
      topology:
        - 1node:
@@@ -250,8 -250,10 +250,10 @@@
            testplan: '{project}-extensions-sfc.txt'
  
      stream:
-       - oxygen:
+       - fluorine:
            branch: 'master'
+       - oxygen:
+           branch: 'stable/oxygen'
        - nitrogen:
            branch: 'stable/nitrogen'
        - carbon:
@@@ -259,10 -261,9 +261,9 @@@
            karaf-version: karaf3
  
      openstack:
-       - pike:
-           openstack-branch: 'stable/pike'
-           odl-ml2-branch: 'stable/pike'
+       - queens:
+           openstack-branch: 'stable/queens'
+           odl-ml2-branch: 'stable/queens'
            odl-ml2-port-binding: 'pseudo-agentdb-binding'
            openstack_system_image: '{openstack_system_image_pike}'
            openstack_system2_image: '{openstack_system_image_pike}'
-           enable-openstack-network-services: '{openstack_legacy_default_network_services}'