X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=deploy%2Fscenario%2Fscenario.yaml;h=40b9ad43fbe5e0fc4ba24d2ae9ab59b4f89512d9;hb=6dd9f2cda829e3e86a177c7b9b5cf8ca742bf2f7;hp=e978a46d03c1796db57dc64c246de1958a3486c8;hpb=7fd2619e0df370fa832eeff00790bcaa52dc4ffc;p=fuel.git

diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index e978a46d0..40b9ad43f 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -11,46 +11,64 @@
 # Description:
 # This configuration file defines translation between a short deployment
 # scenario name and an actual deployment scenario configuration file
+#
+# Short deployment scenario names are aligned between installer, test, and
+# releng projects according to below pattern.
+#   os-[controller]-[feature]-[mode](-[optionalparameter])
+#
+# Please note that the mechanism to get the details regarding the scenarios
+# is different currently which needs to be aligned as well.
 ##############################################################################
 
-os_ha:
-  configfile: ha_heat_ceilometer_scenario_0.0.1.yaml
+##############################################################################
+# 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.3.yaml
+
+os-nosdn-nofeature-noha:
+  configfile: no-ha_heat_ceilometer_scenario_0.0.2.yaml
+
+os-nosdn-vlan-ha:
+
+os-nosdn-vlan-noha:
 
-os_no-ha:
-  configfile: no-ha_heat_ceilometer_scenario_0.0.1.yaml
+os-odl_l3-nofeature-ha:
+  configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
 
-os_odl-l3_ha:
-  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+os-odl_l3-nofeature-noha:
+  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
 
-os_odl-l3_no-ha:
-  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+os-odl_l2-nofeature-ha:
+  configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml
 
-os_odl-l2_ha:
-  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+os-odl_l2-nofeature-noha:
+  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
 
-os_odl-l2_no-ha:
-  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+os-onos-nofeature-ha:
+  configfile: ha_onos_heat_ceilometer_scenario_0.0.5.yaml
 
-os_onos_ha:
-  configfile: ha_onos_heat_ceilometer_scenario_0.0.1.yaml
+os-onos-nofeature-noha:
+  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml
 
-os_onos_no-ha:
-  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml
+os-nosdn-kvm-ha:
+  configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml
 
-os_kvm_ha:
-  configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
+os-nosdn-kvm-noha:
+  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
 
-os_kvm_no-ha:
-  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
+os-nosdn-ovs-ha:
+  configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
 
-os_ovs_ha:
-  configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+os-nosdn-ovs-noha:
+  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
 
-os_ovs_no-ha:
-  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
 
-os_kvm_ovs_ha:
-  configfile:
+os-odl_l2-bgpvpn-ha:
 
-os_kvm_ovs_no-ha:
-  configfile: no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+os-odl_l2-bgpvpn-noha: