From c3e77f6abf90cbbc41e059a8eee19bd55098579d Mon Sep 17 00:00:00 2001
From: Ferenc Cserepkei <ferenc.cserepkei@ericsson.com>
Date: Tue, 12 Apr 2016 13:52:03 +0200
Subject: [PATCH] SFC classifier feature set updated

From now on One can choose between 'NetVirt' and 'GBP' classifier.
The default is 'NetVirt'

Change-Id: Ibdcd455f0f43d8ca5364cab60ac2f28860c40916
Signed-off-by: Ferenc Cserepkei <ferenc.cserepkei@ericsson.com>
---
 .../parser/functions/odl_karaf_features.rb    |  2 +-
 environment_config.yaml                       | 34 +++++++++++++------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_karaf_features.rb b/deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_karaf_features.rb
index 676139e..31bae77 100644
--- a/deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_karaf_features.rb
+++ b/deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_karaf_features.rb
@@ -8,7 +8,7 @@ module Puppet::Parser::Functions
     enabled_features << features_set['odl-default']
     enabled_features << features_set['ovs'] if not odl_settings['enable_bgpvpn']
     enabled_features << features_set['sfc'] if odl_settings['enable_sfc']
-    enabled_features << features_set['gbp'] if odl_settings['enable_gbp']
+    enabled_features << features_set[odl_settings['sfc_class']] if odl_settings['enable_sfc']
     enabled_features << features_set['vpn'] if odl_settings['enable_bgpvpn']
 
     enabled_features.join(',')
diff --git a/environment_config.yaml b/environment_config.yaml
index e62cc33..63d7263 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,9 +1,4 @@
 attributes:
-  enable_gbp:
-    weight: 14
-    type: "checkbox"
-    value: false
-    label: "GBP features"
   enable_l3_odl:
     weight: 12
     type: "checkbox"
@@ -17,8 +12,25 @@ attributes:
     type: "checkbox"
     value: false
     label: "SFC features"
+  sfc_class:
+    weight: 14
+    type: "select"
+    value: "ncr"
+    label: "Classifier used by SFC"
+    values:
+      - data: "ncr"
+        label: "NetVirt"
+      - data: "gcr"
+        label: "GBP"
+    description:
+      >
+       Classifier determines what traffic needs to be chained based on policy based on yang model.
+       The OpenDayLight actually supports the OVSDB NetVirt and the GBP classifier in case of SFC.
+    restrictions:
+      - condition: "settings:opendaylight.enable_sfc.value == false"
+        action: "hide"
   enable_bgpvpn:
-    weight: 13
+    weight: 15
     type: "checkbox"
     value: false
     label: "BGPVPN extensions"
@@ -36,7 +48,7 @@ attributes:
         strict: false
         message: "Openvswitch with NSH support (fuel-plugin-ovs) must be installed and enabled."
   bgpvpn_gateway:
-    weight: 13
+    weight: 16
     type: "text"
     value: "0.0.0.0"
     description: "Define the default gateway for BGPVPN"
@@ -62,9 +74,11 @@ attributes:
         - odl-restconf-all
         - odl-aaa-authn
         - odl-dlux-all
-      gbp:
-        - odl-groupbasedpolicy-neutronmapper
-        - odl-groupbasedpolicy-ofoverlay
+      gcr:
+        - odl-groupbasedpolicy-ovssfc
+      ncr:
+        - odl-ovsdb-sfc
+        - odl-ovsdb-sfc-rest
       ovs:
         - odl-ovsdb-openstack
       sfc: