X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-statistics%2Fsrc%2Fmain%2Fyang%2Fflow-statistics.yang;h=2b1d99302629fa842ee04ed2ddb208392851e9aa;hp=80e02806e819c37896d83dbd40e50007681312f0;hb=45b75a6ba76bf8b453b5f0de11ceb0c3bba1e842;hpb=2da26725be793b315794e751ecca009c7691008c

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
index 80e02806e8..2b1d993026 100644
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
@@ -7,9 +7,11 @@ module opendaylight-flow-statistics {
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-flow-types {prefix flow-types;revision-date "2013-10-26";}
     import opendaylight-statistics-types {prefix stat-types;revision-date "2013-09-25";}
+    import opendaylight-table-types {prefix table-types;revision-date "2013-10-26";}
     import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";}
     import flow-capable-transaction {prefix tr;}
     import sal-flow {prefix flow;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     
 
     revision "2013-08-19" {
@@ -32,7 +34,7 @@ module opendaylight-flow-statistics {
 	
 	typedef flow-id {
 		description "flow id";
-		type yang:counter32;
+		type inet:uri;
 	}
 	
 	grouping flow-and-statistics-map-list {
@@ -70,7 +72,7 @@ module opendaylight-flow-statistics {
         input {
             uses inv:node-context-ref;
             leaf table-id {
-            	type flow-types:table-id;
+            	type table-types:table-id;
             }
         }
         output {
@@ -114,13 +116,13 @@ module opendaylight-flow-statistics {
         }
 	}    
 	
-    // RPC calls to fetch flow statistics
+    // RPC calls to fetch aggregate flow statistics
     rpc get-aggregate-flow-statistics-from-flow-table-for-all-flows {
     	description "Fetch aggregate statistics for all the flows present in the specific flow table of the switch"; 
         input {
             uses inv:node-context-ref;
             leaf table-id {
-            	type flow-types:table-id;
+            	type table-types:table-id;
             }
         }
         output {
@@ -149,76 +151,4 @@ module opendaylight-flow-statistics {
 		uses stat-types:aggregate-flow-statistics;
 		uses tr:transaction-aware;
     }
-	
-	//Keeping flow statistics RPC call for backward compatibility for sal-compatibility layer --START
-	rpc get-flow-statistics {
-        input {
-            uses inv:node-context-ref;
-            uses flow-types:flow;
-        }
-        output {
-            uses flow-types:flow-statistics;
-        }
-    }
-
-    rpc get-all-flow-statistics {
-        input {
-            uses inv:node-context-ref;
-        }
-        output {
-            list flow-statistics {
-                uses flow-types:flow-statistics;
-            }
-        }
-    }
-
-    notification flow-statistics-updated {
-        uses flow-types:flow-statistics;
-    }
-	
-	//Keeping flow statistics RPC call for backward compatibility for sal-compatibility layer --END
-	
-	//RPC call to fetch node connector statistics
-    rpc get-node-connector-statistics {
-        input {
-            uses inv:node-context-ref;
-            leaf node-connector {
-                type inv:node-connector-ref;
-            }
-        }
-        output {
-            uses stat-types:node-connector-statistics;
-        }
-    }
-
-    rpc get-all-node-connector-statistics {
-        input {
-            uses inv:node-context-ref;
-        }
-        output {
-            list node-connector-statistics {
-                uses stat-types:node-connector-statistics;
-            }
-        }
-    }
-
-    rpc get-flow-table-statistics {
-        input {
-            uses inv:node-context-ref;
-        }
-        output {
-            uses flow-types:flow-table-statistics;
-        }
-    }
-
-    notification flow-table-statistics-updated {
-        leaf flow-table {
-            type flow:flow-table-ref;
-        }
-        uses flow-types:flow-table-statistics;
-    }
-
-    notification node-connector-statistics-updated {
-        uses stat-types:node-connector-statistics;
-    }
 }