Obsolete time-to-{live,wait}

These configuration options have been unused since
c08a628f379c419d301295e9fe5baad52a690414. Obsolete them and do not
populate them in default configuration.

JIRA: AAA-290
Change-Id: I67c2233c5754a937a4d7d04f7d2cd8259b2587ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-shiro/impl/src/main/resources/initial/aaa-datastore-config.xml b/aaa-shiro/impl/src/main/resources/initial/aaa-datastore-config.xml
index 0ea56c02cc35770a2abad0b30485978160dce5a5..88b99104fe4a080d7857d76462ad685ea10022b7 100644 (file)
--- a/aaa-shiro/impl/src/main/resources/initial/aaa-datastore-config.xml
+++ b/aaa-shiro/impl/src/main/resources/initial/aaa-datastore-config.xml
@@ -1,5 +1,3 @@
 <datastore-config xmlns="urn:opendaylight:aaa:app:config">
   <store>h2-data-store</store>
-  <time-to-live>36000</time-to-live>
-  <time-to-wait>3600</time-to-wait>
-</datastore-config>
\ No newline at end of file
+</datastore-config>

diff --git a/aaa-shiro/impl/src/main/yang/aaa-app-config.yang b/aaa-shiro/impl/src/main/yang/aaa-app-config.yang
index ef30f08bd1942e159577c45ed370dc1cb7112fbf..6589a46f9dbf1dcbd90255f5bd0df94552c9712e 100644 (file)
--- a/aaa-shiro/impl/src/main/yang/aaa-app-config.yang
+++ b/aaa-shiro/impl/src/main/yang/aaa-app-config.yang
@@ -58,11 +58,13 @@ module aaa-app-config {
       description "Time to live for tokens in second.";
       type uint64;
       default 36000;
+      status obsolete;
     }
     leaf time-to-wait {
       description "Time to wait for tokens in second.";
       type uint64;
       default 3600;
+      status obsolete;
     }
   }
 }