From b90d456133b70302a9b048c8f7e372b48ca1f093 Mon Sep 17 00:00:00 2001
From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Mon, 21 Oct 2013 13:34:23 +0200
Subject: [PATCH] Augmented nodes wrapped

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---
 .../src/main/yang/openflow-action.yang        | 10 ++++---
 .../src/main/yang/openflow-augments.yang      | 28 +++++++++----------
 .../src/main/yang/openflow-instruction.yang   | 10 ++++---
 .../src/main/yang/openflow-protocol.yang      |  1 -
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 473b8a61..232a1470 100644
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -169,14 +169,16 @@ module openflow-action {
     }
     */
     
-    container actions {
+    container actions-container {
         uses action-header;
     }
     
     grouping action-header {
-        leaf type {
-            type identityref {
-                base oft:action;
+        container action {
+            leaf type {
+                type identityref {
+                    base oft:action;
+                }
             }
         }
     }
diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index 6629e705..c7532b42 100644
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -204,53 +204,53 @@ module openflow-augments {
      }
 
 // OFP_ACTION AUGMENTS
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf port {
              type oft:any-port-number;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf max-length {
              type uint16;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf mpls-ttl {
              type uint8;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf ethertype {
              type oft:ether-type;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf queue-id {
              type uint32;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf group-id {
              type uint32;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf nw-ttl {
              type uint8;
          }
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          uses oxm:oxm-fields;
      }
      
-     augment "/ofaction:actions" {
+     augment "/ofaction:actions-container/ofaction:action" {
          leaf experimenter {
              type uint32;
          }
@@ -296,13 +296,13 @@ module openflow-augments {
      }
      
 // OFP_INSTRUCTION AUGMENTS
-     augment "/ofinstruction:instruction" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          leaf table-id {
              type uint8;
          }
      }
      
-     augment "/ofinstruction:instruction" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          leaf metadata {
              type binary;
          }
@@ -311,19 +311,19 @@ module openflow-augments {
          }
      }
      
-     augment "/ofinstruction:instruction" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          list actions {
              uses ofaction:action-header;
          }
      }
      
-     augment "/ofinstruction:instruction" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          leaf meter-id {
              type uint32;
          }
      }
      
-     augment "/ofinstruction:instruction" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          leaf experimenter {
              type uint32;
          }
diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 6380841f..1245c4b4 100644
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -62,14 +62,16 @@ module openflow-instruction {
         }
     }
 
-    container instruction {
+    container instruction-container {
         uses instructions;
     }
 
     grouping instructions {
-        leaf type {
-            type identityref {
-                base oft:instruction;
+        container instruction {
+            leaf type {
+                type identityref {
+                    base oft:instruction;
+                }
             }
         }
     }
diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 6a353a41..d0e087b3 100644
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -431,7 +431,6 @@ module openflow-protocol {
                 leaf watch-group {
                     type uint32;
                 }
-                
                 list actions-list {
                     uses ofaction:action-header;
                 }
-- 
2.36.6