Move aaa-encrypt-service-config

The configuration is an implementation contract, move it to impl
artifact. Also disconnect the actual instantiation and layout by
introducing an intermediate grouping.

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

diff --git a/aaa-encrypt-service/api/src/main/yang/aaa-encrypt-service-config.yang b/aaa-encrypt-service/api/src/main/yang/aaa-encrypt-service-config.yang
deleted file mode 100644 (file)
index 42e9ef5..0000000
--- a/aaa-encrypt-service/api/src/main/yang/aaa-encrypt-service-config.yang
+++ /dev/null
@@ -1,48 +0,0 @@
-module aaa-encrypt-service-config {
-  yang-version 1;
-  namespace "config:aaa:authn:encrypt:service:config";
-  prefix "aaa-encrypt-service-config";
-    organization "OpenDayLight";
-
-    contact "melserngawy@inocybe.ca";
-
-    revision 2016-09-15 {
-        description
-        "Initial revision.";
-    }
-
-    container aaa-encrypt-service-config {
-        leaf encrypt-key {
-            description "Encryption key";
-            type string;
-        }
-        leaf password-length {
-            description "Encryption key password length";
-            type int32;
-        }
-        leaf encrypt-salt {
-            description "Encryption key salt";
-            type string;
-        }
-        leaf encrypt-method {
-            description "The encryption method to use";
-            type string;
-        }
-        leaf encrypt-type {
-            description "The encryption type";
-            type string;
-        }
-        leaf encrypt-iteration-count {
-            description "Number of iterations that will be used by the key";
-            type int32;
-        }
-        leaf encrypt-key-length {
-            description "Key length";
-            type int32;
-        }
-        leaf cipher-transforms {
-            description "cipher transformation type ex: AES/CBC/PKCS5Padding (128)";
-            type string;
-        }
-    }
-}
\ No newline at end of file

diff --git a/aaa-encrypt-service/impl/pom.xml b/aaa-encrypt-service/impl/pom.xml
index f6779918a041bb58b4c080a38b0ab714097279c6..dd12da632a194eefcc7204278f66e1d37bccd7fb 100644 (file)
--- a/aaa-encrypt-service/impl/pom.xml
+++ b/aaa-encrypt-service/impl/pom.xml
@@ -22,16 +22,34 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-encrypt-service</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-encrypt-service</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>util</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/aaa-encrypt-service/impl/src/main/yang/aaa-encrypt-service-config.yang b/aaa-encrypt-service/impl/src/main/yang/aaa-encrypt-service-config.yang
new file mode 100644 (file)
index 0000000..c19a934
--- /dev/null
+++ b/aaa-encrypt-service/impl/src/main/yang/aaa-encrypt-service-config.yang
@@ -0,0 +1,51 @@
+module aaa-encrypt-service-config {
+  yang-version 1;
+  namespace "config:aaa:authn:encrypt:service:config";
+  prefix "aaa-encrypt-service-config";
+  organization "OpenDayLight";
+
+  contact "melserngawy@inocybe.ca";
+
+  revision 2016-09-15 {
+    description "Initial revision.";
+  }
+
+  grouping encrypt-service-config {
+    leaf encrypt-key {
+      description "Encryption key";
+      type string;
+    }
+    leaf password-length {
+      description "Encryption key password length";
+      type int32;
+    }
+    leaf encrypt-salt {
+      description "Encryption key salt";
+      type string;
+    }
+    leaf encrypt-method {
+      description "The encryption method to use";
+      type string;
+    }
+    leaf encrypt-type {
+      description "The encryption type";
+      type string;
+    }
+    leaf encrypt-iteration-count {
+      description "Number of iterations that will be used by the key";
+      type int32;
+    }
+    leaf encrypt-key-length {
+      description "Key length";
+      type int32;
+    }
+    leaf cipher-transforms {
+      description "cipher transformation type ex: AES/CBC/PKCS5Padding (128)";
+      type string;
+    }
+  }
+
+  container aaa-encrypt-service-config {
+    uses encrypt-service-config;
+  }
+}