TSC-181: ITM Yang Models Cleanup

[genius.git] / itm / itm-api / src / main / yang / itm.yang

diff --git a/itm/itm-api/src/main/yang/itm.yang b/itm/itm-api/src/main/yang/itm.yang
index 91cdd32857301324e9193abd66ddc3ae97720d9c..78abd1f869ecd2e739d3b4ef4f0fc098790e4a9b 100644 (file)
--- a/itm/itm-api/src/main/yang/itm.yang
+++ b/itm/itm-api/src/main/yang/itm.yang
@@ -27,7 +27,7 @@ module itm {
 
     container transport-zones {
           list transport-zone {
-          ordered-by user;
+            ordered-by user;
             key zone-name;
             leaf zone-name {
                 type string;
@@ -39,68 +39,44 @@ module itm {
                 }
                 mandatory true;
             }
-
-            list subnets {
-                status deprecated;
-                key "prefix";
-                leaf prefix {
-                    type inet:ip-prefix;
+            list vteps {
+                key "dpn-id";
+                leaf dpn-id {
+                    type uint64;
                 }
-                leaf gateway-ip {
+                leaf ip-address {
                     type inet:ip-address;
                 }
-                leaf vlan-id {
-                    type uint16 {
-                        range "0..4094";
-                    }
+                leaf option-of-tunnel {
+                    description "Use flow based tunnels for remote-ip";
+                    type boolean;
+                    default false;
                 }
-                list vteps {
-                    key "dpn-id portname";
-                    leaf dpn-id {
-                        type uint64;
-                    }
-                    leaf portname {
-                        type string;
-                    }
-                    leaf ip-address {
-                        type inet:ip-address;
-                    }
-                    leaf option-of-tunnel {
-                        description "Use flow based tunnels for remote-ip";
-                        type boolean;
-                        default false;
-                    }
-                    leaf weight {
-                        type uint16;
-                        default 1;
-                        description "Bucket weight if tunnel belongs to OF select group";
-                    }
-                    leaf option-tunnel-tos {
-                        description "Value of ToS bits to be set on the encapsulating
-                            packet.  The value of 'inherit' will copy the DSCP value
-                            from inner IPv4 or IPv6 packets.  When ToS is given as
-                            a numberic value, the least significant two bits will
-                            be ignored.";
-                        type string {
-                            length "1..8";
-                        }
+                leaf option-tunnel-tos {
+                    description "Value of ToS bits to be set on the encapsulating
+                        packet.  The value of 'inherit' will copy the DSCP value
+                        from inner IPv4 or IPv6 packets.  When ToS is given as
+                        a numberic value, the least significant two bits will
+                        be ignored.";
+                    type string {
+                        length "1..8";
                     }
-                 }
-                 list device-vteps {
-                     key "node-id ip-address";
+                }
+            }
+             list device-vteps {
+                 key "node-id ip-address";
 
-                     leaf topology-id {
-                         type string;
-                     }
-                     leaf node-id {
-                         type string;
-                     }
-                     leaf ip-address {
-                         type inet:ip-address;
-                     }
+                 leaf topology-id {
+                     type string;
+                 }
+                 leaf node-id {
+                     type string;
+                 }
+                 leaf ip-address {
+                     type inet:ip-address;
                  }
              }
-         }
+                }
     }
 
     container not-hosted-transport-zones {