Minor model refactor

[openflowjava.git] / openflow-protocol-api / src / main / yang / openflow-augments.yang

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index a0ac66a5f6db360c84254f488a69b0c63d873b61..7fa157f440ed86762dea02e55e02fcb7ecf4da53 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -177,84 +177,84 @@
      }\r
 \r
 // OFP_ACTION AUGMENTS\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "port-action";\r
          leaf port {\r
              type oft:port-number;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "max-length-action";\r
          leaf max-length {\r
              type uint16;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "mpls-ttl-action";\r
          leaf mpls-ttl {\r
              type uint8;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "ethertype-action";\r
          leaf ethertype {\r
              type oft:ether-type;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "queue-id-action";\r
          leaf queue-id {\r
              type uint32;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "group-id-action";\r
          leaf group-id {\r
              type uint32;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "nw-ttl-action";\r
          leaf nw-ttl {\r
              type uint8;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "oxm-fields-action";\r
-         uses oxm:oxm-fields;\r
+         uses oxm:oxm-fields-grouping;\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "experimenter-action";\r
          leaf experimenter {\r
              type uint32;\r
          }\r
      }\r
      // OF1.0 structures\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "vlan-vid-action";\r
          leaf vlan-vid {\r
              type uint16;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "vlan-pcp-action";\r
          leaf vlan-pcp {\r
              type uint8;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "dl-address-action";\r
          leaf dl-address {\r
              type yang:mac-address;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "nw-tos-action";\r
          leaf nw-tos {\r
              type uint8;\r
          }\r
      }\r
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {\r
+     augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "ip-address-action";\r
          leaf ip-address {\r
              type inet:ipv4-address;\r
@@ -264,7 +264,7 @@
 // OFP_TABLE_FEATURES_PROPERTIES AUGMENTS\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          ext:augment-identifier "instruction-related-table-feature-property";\r
-         uses ofinstruction:instructions;\r
+         uses ofinstruction:instructions-grouping;\r
      }\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          ext:augment-identifier "next-table-related-table-feature-property";\r
@@ -277,11 +277,11 @@
      }\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          ext:augment-identifier "action-related-table-feature-property";\r
-         uses ofaction:actions;\r
+         uses ofaction:actions-grouping;\r
      }\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          ext:augment-identifier "oxm-related-table-feature-property";\r
-         uses oxm:oxm-fields;\r
+         uses oxm:oxm-fields-grouping;\r
      }\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          ext:augment-identifier "experimenter-related-table-feature-property";\r
@@ -297,13 +297,13 @@
      }\r
 \r
 // OFP_INSTRUCTION AUGMENTS\r
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          ext:augment-identifier "table-id-instruction";\r
          leaf table-id {\r
              type uint8;\r
          }\r
      }\r
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          ext:augment-identifier "metadata-instruction";\r
          leaf metadata {\r
              type binary;\r
@@ -312,17 +312,17 @@
              type binary;\r
          }\r
      }\r
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          ext:augment-identifier "actions-instruction";\r
-         uses ofaction:actions;\r
+         uses ofaction:actions-grouping;\r
      }\r
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          ext:augment-identifier "meter-id-instruction";\r
          leaf meter-id {\r
              type uint32;\r
          }\r
      }\r
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {\r
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          ext:augment-identifier "experimenter-instruction";\r
          leaf experimenter {\r
              type uint32;\r