From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 14 Nov 2013 12:36:13 +0000 (+0000)
Subject: Merge "Fixed performance issues with implementation of BA-to-BI mapping"
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~409
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b73670a92d1cc57d24c0da4df22b7b3d3c4fb875;hp=81a6e2e3fc28063a043ef14aabdd68d7ccab85b2

Merge "Fixed performance issues with implementation of BA-to-BI mapping"
---

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
index d589f45332..043b0077f7 100644
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
@@ -10,6 +10,45 @@ module opendaylight-group-statistics {
     revision "2013-11-11" {
         description "Initial revision of group statistics service";
     }
+    
+    typedef group-stats-ref {
+        type instance-identifier;
+    }
+    
+    grouping group-stats-response {
+        uses "inv:node-context-ref";
+
+        leaf group-stats-id {
+            type group-stats-ref;
+        }
+        uses group-types:group-statistics;
+    }
+
+    typedef group-features-ref {
+        type instance-identifier;
+    }
+    
+    grouping group-features-response {
+        uses "inv:node-context-ref";
+
+        leaf group-features-id {
+            type group-features-ref;
+        }
+        uses group-types:group-features;
+    }
+
+    typedef group-desc-ref {
+        type instance-identifier;
+    }
+    
+    grouping group-desc-response {
+        uses "inv:node-context-ref";
+
+        leaf group-desc-id {
+            type group-desc-ref;
+        }
+        uses group-types:group-desc-stats;
+    }
 
 	// RPC calls
 	rpc get-all-group-statistics {
@@ -18,7 +57,7 @@ module opendaylight-group-statistics {
         }
         output {
             list group-statistics {
-                uses group-types:group-statistics;
+                uses group-stats-response;
             }
             uses tr:transaction-aware;
         }
@@ -33,7 +72,7 @@ module opendaylight-group-statistics {
             }
         }
         output {
-            uses group-types:group-statistics;
+            uses group-stats-response;
             uses tr:transaction-aware;
         }
 	
@@ -47,7 +86,7 @@ module opendaylight-group-statistics {
             }
         }
         output {
-        	uses group-types:group-desc-stats;
+            uses group-desc-response;
             uses tr:transaction-aware;
         }
 	}
@@ -60,7 +99,7 @@ module opendaylight-group-statistics {
             }
         }
         output {
-        	uses group-types:group-features;
+            uses group-features-response;
             uses tr:transaction-aware;
         }
 	}
@@ -69,17 +108,17 @@ module opendaylight-group-statistics {
 	//Notification calls
 	
 	notification group-statistics-updated {
-		uses group-types:group-statistics;
+		uses group-stats-response;
         uses tr:transaction-aware;
 	}
 	
 	notification group-desc-stats-updated {
-		uses group-types:group-desc-stats;
+		uses group-desc-response;
         uses tr:transaction-aware;
 	}
 
-	notification group-features {
-		uses group-types:group-features;
+	notification group-features-updated {
+		uses group-features-response;
         uses tr:transaction-aware;
 	}
 }
diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
index 5aea6b7499..18dd60d08d 100644
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
@@ -12,6 +12,45 @@ module opendaylight-meter-statistics {
         description "Initial revision of meter statistics service";
     }
 
+    typedef meter-stats-ref {
+        type instance-identifier;
+    }
+    
+    grouping meter-stats-response {
+        uses "inv:node-context-ref";
+
+        leaf meter-stats-id {
+            type meter-stats-ref;
+        }
+        uses meter-types:meter-statistics;
+    }
+
+    typedef meter-config-ref {
+        type instance-identifier;
+    }
+    
+    grouping meter-config-response {
+        uses "inv:node-context-ref";
+
+        leaf meter-config-id {
+            type meter-config-ref;
+        }
+        uses meter-types:meter-config-stats;
+    }
+
+    typedef meter-features-ref {
+        type instance-identifier;
+    }
+    
+    grouping meter-features-response {
+        uses "inv:node-context-ref";
+
+        leaf meter-features-id {
+            type meter-features-ref;
+        }
+        uses meter-types:meter-features;
+    }
+
 	// RPC calls
 	rpc get-all-meter-statistics {
 		input {
@@ -19,7 +58,7 @@ module opendaylight-meter-statistics {
         }
         output {
             list meter-statistics {
-                uses meter-types:meter-statistics;
+                uses meter-stats-response;
                 uses tr:transaction-aware;
             }
         }
@@ -35,7 +74,7 @@ module opendaylight-meter-statistics {
             }
         }
         output {
-            uses meter-types:meter-statistics;
+            uses meter-stats-response;
             uses tr:transaction-aware;
         }
 	
@@ -49,7 +88,7 @@ module opendaylight-meter-statistics {
             }
         }
         output {
-        	uses meter-types:meter-config-stats;
+        	uses meter-config-response;
             uses tr:transaction-aware;
         }
 	}
@@ -62,7 +101,7 @@ module opendaylight-meter-statistics {
 	        }
         }
         output {
-        	uses meter-types:meter-features;
+        	uses meter-features-response;
             uses tr:transaction-aware;
         }
 	}
@@ -71,17 +110,17 @@ module opendaylight-meter-statistics {
 	//Notification calls
 	
 	notification meter-statistics-updated {
-		uses meter-types:meter-statistics;
+		uses meter-stats-response;
         uses tr:transaction-aware;
 	}
 	
 	notification meter-config-stats-updated {
-		uses meter-types:meter-config-stats;
+		uses meter-config-response;
         uses tr:transaction-aware;
 	}
 
-	notification meter-features {
-		uses meter-types:meter-features;
+	notification meter-features-updated {
+		uses meter-features-response;
         uses tr:transaction-aware;
 	}
 }