Merge "Table features : modified yang model. Patch set 2: Modified match types as...

diff --cc opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
index 1b6a689750df8e3bd88e8ef632791b7a65384f3a,52629516f3f61314b76d017117b8fcf47fe5b4d5..3774f950fc63aa139b35749cfaf9e2c4ffad0af4
--- 1/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
--- 2/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
@@@ -167,15 -314,15 +314,15 @@@ module opendaylight-table-types 
              }
              
              container table-properties {
-                 list instruction-id {
-                     key "order";
-                     leaf order {
-                         type int32;
-                     }
-                     
-                     uses table-feature-prop-type;
+                 list table-feature-properties {
+                      key "order";
+                      leaf order {
+                          type int32;
+                      }
+                      uses table-feature-prop-type;
                  }
              }
+ 
          }
      }    
--}
++}