Fixed bug with groupRef and meterRef in group and meter models.

Change-Id: I4f6bf451ea8b7b554c407d4988b45375e71bd7a1
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
index 5aaaf5ff51d7ad5b3f1c861fe95f7af8f928408f..8e77d26ea4afe61eea770873fea7d05a7bbd4818 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
@@ -10,8 +10,8 @@ module opendaylight-group-types {
         description "Initial revision of group service";
     }
 
         description "Initial revision of group service";
     }
 

-    typedef group-ref {
-        type instance-identifier;
+    typedef group-id {
+        type uint32;

     }
     
     grouping group-types {
     }
     
     grouping group-types {


@@ -30,7 +30,7 @@ module opendaylight-group-types {
         uses group-types;
         
         leaf group-id {
         uses group-types;
         
         leaf group-id {

-            type group-ref;
+            type group-id;

         }
         
         leaf group-name {
         }
         
         leaf group-name {

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
index a425506e0275863632d29914141bc5e9a6ea29f5..99d4588cbc85b2491c3f06a346014b9072130b2e 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
@@ -10,8 +10,8 @@ module opendaylight-meter-types {
         description "Initial revision of meter service";
     }
 
         description "Initial revision of meter service";
     }
 

-    typedef meter-ref {
-            type instance-identifier;
+    typedef meter-id {
+            type uint32;

     }
     
     grouping meter-flags {
     }
     
     grouping meter-flags {


@@ -82,7 +82,7 @@ module opendaylight-meter-types {
         uses meter-flags;        
         
         leaf meter-id {
         uses meter-flags;        
         
         leaf meter-id {

-            type meter-ref;
+            type meter-id;

         }
         
         container meter-band-headers {
         }
         
         container meter-band-headers {