Removed unused groupings in YANG files

YANG files formatted

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 6b10162209e594d67fa7ebe7343efc3c7691f0ac..2b244ac98c4fcecf1fef6adbf13e4f13aa63fdcc 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -5,7 +5,7 @@ module openflow-action {
     import openflow-types { prefix oft; }
 
     revision "2013-07-31" {
-        description "Initial model";
+        description "OpenFlow 1.3 - action model";
     }
 
     identity output {

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index c7532b426eabb99901a724a401da93f5bc903b0d..37c2f5b2ed904f95c870f4a445235ff9f82148e0 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -4,162 +4,138 @@ module openflow-augments {
 \r
     import ietf-inet-types {prefix inet;}\r
     import ietf-yang-types {prefix yang;}\r
-    \r
+\r
     import openflow-types {prefix oft;}\r
     import openflow-protocol {prefix ofproto;}\r
     import openflow-action {prefix ofaction;}\r
     import openflow-instruction {prefix ofinstruction;}\r
     import openflow-extensible-match {prefix oxm;}\r
 \r
-\r
     revision "2013-10-02" {\r
-        description "Initial model";\r
+        description "OpenFlow 1.3 - augments model";\r
     }\r
+\r
 // OFP_MATCH AUGMENTS\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf port-number {\r
              type oft:port-number;\r
          }\r
      }\r
-\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf metadata {\r
              type binary;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf mask {\r
              type binary;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf mac-address {\r
              type yang:mac-address;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf eth-type {\r
              type oft:ether-type;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf vlan-vid {\r
              type uint16;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf vlan-pcp {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf dscp {\r
              type inet:dscp;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf ecn {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf protocol-number {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf ipv4-prefix {\r
              type inet:ipv4-prefix;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf port {\r
              type inet:port-number;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf icmpv4-type {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf icmpv4-code {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf op-code {\r
              type uint16;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf ipv6-prefix {\r
              type inet:ipv6-prefix;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf ipv6-flabel {\r
              type inet:ipv6-flow-label;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf icmpv6-type {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf icmpv6-code {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf ipv6-address {\r
              type inet:ipv6-address;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf mpls-label {\r
              type uint32;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf tc {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf bos {\r
              type boolean;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf isid {\r
              type uint32;\r
          }\r
      }\r
-     \r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          leaf pseudo-field {\r
              type bits {\r
@@ -198,7 +174,7 @@ module openflow-augments {
                  bit unseq {\r
                      description "Unexpected sequencing encountered.";\r
                      position 8;\r
-                     }                    \r
+                 }\r
              }\r
          }\r
      }\r
@@ -209,47 +185,39 @@ module openflow-augments {
              type oft:any-port-number;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf max-length {\r
              type uint16;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf mpls-ttl {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf ethertype {\r
              type oft:ether-type;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf queue-id {\r
              type uint32;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf group-id {\r
              type uint32;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf nw-ttl {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          uses oxm:oxm-fields;\r
      }\r
-     \r
      augment "/ofaction:actions-container/ofaction:action" {\r
          leaf experimenter {\r
              type uint32;\r
@@ -262,7 +230,6 @@ module openflow-augments {
              uses ofinstruction:instructions;\r
          }\r
      }\r
-\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          list next-table-ids {\r
              leaf table-id {\r
@@ -270,19 +237,16 @@ module openflow-augments {
              }\r
          }\r
      }\r
-\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          list action-ids {\r
              uses ofaction:action-header;\r
          }\r
      }\r
-\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          list oxm-ids {\r
              uses oxm:oxm-fields;\r
          }\r
      }\r
-\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          leaf experimenter {\r
              type uint32;\r
@@ -294,14 +258,13 @@ module openflow-augments {
              type binary;\r
          }\r
      }\r
-     \r
+\r
 // OFP_INSTRUCTION AUGMENTS\r
      augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf table-id {\r
              type uint8;\r
          }\r
      }\r
-     \r
      augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf metadata {\r
              type binary;\r
@@ -310,19 +273,16 @@ module openflow-augments {
              type binary;\r
          }\r
      }\r
-     \r
      augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          list actions {\r
              uses ofaction:action-header;\r
          }\r
      }\r
-     \r
      augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf meter-id {\r
              type uint32;\r
          }\r
      }\r
-     \r
      augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
          leaf experimenter {\r
              type uint32;\r

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 1245c4b4d901c0240a792e25b6efcc13a20a19e5..997e3cd8c6c89ab1468e6d4ca190dd7ad7f462c2 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -5,7 +5,7 @@ module openflow-instruction {
     import openflow-types { prefix oft; }
 
     revision "2013-07-31" {
-       // description "Initial model";
+       // description "OpenFlow 1.3 - instruction model";
     }
 
     identity goto_table {
@@ -37,31 +37,6 @@ module openflow-instruction {
         base oft:instruction;
     }
 
-    // Structures
-
-    grouping goto-table {
-        description " Setup the next table in the lookup pipeline";
-        leaf table {
-            type oft:table-id; // 
-        }
-    }
-    grouping write-metadata {
-        description " Setup the metadata field for use later in     pipeline";
-        leaf metadata {
-            type oft:metadata;
-        }
-        leaf mask {
-            type oft:metadata;
-        }
-    }
-    
-    grouping meter {
-        description " Apply meter (rate limiter)";
-        leaf meter-id {
-            type oft:meter-id;
-        }
-    }
-
     container instruction-container {
         uses instructions;
     }

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index d9afe212e0e8b0667928c838ccd4c8f9061c7a7a..cca7011f2b0d79466c31c3530f2b4971e15bffb3 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -2,7 +2,6 @@ module openflow-protocol {
     namespace "urn:opendaylight:openflow:protocol";\r
     prefix "ofproto";\r
 \r
-\r
     import ietf-inet-types {prefix inet;}\r
     import ietf-yang-types {prefix yang;}\r
     \r
@@ -11,14 +10,11 @@ module openflow-protocol {
     import openflow-instruction { prefix ofinstruction;}\r
     import openflow-action {prefix ofaction;}\r
 \r
-\r
-\r
     revision "2013-07-31" {\r
-        description "Initial model";\r
+        description "OpenFlow 1.3 - protocol objects model";\r
     }\r
 \r
     // Generic Structures\r
-\r
         grouping port {\r
             // reference "ofp_port";\r
             leaf port-no { \r
@@ -74,7 +70,7 @@ module openflow-protocol {
                 units "kbps"; \r
             }\r
         }\r
-        \r
+\r
         grouping match {\r
             leaf type {\r
                 type identityref {\r
@@ -83,11 +79,11 @@ module openflow-protocol {
             }\r
             uses oxm:oxm-fields;\r
         }\r
-        \r
+\r
         container table-features-properties-container {\r
             uses table-features-properties;\r
         }\r
-        \r
+\r
         grouping table-features-properties {\r
             list table-feature-properties {\r
                 leaf type {\r
@@ -1091,7 +1087,6 @@ module openflow-protocol {
                 }\r
             }\r
 \r
-\r
             /* Immutable messages. */\r
             notification hello-message {\r
                 uses hello;\r

diff --git a/openflow-protocol-api/src/main/yang/openflow-types.yang b/openflow-protocol-api/src/main/yang/openflow-types.yang
index 1722b1ba4e5f946574c86f742a3cef334c2e7415..f2254db73c2b4d2a3f1b6f1fde6458197422bffb 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-types.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-types.yang
@@ -3,7 +3,7 @@ module openflow-types {
     prefix "oft";
 
     revision "2013-07-31" {
-        //description "Initial model";
+        //description "OpenFlow 1.3 - common types model";
     }
 
     typedef port-number {
@@ -56,7 +56,6 @@ module openflow-types {
         }
     }
 
-
     typedef port-features {
         ////description "Features of ports available in datapath.";
         //reference "ofp_port_features";
@@ -196,18 +195,16 @@ module openflow-types {
     }
 
     identity instruction {
-
     }
 
     identity action {
-
     }
 
 
     typedef metadata {
         type binary;
     }
-    
+
     typedef table-id {
         type uint32;
     }
@@ -220,11 +217,11 @@ module openflow-types {
     typedef group-id {
         type uint32;
     }
-    
+
     typedef ether-type {
         type uint16;
     }
-    
+
     typedef error-type {
         type enumeration {
             enum HELLO_FAILED {
@@ -289,7 +286,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef hello-element-type {
         type enumeration {
             enum VERSIONBITMAP {
@@ -298,7 +295,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef switch-config-flag {
         /* Handling of IP fragments. */
         type enumeration {
@@ -319,7 +316,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef flow-removed-reason {
         /* flow removed */
         type enumeration {
@@ -341,7 +338,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef port-reason {
         /* port status */
         type enumeration {
@@ -359,7 +356,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef flow-mod-command {
         /* ofp_flow_mod_command */
         type enumeration {
@@ -385,7 +382,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef flow-mod-flags {
         /* ofp_flow_mod_flags */
         type bits {
@@ -411,7 +408,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef group-mod-command {
         /* ofp_group_mod_command */
         type enumeration {
@@ -430,8 +427,7 @@ module openflow-types {
             
         }
     }
-    
-    
+
     typedef group-type {
         /* ofp_group_type */
         type enumeration {
@@ -453,7 +449,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef multipart-request-flags {
         description
             "enum ofp_multipart_request_flags ";
@@ -464,7 +460,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef multipart-type {
         /* ofp_multipart_type */
         type enumeration {
@@ -564,7 +560,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef queue-property {
         /* ofp_queue_properties */
         type enumeration {
@@ -586,7 +582,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef controller-role {
         /* ofp_controller_role */
         type enumeration {
@@ -608,7 +604,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef packet-in-reason {
         /* ofp_packet_in_reason */
         type enumeration {
@@ -626,7 +622,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef meter-mod-command {
         /* ofp_meter_mod_command */
         type enumeration {
@@ -639,10 +635,9 @@ module openflow-types {
             enum OFPMC_DELETE {
               description "Delete specified meter. ";
             }
-
         }
     }
- 
+
     typedef meter-flags {
         /* ofp_meter_flags */
         type bits {
@@ -664,7 +659,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef meter-band-type {
         /* ofp_meter_band_type */
         type enumeration {
@@ -680,10 +675,9 @@ module openflow-types {
               value 65535; //0xFFFF
               description "Experimenter meter band. ";
             }
-
         }
     }
-    
+
     typedef table-config {
         /* ofp_table_config */
         type bits {
@@ -693,7 +687,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef table-features-prop-type {
         type enumeration {
             enum OFPTFPT_INSTRUCTIONS {
@@ -762,7 +756,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef group-types {
         /* ofp_group_type */
         type bits {
@@ -784,7 +778,7 @@ module openflow-types {
             }
         }
     }
-    
+
     typedef group-capabilities {
         /* ofp_group_capabilities */
         type bits {
@@ -806,5 +800,5 @@ module openflow-types {
             }
         }
     }
-    
+
 }

diff --git a/openflow-protocol-api/src/main/yang/system-notifications.yang b/openflow-protocol-api/src/main/yang/system-notifications.yang
index a74f2744c068f62983c657c88b042d395a02cdf0..8bc8dd6520b9e26a90c554568d6c7bb02840604f 100644 (file)
--- a/openflow-protocol-api/src/main/yang/system-notifications.yang
+++ b/openflow-protocol-api/src/main/yang/system-notifications.yang
@@ -3,7 +3,7 @@ module system-notifications {
     prefix "ofs";
 
     revision "2013-09-27" {
-        //description "Initial model";
+        //description "Model of system messages used in OpenFlow Protocol Library";
     }
 
     notification disconnect-event {