Merge "Add Functional Tests for Flowfilter keytypes"

diff --cc coordinator/test/vtn_ft/vtn_vterm_vtermif.data
index ff764d7cff934ac1847ac3f7c3279f8afb0d4710,76cf63faa4c69b661757839bb1d5a8adff493ee6..fe54ea55aa7c718f416aaf421f2a9c531fd4fc96
--- 1/coordinator/test/vtn_ft/vtn_vterm_vtermif.data
--- 2/coordinator/test/vtn_ft/vtn_vterm_vtermif.data
+++ b/coordinator/test/vtn_ft/vtn_vterm_vtermif.data
@@@ -20,6 -20,6 +20,8 @@@ tagged=tru
  
  
  
++
++
  [VTermIfTwo]
  vtermif_name=vtermiftwo
  description=second vtermif for vtermone
@@@ -46,6 -46,6 +48,7 @@@ vlan_id=
  tagged=false
  
  
++
  [VTermIfFour]
  vtermif_name=vtermiffour
  description=second vtermif for vtermtwo
@@@ -59,6 -59,6 +62,7 @@@ vlan_id=
  tagged=true
  
  
++
  [MultiCtrVTermIfOne]
  vtermif_name=vtermifone
  description=first vtermif for vtermone
@@@ -71,6 -71,6 +75,7 @@@ vlan_id=
  tagged=true
  
  
++
  [MultiCtrVTermIfThree]
  vtermif_name=vtermifthree
  description=first vtermif for vtermtwo