Temporary fix for ONOS deployment scenario.

- Although ONOS supports L3, this patch doesnt let the L3 capabilities
  of ONOS loose - this is due to OPNFV Pharos lab incompatibilities
  with ONOS. Hope to have a fix soon
- Also provides a template for scenario short names

Change-Id: Ie86bcdc23492ee0fd7a19c11eecfca07afb64df3
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>

diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index 58f45c7..abde2e7 100644 (file)
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -20,6 +20,14 @@
 # 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
 
@@ -45,10 +53,10 @@ os-odl_l2-nofeature-noha:
   configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
 
 os-onos-nofeature-ha:
-  configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_onos_heat_ceilometer_scenario_0.0.1.yaml
 
 os-onos-nofeature-noha:
-  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml
 
 os-nosdn-kvm-ha:
   configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml