Remove deprecated & unused notifications

Deprecated notifications in sal-group.yang & sal-port.yang
are not used any more. Remove the notifications from the data
models.

JIRA: OPNFLWPLUG-1119
Change-Id: Ic9428d5bbcae07225357adde1f72230991b5da1d
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/model/model-flow-service/src/main/yang/sal-group.yang b/model/model-flow-service/src/main/yang/sal-group.yang
index ce79772b6f861ad678d167c65a640783d7ebee2f..4e8e4da46cf984685bce1e349f0274198802ec00 100644 (file)
--- a/model/model-flow-service/src/main/yang/sal-group.yang
+++ b/model/model-flow-service/src/main/yang/sal-group.yang
@@ -10,18 +10,18 @@ module sal-group {
 
     revision "2013-09-18" {
         description "Initial revision of group service";
-    }        
-    
+    }
+
     grouping node-group {
         description "Basic group structure suitable for rpc input (contains node-context).";
-        uses "inv:node-context-ref";        
+        uses "inv:node-context-ref";
         uses group-type:group;
     }
 
     grouping group-update {
         description "DataStore aware update group structure suitable for rpc input (contains node-context).";
         uses "inv:node-context-ref";
-        
+
         container original-group {
             uses group-type:group;
         }
@@ -37,7 +37,7 @@ module sal-group {
             leaf group-ref {
                 type group-type:group-ref;
             }
-            uses node-group;            
+            uses node-group;
         }
         output {
             uses tr:transaction-aware;
@@ -51,7 +51,7 @@ module sal-group {
             leaf group-ref {
                 type group-type:group-ref;
             }
-            uses node-group;            
+            uses node-group;
         }
         output {
             uses tr:transaction-aware;
@@ -65,43 +65,10 @@ module sal-group {
             leaf group-ref {
                 type group-type:group-ref;
             }
-            uses group-update;            
+            uses group-update;
         }
         output {
             uses tr:transaction-aware;
         }
-    } 
-
-    notification group-added {
-        status deprecated;
-
-        uses tr:transaction-metadata;
-        leaf group-ref {
-            type group-type:group-ref;
-        }
-        uses node-group;
-        uses tr:transaction-aware;
     }
-
-    notification group-updated {
-        status deprecated;
-
-        uses tr:transaction-metadata;
-        leaf group-ref {
-            type group-type:group-ref;
-        }
-        uses node-group;
-        uses tr:transaction-aware;
-    }
-
-    notification group-removed {
-        status deprecated;
-
-        uses tr:transaction-metadata;
-        leaf group-ref {
-            type group-type:group-ref;
-        }
-        uses node-group;
-        uses tr:transaction-aware;
-    }    
 }

diff --git a/model/model-flow-service/src/main/yang/sal-port.yang b/model/model-flow-service/src/main/yang/sal-port.yang
index a65e0f49061b867449bd183724d2c8c174946b23..34a9b9b4ecb1ab864d929f251802e831797bdd64 100644 (file)
--- a/model/model-flow-service/src/main/yang/sal-port.yang
+++ b/model/model-flow-service/src/main/yang/sal-port.yang
@@ -10,16 +10,9 @@ module sal-port {
 
     revision "2013-11-07" {
         description "Initial revision of port service";
-    }        
-    
-    grouping node-port {
-        description "Openflow port configuration structure suitable for rpc (contains node-context-ref).";
-
-        uses "inv:node-context-ref";
-        uses port-type:flow-port-status;
     }
 
-    /** Base configuration structure **/
+    // Base configuration structure
     grouping port-update {
         description "DataStore aware openflow port configuration update structure suitable for rpc (contains node-context-ref).";
 
@@ -43,17 +36,4 @@ module sal-port {
             uses tr:transaction-aware;
         }
     }
-    
-    notification port-updated {
-        status deprecated;
-
-        uses port-update;
-        uses tr:transaction-aware;
-    }
-    
-    notification port-removed {
-        status deprecated;
-
-        uses node-port;       
-    }
 }