From 02e37fce046bfcaf46ce8f2b0b167877262d9099 Mon Sep 17 00:00:00 2001
From: Mohamed El-Serngawy <melserngawy@inocybe.com>
Date: Thu, 8 Dec 2016 16:19:23 -0500
Subject: [PATCH] Fix Md-SAL store configuration

add aaa-mdsal-config.xml file to make the md-sal datastore
configuration editable by the end user.

Change-Id: I0861046a1b5644f8c3ecaa3aa9bb5b6432ec9ca5
Signed-off-by: Mohamed El-Serngawy <melserngawy@inocybe.com>
---
 .../aaa-authn-mdsal-store-impl/pom.xml        | 59 +++++++++----------
 .../aaa/authn/mdsal/store/AuthNStore.java     |  5 +-
 .../resources/initial/aaa-mdsal-config.xml    |  4 ++
 .../org/opendaylight/blueprint/mdsalstore.xml |  2 +-
 features/authn/src/main/features/features.xml |  5 +-
 5 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/initial/aaa-mdsal-config.xml

diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
index ad1a128f1..f5b00c539 100644
--- a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
@@ -38,32 +38,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-config</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
@@ -77,10 +53,6 @@
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-encrypt-service</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-core-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-mdsal-api</artifactId>
@@ -109,4 +81,31 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-artifacts</id>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      <file>${project.build.directory}/classes/initial/aaa-mdsal-config.xml</file>
+                      <type>xml</type>
+                      <classifier>config</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/java/org/opendaylight/aaa/authn/mdsal/store/AuthNStore.java b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/java/org/opendaylight/aaa/authn/mdsal/store/AuthNStore.java
index 00b16a313..987df49e7 100644
--- a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/java/org/opendaylight/aaa/authn/mdsal/store/AuthNStore.java
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/java/org/opendaylight/aaa/authn/mdsal/store/AuthNStore.java
@@ -39,8 +39,8 @@ public class AuthNStore implements AutoCloseable, TokenStore {
 
     private static final Logger LOG = LoggerFactory.getLogger(AuthNStore.class);
     private DataBroker broker;
-    private static BigInteger timeToLive;
-    private static Integer timeToWait;
+    private BigInteger timeToLive;
+    private Integer timeToWait;
     private final ExecutorService deleteExpiredTokenThread = Executors.newFixedThreadPool(1);
     private final AAAEncryptionService dataEncrypter;
 
@@ -56,7 +56,6 @@ public class AuthNStore implements AutoCloseable, TokenStore {
     public void close() throws Exception {
         deleteExpiredTokenThread.shutdown();
         LOG.info("MD-SAL AAA Token Cache closed...");
-
     }
 
     @Override
diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/initial/aaa-mdsal-config.xml b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/initial/aaa-mdsal-config.xml
new file mode 100644
index 000000000..1b6a89b0f
--- /dev/null
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/initial/aaa-mdsal-config.xml
@@ -0,0 +1,4 @@
+<mdsal-config xmlns="config:aaa:authn:mdsal:store">
+  <timeToLive>360000</timeToLive>
+  <timeToWait>10</timeToWait>
+</mdsal-config>
\ No newline at end of file
diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/org/opendaylight/blueprint/mdsalstore.xml b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/org/opendaylight/blueprint/mdsalstore.xml
index 59e4759d0..74a157421 100644
--- a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/org/opendaylight/blueprint/mdsalstore.xml
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/main/resources/org/opendaylight/blueprint/mdsalstore.xml
@@ -6,7 +6,7 @@
 
   <reference id="encryService" interface="org.opendaylight.aaa.encrypt.AAAEncryptionService"/>
 
-  <odl:clustered-app-config id="mdsalConfig"
+  <odl:clustered-app-config id="mdsalConfig" default-config-file-name="aaa-mdsal-config.xml"
         binding-class="org.opendaylight.yang.gen.v1.config.aaa.authn.mdsal.store.rev141031.MdsalConfig">
   </odl:clustered-app-config>
 
diff --git a/features/authn/src/main/features/features.xml b/features/authn/src/main/features/features.xml
index ed8b56c58..7bb8b024a 100644
--- a/features/authn/src/main/features/features.xml
+++ b/features/authn/src/main/features/features.xml
@@ -142,6 +142,7 @@
 
         <!-- IDMLight -->
         <bundle>mvn:org.opendaylight.aaa/aaa-idmlight/{{VERSION}}</bundle>
+        <configfile finalname="etc/idmtool">mvn:org.opendaylight.aaa/aaa-idmlight/{{VERSION}}/py/config</configfile>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-core/{{VERSION}}</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/{{VERSION}}</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/{{VERSION}}</bundle>
@@ -149,11 +150,10 @@
         <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/{{VERSION}}</bundle>
         <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/{{VERSION}}</bundle>
         <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:com.h2database/h2/{{VERSION}}</bundle>
 
         <!-- Federation -->
         <bundle>mvn:org.opendaylight.aaa/aaa-authn-idpmapping/{{VERSION}}</bundle>
-        <bundle>mvn:org.glassfish/javax.json/1.0.4</bundle>
+        <bundle>mvn:org.glassfish/javax.json/{{VERSION}}</bundle>
 
         <!-- REST -->
         <feature>war</feature>
@@ -162,6 +162,7 @@
         <bundle>mvn:com.sun.jersey/jersey-server/{{VERSION}}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-client/{{VERSION}}</bundle>
 
+        <configfile finalname="/etc/opendaylight/datastore/initial/config/aaa-mdsal-config.xml">mvn:org.opendaylight.aaa/aaa-authn-mdsal-store-impl/{{VERSION}}/xml/config</configfile>
         <configfile finalname="/etc/org.opendaylight.aaa.authn.cfg">mvn:org.opendaylight.aaa/aaa-authn/{{VERSION}}/cfg/config</configfile>
         <configfile finalname="/etc/org.opendaylight.aaa.filterchain.cfg">mvn:org.opendaylight.aaa/aaa-filterchain/{{VERSION}}/cfg/config</configfile>
     </feature>
-- 
2.36.6