Augmented nodes wrapped

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 473b8a61c4f8239502823b908227d6657777364c..232a14707479f954185b1068428be67947ced90c 100644 (file)
--- 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 6629e705c0459716715d787eacf8ff4beba3d20b..c7532b426eabb99901a724a401da93f5bc903b0d 100644 (file)
--- 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 {
      }\r
 \r
 // OFP_ACTION AUGMENTS\r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf port {\r
              type oft:any-port-number;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf max-length {\r
              type uint16;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf mpls-ttl {\r
              type uint8;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf ethertype {\r
              type oft:ether-type;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf queue-id {\r
              type uint32;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf group-id {\r
              type uint32;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf nw-ttl {\r
              type uint8;\r
          }\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          uses oxm:oxm-fields;\r
      }\r
      \r
-     augment "/ofaction:actions" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          leaf experimenter {\r
              type uint32;\r
          }\r
@@ -296,13 +296,13 @@ module openflow-augments {
      }\r
      \r
 // OFP_INSTRUCTION AUGMENTS\r
-     augment "/ofinstruction:instruction" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf table-id {\r
              type uint8;\r
          }\r
      }\r
      \r
-     augment "/ofinstruction:instruction" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf metadata {\r
              type binary;\r
          }\r
@@ -311,19 +311,19 @@ module openflow-augments {
          }\r
      }\r
      \r
-     augment "/ofinstruction:instruction" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          list actions {\r
              uses ofaction:action-header;\r
          }\r
      }\r
      \r
-     augment "/ofinstruction:instruction" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf meter-id {\r
              type uint32;\r
          }\r
      }\r
      \r
-     augment "/ofinstruction:instruction" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf experimenter {\r
              type uint32;\r
          }\r

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 6380841f350672638f141c6ba55e5f6f526ef802..1245c4b4d901c0240a792e25b6efcc13a20a19e5 100644 (file)
--- 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 6a353a41352af81dee14bd98640080230dd4956f..d0e087b3c2e22d0d6e11007080306aef79e72d3f 100644 (file)
--- 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 {\r
                     type uint32;\r
                 }\r
-                \r
                 list actions-list {\r
                     uses ofaction:action-header;\r
                 }\r