Yang changes for OF Tunnels

This patch covers yang changes for OF Tunnels as captured in of-tunnels
spec document.

References
----------
https://git.opendaylight.org/gerrit/#/c/48156/

Change-Id: I619bd7daa77f384d172bd6e54cbcc2754200a99f
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/interfacemanager/interfacemanager-api/src/main/yang/odl-interface.yang b/interfacemanager/interfacemanager-api/src/main/yang/odl-interface.yang
index 14670ae34f40ba710ac5e1920d3af9ba9440eb24..c34eb83b096e6c4a0c95611606ac2492982fb8e0 100644 (file)
--- a/interfacemanager/interfacemanager-api/src/main/yang/odl-interface.yang
+++ b/interfacemanager/interfacemanager-api/src/main/yang/odl-interface.yang
@@ -64,7 +64,7 @@ module odl-interface {
         description "Tunnel type for vxlan tunnels";
         base tunnel-type-base;
     }
-    
+
     identity tunnel-type-vxlan-gpe {
         description "Tunnel type for vxlan-gpe";
         base tunnel-type-base;
@@ -94,6 +94,31 @@ module odl-interface {
         base tunnel-monitoring-type-base;
     }
 
+    grouping tunnel-optional-params {
+        leaf tunnel-source-ip-flow {
+            description "Use local_ip=flow for this tunnel";
+            type boolean;
+            default false;
+        }
+        leaf tunnel-remote-ip-flow {
+            description "Use remote_ip=flow for this tunnel";
+            type boolean;
+            default false;
+        }
+
+        list tunnel-options {
+            key "tunnel-option";
+            leaf tunnel-option {
+                description "Tunnel Option name";
+                type string;
+            }
+            leaf value {
+                description "Option value";
+                type string;
+            }
+        }
+    }
+
     grouping monitor-params {
         leaf monitor-enabled {
             type boolean;
@@ -238,7 +263,7 @@ module odl-interface {
             description
               "represents whether this is an internal or external tunnel.";
         }
-        
+
         leaf tunnel-interface-type {
             type identityref {
                 base tunnel-type-base;
@@ -260,6 +285,7 @@ module odl-interface {
             description "gateway IP address";
         }
 
+        uses tunnel-optional-params;
         uses monitor-params;
     }
 

diff --git a/itm/itm-api/src/main/yang/itm.yang b/itm/itm-api/src/main/yang/itm.yang
index 4cb60da29b21e0873d364050de57ff60c36f4521..7d76f3c07dd5105d69994e43523e514a357fb3b6 100644 (file)
--- a/itm/itm-api/src/main/yang/itm.yang
+++ b/itm/itm-api/src/main/yang/itm.yang
@@ -66,6 +66,11 @@ module itm {
                     leaf ip-address {
                         type inet:ip-address;
                     }
+                    leaf option-of-tunnel {
+                        description "Use flow based tunnels for remote-ip";
+                        type boolean;
+                        default false;
+                    }
                 }
                  list device-vteps {
                   key "node-id ip-address";