X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=deploy%2Fscenario%2Fscenario.yaml;h=66d32da6845054c7c2be72f98654c4ae971a37be;hb=e702ffe67578ff156b9876ab05f684fee896ada7;hp=69b82f1aa2f34b944f46d425f7475d9a2249cf24;hpb=73826919b59316d8b3200b883b6aee7d4b3c5f70;p=fuel.git

diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index 69b82f1aa..66d32da68 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -20,50 +20,76 @@
 # is different currently which needs to be aligned as well.
 ##############################################################################
 
+##############################################################################
+# Short scenario name convention to be followed:
+# os-<controller>-<feature>-<mode>[-<optional-parameter>]
+# controler: nosdn|odl|onos|ocl|...
+# feaure: nofeature | [vlan]_[kvm]_[ovs]_[vlan]_....
+# mode: ha|noha
+##############################################################################
+
 os-nosdn-nofeature-ha:
-  configfile: ha_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: ha_heat_ceilometer_scenario.yaml
 
 os-nosdn-nofeature-noha:
-  configfile: no-ha_heat_ceilometer_scenario_0.0.1.yaml
-
-os-nosdn-vlan-ha:
-  configfile: ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
-
-os-nosdn-vlan-noha:
-  configfile: no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_heat_ceilometer_scenario.yaml
 
 os-odl_l3-nofeature-ha:
-  configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: ha_odl-l3_heat_ceilometer_scenario.yaml
 
 os-odl_l3-nofeature-noha:
-  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_odl-l3_heat_ceilometer_scenario.yaml
 
 os-odl_l2-nofeature-ha:
-  configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: ha_odl-l2_heat_ceilometer_scenario.yaml
 
 os-odl_l2-nofeature-noha:
-  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_odl-l2_heat_ceilometer_scenario.yaml
 
 os-onos-nofeature-ha:
-  configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_onos_nofeature_heat_ceilometer_scenario.yaml
 
 os-onos-nofeature-noha:
-  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
+
+os-onos-sfc-ha:
+  configfile: ha_onos_sfc_heat_ceilometer_scenario.yaml 
+
+os-onos-sfc-noha:
+  configfile: no-ha_onos_sfc_heat_ceilometer_scenario.yaml
 
 os-nosdn-kvm-ha:
-  configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: ha_nfv-kvm_heat_ceilometer_scenario.yaml
 
 os-nosdn-kvm-noha:
-  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
 
 os-nosdn-ovs-ha:
-  configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: ha_nfv-ovs_heat_ceilometer_scenario.yaml
 
 os-nosdn-ovs-noha:
-  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+
+os-odl_l2-bgpvpn-ha:
+  configfile: ha_odl-bgpvpn_scenario.yaml
+
+os-odl_l2-bgpvpn-noha:
+  configfile: no-ha_odl-bgpvpn_scenario.yaml
+
+os-odl_l2-sfc-ha:
+  configfile: ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+
+os-odl_l2-sfc-noha:
+  configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+
+os-nosdn-kvm_ovs_dpdk-ha:
+  configfile: ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+
+os-nosdn-kvm_ovs_dpdk-noha:
+  configfile: no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
 
-os-nosdn-kvm_ovs-ha:
-  configfile:
+os-nosdn-kvm_ovs_dpdk_bar-ha:
+  configfile: ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
 
-os-nosdn-kvm_ovs-noha:
-  configfile: no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+os-nosdn-kvm_ovs_dpdk_bar-noha:
+  configfile: no-ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml