X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-service%2Fsrc%2Fmain%2Fyang%2Fflow-node-inventory.yang;h=d4c06c57841576a38a26414dbf98f66300e34e69;hb=4f5a4b3e71e81c6149a1ca78ca418866e152c45b;hp=80a4ccf0878de6bd5a9b2775377fc7ec133e5162;hpb=84d9bf62ad4291a3baba3a747cf77e81bb2d3aeb;p=controller.git

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
index 80a4ccf087..d4c06c5784 100644
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
@@ -5,6 +5,7 @@ module flow-node-inventory {
     import yang-ext {prefix ext;}
     import ietf-inet-types {prefix inet;}
     import ietf-yang-types {prefix yang;}
+    import opendaylight-port-types {prefix port;}
     import opendaylight-inventory {prefix inv;}
     
     revision "2013-08-19" {
@@ -12,6 +13,12 @@ module flow-node-inventory {
     }
     
     
+    grouping feature {
+        leaf support-state {
+            type inv:support-type;
+        }
+    }
+
     grouping queue {
          leaf queue-id {
             type uint32;
@@ -28,68 +35,97 @@ module flow-node-inventory {
         }
     }
 
-    grouping flow-capable-node-capabilities {
+    grouping table {
+
+
+    }
+
+    grouping flow-node {
+
+        leaf manufacturer {
+            type string;
+        }
+        leaf hardware {
+            type string;
+        }
+        leaf software {
+            type string;
+        }
+        leaf serial-number {
+            type string;
+        }
+        leaf description {
+            type string;
+        }
+
         container tables {
-            leaf support-state {
-                type inv:support-type;
+            uses feature;
+            list table {
+                uses table;
             }
-            
         }
         
         container group-tables {
-        
+            uses feature;
         }
         
         container supported-match-types {
             list match-type {
+                uses feature;
                 leaf match {
                     type string; // FIXME: Add identity
                 }
-                leaf support-state {
-                    type inv:support-type;
-                }
+                
             }
         }
         
         container supported-instructions {
             list instruction-type {
+                uses feature;
                 leaf instruction {
                     type string; // FIXME: Add identity
                 }
-                
-                leaf support-state {
-                    type inv:support-type;
-                }
             }
         }
 
         container supported-actions {
             list action-type {
+                uses feature;
+
                 leaf action {
                     type string; // FIXME: Add identity
                 }
-                
-                leaf support-state {
-                    type inv:support-type;
-                }
             }
         }
     }
     
-    grouping flow-capable-node-connector {
-        
+    grouping flow-node-connector {
+
+        uses port:flow-capable-port;
     }
 
-    notification node-capabilities-updated {
-        uses flow-capable-node-capabilities;
+    augment "/inv:nodes/inv:node" {
+        ext:augment-identifier "flow-capable-node";
+        uses flow-node;
     }
 
-    notification node-connector-capabilities-updated {
-        uses flow-capable-node-connector;
+    augment "/inv:nodes/inv:node/inv:node-connector" {
+        ext:augment-identifier "flow-capable-node-connector";
+        uses flow-node-connector;
     }
 
-    augment "/inv:nodes/inv:node" {
-        augment-identifier "flow-capable-node";
-        uses flow-capable-node-capabilities;
+    augment "/inv:node-updated" {
+        ext:augment-identifier "flow-capable-node-updated";
+        uses flow-node;
+    }
+
+    augment "/inv:node-updated/inv:node-connector" {
+        //ext:identical-augment "flow-capable-node-connector";
+        ext:augment-identifier "flow-capable-node-connector-update-fields";
+        uses flow-node-connector;
+    }
+
+    augment "/inv:node-connector-updated" {
+        ext:augment-identifier "flow-capable-node-connector-updated";   
     }
 }
\ No newline at end of file