From: Prasanna Huddar <prasanna.huddar@ericsson.com>
Date: Sat, 21 Dec 2013 15:08:59 +0000 (+0530)
Subject: Fixed as per comments by changed leaf name
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~156
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b271ec102f1ddd5d68253a0876ce5fccfd84a319

Fixed as per comments by changed leaf name

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: Ice082e5cf38cb6d4915465b17c9be4892174cc2e
---

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 8c874e2fe8..e01a257c3d 100644
--- 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
@@ -84,6 +84,10 @@ module opendaylight-group-types {
     	description "Check chaining for loops and delete";
     }
     
+    typedef group-ref {
+        type instance-identifier;
+    }
+    
     grouping group {
         
         leaf group-type {
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 b380af2212..fec0a7bd59 100644
--- 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
@@ -112,6 +112,10 @@ module opendaylight-meter-types {
         }
     }
     
+    typedef meter-ref {
+        type instance-identifier;
+    }
+    
     grouping meter {
         
         leaf flags {
diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
index 2bcd405223..a0beb2a84c 100644
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
@@ -12,6 +12,10 @@ module opendaylight-flow-types {
         description "Initial revision of flow service";
     }
     
+    typedef flow-ref {
+        type instance-identifier;
+    }
+    
     typedef output-port-values {
         type enumeration {
             enum MAX {
diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
index 089469f045..895e54e7d5 100644
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
@@ -51,6 +51,9 @@ module sal-flow {
 
     rpc add-flow {
         input {
+            leaf flow-ref {
+                type types:flow-ref;
+            }
             uses node-flow;
             uses tr:transaction-aware;
         }
@@ -61,6 +64,9 @@ module sal-flow {
 
     rpc remove-flow {
         input {
+            leaf flow-ref {
+                type types:flow-ref;
+            }
             uses node-flow;
             uses tr:transaction-aware;
         }
@@ -71,6 +77,9 @@ module sal-flow {
 
     rpc update-flow {
         input {
+            leaf flow-ref {
+                type types:flow-ref;
+            }
             uses flow-update;
             uses tr:transaction-aware;
         }
@@ -87,6 +96,7 @@ module sal-flow {
     notification flow-updated {
         uses node-flow;
         uses tr:transaction-aware;
+        
     }
 
     notification flow-removed {
diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
index bbe4740e71..1626610059 100644
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
@@ -31,6 +31,9 @@ module sal-group {
 
     rpc add-group {
         input {
+            leaf group-ref {
+                type group-type:group-ref;
+            }
             uses node-group;
             uses tr:transaction-aware;
         }
@@ -41,6 +44,9 @@ module sal-group {
 
     rpc remove-group {
         input {
+            leaf group-ref {
+                type group-type:group-ref;
+            }
             uses node-group;
             uses tr:transaction-aware;
         }
@@ -51,6 +57,9 @@ module sal-group {
 
     rpc update-group {
         input {
+            leaf group-ref {
+                type group-type:group-ref;
+            }
             uses group-update;
             uses tr:transaction-aware;
         }
diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
index 65b22b29dd..af4975eda4 100644
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
@@ -31,6 +31,9 @@ module sal-meter {
 
     rpc add-meter {
         input {
+            leaf meter-ref {
+                type meter-type:meter-ref;
+            }
             uses node-meter;
             uses tr:transaction-aware;            
         }
@@ -41,6 +44,10 @@ module sal-meter {
 
     rpc remove-meter {
         input {
+            leaf meter-ref {
+                type meter-type:meter-ref;
+            }
+            
             uses node-meter;
             uses tr:transaction-aware;            
         }
@@ -51,6 +58,10 @@ module sal-meter {
 
     rpc update-meter {
         input {
+            leaf meter-ref {
+                type meter-type:meter-ref;
+            }
+            
             uses meter-update;
             uses tr:transaction-aware;            
         }