Split resolved-policy to provided and consumed

Signed-off-by: Martin Sunal <msunal@cisco.com>

diff --git a/groupbasedpolicy/src/main/yang/model/common.yang b/groupbasedpolicy/src/main/yang/model/common.yang
index 7f7058e7dfa8a8f44a7511c8fc809766bff1cf5f..fe5b28e7ffe8003abb25a22f51963dda92954617 100755 (executable)
--- a/groupbasedpolicy/src/main/yang/model/common.yang
+++ b/groupbasedpolicy/src/main/yang/model/common.yang
@@ -42,6 +42,9 @@ module gbp-common {
 
     // UUID type from ietf-yang-types@2013-07-15
     typedef uuid {
+
+        status deprecated;
+
         type string {
             pattern '[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-'
                 + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';

diff --git a/groupbasedpolicy/src/main/yang/model/renderer.yang b/groupbasedpolicy/src/main/yang/model/renderer.yang
index e66fc1f37222a1f967b0f2b17127ba9c7afa7190..2c5cda0824b9a73e9e75bd218e0c03dd48f6088a 100755 (executable)
--- a/groupbasedpolicy/src/main/yang/model/renderer.yang
+++ b/groupbasedpolicy/src/main/yang/model/renderer.yang
@@ -188,15 +188,23 @@ module renderer {
                                 type policy-name;
                             }
 
-                            container resolved-policy {
-                                list rule-group-with-renderer-endpoint-participation {
+                            container provided-resolved-policy {
+                                list provided-rule-group {
                                     description "A specific policy rule group that apply to pair of endpoints.
+                                        Renderer Endpoint is a provider of the rule group.
                                         Entire rule-group is located on /renderers/renderer/renderer-policy/configuration/rule-groups/rule-group";
-                                    key "tenant-id contract-id subject-name renderer-endpoint-participation";
+                                    key "tenant-id contract-id subject-name";
+                                    uses resolved-policy:has-subject-key;
+                                }
+                            }
+
+                            container consumed-resolved-policy {
+                                list consumed-rule-group {
+                                    description "A specific policy rule group that apply to pair of endpoints.
+                                        Renderer Endpoint is a consumer of the rule group.
+                                        Entire rule-group is located on /renderers/renderer/renderer-policy/configuration/rule-groups/rule-group";
+                                    key "tenant-id contract-id subject-name";
                                     uses resolved-policy:has-subject-key;
-                                    leaf renderer-endpoint-participation {
-                                        type endpoint-policy-participation;
-                                    }
                                 }
                             }