Merge "Adding name param for forwarding enties:"

diff --combined groupbasedpolicy/src/main/yang/model/forwarding.yang
index d3394699f433e27311ab82a32101d994dae36c86,3dd66bc2b58df660c0017e8e926ec64d3d07bbf6..2fcca5d1c20de51b74f56b7ddcab945ab3bb8b34
--- 1/groupbasedpolicy/src/main/yang/model/forwarding.yang
--- 2/groupbasedpolicy/src/main/yang/model/forwarding.yang
+++ b/groupbasedpolicy/src/main/yang/model/forwarding.yang
@@@ -29,6 -29,7 +29,6 @@@ module forwarding 
  
      identity context-type {
          description "Type of context.";
 -        base network-domain;
      }
  
      typedef address-type-ref {
@@@ -66,11 -67,9 +66,9 @@@
      grouping context-key {
          leaf context-type {
              type context-type-ref;
-             mandatory true;
          }
          leaf context-id {
              type gbp-common:context-id;
-             mandatory true;
          }
      }
  
@@@ -81,6 -80,17 +79,17 @@@
          }
      }
  
+     grouping forwarding-fields {
+ 
+         container parent {
+             uses context-key;
+         }
+ 
+         leaf name {
+             type gbp-common:name;
+         }
+     }
+ 
      grouping forwarding-with-tenant-fields {
          leaf tenant-id {
              type gbp-common:tenant-id;
@@@ -92,20 -102,14 +101,14 @@@
              key "context-type context-id";
              uses context-key;
  
-             uses has-address-type;
-             container parent {
-                 uses context-key;
-             }
+             uses forwarding-fields;
          }
  
          list network-domain {
              key "network-domain-type network-domain-id";
              uses network-domain-key;
  
-             container parent {
-                 uses context-key;
-             }
- 
+             uses forwarding-fields;
              description "Network domain can be augmented with further information.";
          }
      }