Added missing order to policy-rule-group

- policy-rule-group should contain order
- fixed fields of containment-endpoint-with-location in renderer.yang

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

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/PolicyInfoUtils.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/PolicyInfoUtils.java
index 100c54f30612396317f036caecdf1ec9daea27fc..4384d5d88da219e27b1dc639de908fd78cf5e322 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/PolicyInfoUtils.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/PolicyInfoUtils.java
@@ -167,6 +167,7 @@ public class PolicyInfoUtils {
                 policyRuleGroupBuilder.setContractId(ruleGrp.getRelatedContract().getId());
                 policyRuleGroupBuilder.setSubjectName(ruleGrp.getRelatedSubject());
                 policyRuleGroupBuilder.setTenantId(ruleGrp.getContractTenant().getId());
+                policyRuleGroupBuilder.setOrder(ruleGrp.getOrder());
                 policyRuleGroupBuilder
                     .setResolvedRule(buildResolvedRules(ruleGrp.getRules(), ruleGrp.getContractTenant()));
                 policyRuleGroups.add(policyRuleGroupBuilder.build());

diff --git a/groupbasedpolicy/src/main/yang/model/renderer.yang b/groupbasedpolicy/src/main/yang/model/renderer.yang
index 6d508eec353d16e89eeb62b768ff003a261d1b26..e5fa0283e1306715107e9228c1968e2bc820b70f 100755 (executable)
--- a/groupbasedpolicy/src/main/yang/model/renderer.yang
+++ b/groupbasedpolicy/src/main/yang/model/renderer.yang
@@ -235,7 +235,7 @@ module renderer {
 
                         list containment-endpoint-with-location {
                             key "context-type context-id";
-                            uses base-endpoint:address-endpoint-fields;
+                            uses base-endpoint:containment-endpoint-fields;
                             uses base-endpoint:has-relative-location;
                         }
                     }

diff --git a/groupbasedpolicy/src/main/yang/renderermanager/resolved-policy.yang b/groupbasedpolicy/src/main/yang/renderermanager/resolved-policy.yang
index 4e9775cd51a4c7dc6f1d8b8a4fb442346e682ee8..b088b06709502325630ae7b2e0ede5621a48f396 100644 (file)
--- a/groupbasedpolicy/src/main/yang/renderermanager/resolved-policy.yang
+++ b/groupbasedpolicy/src/main/yang/renderermanager/resolved-policy.yang
@@ -220,6 +220,7 @@ module resolved-policy {
                        The policy rule group represents the subject with resolved rules.";
                    key "tenant-id contract-id subject-name";
                    uses has-subject-key;
+                   uses policy:has-order;
                    uses has-resolved-rules;
                }
            }