Move ODL-AAA-MOON under 'upstream' Directory

Change-Id: Ie010fbe3899e151421940908dbe8675aade54e2d
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
(cherry picked from commit cf864337c13b4638c588badf3f589f9e39318c95)

6 files changed, 0 insertions, 672 deletions

diff --git a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/DataBrokerReadMocker.java b/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/DataBrokerReadMocker.java
deleted file mode 100644
index f821cf16..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/DataBrokerReadMocker.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.aaa.authn.mdsal.store;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class DataBrokerReadMocker implements InvocationHandler {
-    private Map<Method, List<StubContainer>> stubs = new HashMap<Method, List<StubContainer>>();
-    private Class<?> mokingClass = null;
-
-    @Override
-    public Object invoke(Object arg0, Method arg1, Object[] arg2) throws Throwable {
-        List<StubContainer> stList = stubs.get(arg1);
-        if (stList != null) {
-            for (StubContainer sc : stList) {
-                if (sc.fitGeneric(arg2)) {
-                    return sc.returnObject;
-                }
-            }
-        }
-        return null;
-    }
-
-    public DataBrokerReadMocker(Class<?> cls) {
-        this.mokingClass = cls;
-    }
-
-    public static Object addMock(Class<?> cls) {
-        return Proxy.newProxyInstance(cls.getClassLoader(), new Class[] { cls },
-                new DataBrokerReadMocker(cls));
-    }
-
-    public static DataBrokerReadMocker getMocker(Object o) {
-        return (DataBrokerReadMocker) Proxy.getInvocationHandler(o);
-    }
-
-    public static Method findMethod(Class<?> cls, String name, Object args[]) {
-        Method methods[] = cls.getMethods();
-        for (Method m : methods) {
-            if (m.getName().equals(name)) {
-                if ((m.getParameterTypes() == null || m.getParameterTypes().length == 0)
-                        && args == null) {
-                    return m;
-                }
-                boolean match = true;
-                for (int i = 0; i < m.getParameterTypes().length; i++) {
-                    if (!m.getParameterTypes()[i].isAssignableFrom(args[i].getClass())) {
-                        match = false;
-                    }
-                }
-                if (match)
-                    return m;
-            }
-        }
-        return null;
-    }
-
-    public void addWhen(String methodName, Object[] args, Object returnThis)
-            throws NoSuchMethodException, SecurityException {
-        Method m = findMethod(this.mokingClass, methodName, args);
-        if (m == null)
-            throw new IllegalArgumentException("Unable to find method");
-        StubContainer sc = new StubContainer(args, returnThis);
-        List<StubContainer> lst = stubs.get(m);
-        if (lst == null) {
-            lst = new ArrayList<>();
-        }
-        lst.add(sc);
-        stubs.put(m, lst);
-    }
-
-    private class StubContainer {
-        private Class<?>[] parameters = null;
-        private Class<?>[] generics = null;
-        private Object args[] = null;
-        private Object returnObject;
-
-        public StubContainer(Object[] _args, Object ret) {
-            this.args = _args;
-            this.returnObject = ret;
-        }
-
-        public boolean fitGeneric(Object _args[]) {
-            if (args == null && _args != null)
-                return false;
-            if (args != null && _args == null)
-                return false;
-            if (args == null && _args == null)
-                return true;
-            if (args.length != _args.length)
-                return false;
-            for (int i = 0; i < args.length; i++) {
-                if (!args[i].equals(_args[i])) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/DataEncrypterTest.java b/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/DataEncrypterTest.java
deleted file mode 100644
index eec69bc0..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/DataEncrypterTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.aaa.authn.mdsal.store;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.xml.bind.DatatypeConverter;
-import org.junit.Test;
-
-public class DataEncrypterTest {
-
-    @Test
-    public void testEncrypt() {
-        DataEncrypter dataEncry = new DataEncrypter("foo_key_test");
-        String token = "foo_token_test";
-        String eToken = dataEncry.encrypt(token);
-        // check for decryption result
-        String returnToken = dataEncry.decrypt(eToken);
-        String tokenBase64 = DatatypeConverter.printBase64Binary(token.getBytes());
-        assertEquals(tokenBase64, returnToken);
-    }
-
-    @Test
-    public void testDecrypt() {
-        DataEncrypter dataEncry = new DataEncrypter("foo_key_test");
-        String eToken = "foo_etoken_test";
-        assertEquals(dataEncry.decrypt(""), null);
-        // check for encryption Tag
-        assertEquals(eToken, dataEncry.decrypt(eToken));
-    }
-
-}
diff --git a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/IDMStoreTest.java b/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/IDMStoreTest.java
deleted file mode 100644
index f376dd5f..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/IDMStoreTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.aaa.authn.mdsal.store;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.opendaylight.aaa.api.IDMStoreUtil;
-import org.opendaylight.aaa.api.SHA256Calculator;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Domain;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Grant;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Role;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.User;
-
-public class IDMStoreTest {
-
-    @Test
-    public void testWriteDomain() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoFordomain();
-        Domain domain = testedObject.writeDomain(util.domain);
-        Assert.assertNotNull(domain);
-        Assert.assertEquals(domain.getDomainid(), util.domain.getName());
-    }
-
-    @Test
-    public void testReadDomain() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoFordomain();
-        Domain domain = testedObject.readDomain(util.domain.getDomainid());
-        Assert.assertNotNull(domain);
-        Assert.assertEquals(domain, util.domain);
-    }
-
-    @Test
-    public void testDeleteDomain() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoFordomain();
-        Domain domain = testedObject.deleteDomain(util.domain.getDomainid());
-        Assert.assertEquals(domain, util.domain);
-    }
-
-    @Test
-    public void testUpdateDomain() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoFordomain();
-        Domain domain = testedObject.updateDomain(util.domain);
-        Assert.assertEquals(domain, util.domain);
-    }
-
-    @Test
-    public void testWriteRole() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForrole();
-        util.addMokitoFordomain();
-        Role role = testedObject.writeRole(util.role);
-        Assert.assertNotNull(role);
-        Assert.assertEquals(role.getRoleid(),
-                IDMStoreUtil.createRoleid(role.getName(), role.getDomainid()));
-    }
-
-    @Test
-    public void testReadRole() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForrole();
-        Role role = testedObject.readRole(util.role.getRoleid());
-        Assert.assertNotNull(role);
-        Assert.assertEquals(role, util.role);
-    }
-
-    @Test
-    public void testDeleteRole() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForrole();
-        Role role = testedObject.deleteRole(util.role.getRoleid());
-        Assert.assertNotNull(role);
-        Assert.assertEquals(role, util.role);
-    }
-
-    @Test
-    public void testUpdateRole() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForrole();
-        Role role = testedObject.updateRole(util.role);
-        Assert.assertNotNull(role);
-        Assert.assertEquals(role, util.role);
-    }
-
-    @Test
-    public void testWriteUser() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForuser();
-        User user = testedObject.writeUser(util.user);
-        Assert.assertNotNull(user);
-        Assert.assertEquals(user.getUserid(),
-                IDMStoreUtil.createUserid(user.getName(), util.user.getDomainid()));
-    }
-
-    @Test
-    public void testReadUser() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForuser();
-        User user = testedObject.readUser(util.user.getUserid());
-        Assert.assertNotNull(user);
-        Assert.assertEquals(user, util.user);
-    }
-
-    @Test
-    public void testDeleteUser() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForuser();
-        User user = testedObject.deleteUser(util.user.getUserid());
-        Assert.assertNotNull(user);
-        Assert.assertEquals(user, util.user);
-    }
-
-    @Test
-    public void testUpdateUser() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForuser();
-        User user = testedObject.updateUser(util.user);
-        Assert.assertNotNull(user);
-        Assert.assertEquals(user.getPassword(),
-                SHA256Calculator.getSHA256(util.user.getPassword(), util.user.getSalt()));
-    }
-
-    @Test
-    public void testWriteGrant() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoFordomain();
-        util.addMokitoForrole();
-        util.addMokitoForuser();
-        util.addMokitoForgrant();
-        Grant grant = testedObject.writeGrant(util.grant);
-        Assert.assertNotNull(grant);
-    }
-
-    @Test
-    public void testReadGrant() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForgrant();
-        Grant grant = testedObject.readGrant(util.grant.getGrantid());
-        Assert.assertNotNull(grant);
-        Assert.assertEquals(grant, util.grant);
-    }
-
-    @Test
-    public void testDeleteGrant() throws Exception {
-        IDMStoreTestUtil util = new IDMStoreTestUtil();
-        IDMMDSALStore testedObject = new IDMMDSALStore(util.dataBroker);
-        util.addMokitoForgrant();
-        Grant grant = testedObject.deleteGrant(util.grant.getGrantid());
-        Assert.assertNotNull(grant);
-        Assert.assertEquals(grant, util.grant);
-    }
-}
diff --git a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/IDMStoreTestUtil.java b/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/IDMStoreTestUtil.java
deleted file mode 100644
index 39eeadb4..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/IDMStoreTestUtil.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.aaa.authn.mdsal.store;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import java.util.concurrent.ExecutionException;
-import org.opendaylight.aaa.api.IDMStoreUtil;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.Authentication;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Domain;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.DomainBuilder;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.DomainKey;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Grant;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.GrantBuilder;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.GrantKey;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Role;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.RoleBuilder;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.RoleKey;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.User;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.UserBuilder;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.UserKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class IDMStoreTestUtil {
-    /* DataBroker mocked with Mokito */
-    protected static DataBroker dataBroker = mock(DataBroker.class);
-    protected static WriteTransaction wrt = mock(WriteTransaction.class);
-    protected static ReadOnlyTransaction rot = null;
-
-    static {
-        rot = (ReadOnlyTransaction) DataBrokerReadMocker.addMock(ReadOnlyTransaction.class);
-        when(dataBroker.newReadOnlyTransaction()).thenReturn(rot);
-        when(dataBroker.newWriteOnlyTransaction()).thenReturn(wrt);
-    }
-
-    /* Domain Data Object Instance */
-    public Domain domain = createdomain();
-
-    /* Domain create Method */
-    public Domain createdomain() {
-        /* Start of Domain builder */
-        DomainBuilder domainbuilder = new DomainBuilder();
-        domainbuilder.setName("SETNAME");
-        domainbuilder.setDomainid("SETNAME");
-        domainbuilder.setKey(new DomainKey("SETNAME"));
-        domainbuilder.setDescription("SETDESCRIPTION");
-        domainbuilder.setEnabled(true);
-        /* End of Domain builder */
-        return domainbuilder.build();
-    }
-
-    /* Role Data Object Instance */
-    public Role role = createrole();
-
-    /* Role create Method */
-    public Role createrole() {
-        /* Start of Role builder */
-        RoleBuilder rolebuilder = new RoleBuilder();
-        rolebuilder.setRoleid("SETNAME@SETNAME");
-        rolebuilder.setName("SETNAME");
-        rolebuilder.setKey(new RoleKey(rolebuilder.getRoleid()));
-        rolebuilder.setDomainid(createdomain().getDomainid());
-        rolebuilder.setDescription("SETDESCRIPTION");
-        /* End of Role builder */
-        return rolebuilder.build();
-    }
-
-    /* User Data Object Instance */
-    public User user = createuser();
-
-    /* User create Method */
-    public User createuser() {
-        /* Start of User builder */
-        UserBuilder userbuilder = new UserBuilder();
-        userbuilder.setUserid("SETNAME@SETNAME");
-        userbuilder.setName("SETNAME");
-        userbuilder.setKey(new UserKey(userbuilder.getUserid()));
-        userbuilder.setDomainid(createdomain().getDomainid());
-        userbuilder.setEmail("SETEMAIL");
-        userbuilder.setPassword("SETPASSWORD");
-        userbuilder.setSalt("SETSALT");
-        userbuilder.setEnabled(true);
-        userbuilder.setDescription("SETDESCRIPTION");
-        /* End of User builder */
-        return userbuilder.build();
-    }
-
-    /* Grant Data Object Instance */
-    public Grant grant = creategrant();
-
-    /* Grant create Method */
-    public Grant creategrant() {
-        /* Start of Grant builder */
-        GrantBuilder grantbuilder = new GrantBuilder();
-        grantbuilder.setDomainid(createdomain().getDomainid());
-        grantbuilder.setRoleid(createrole().getRoleid());
-        grantbuilder.setUserid(createuser().getUserid());
-        grantbuilder.setGrantid(IDMStoreUtil.createGrantid(grantbuilder.getUserid(),
-                grantbuilder.getDomainid(), grantbuilder.getRoleid()));
-        grantbuilder.setKey(new GrantKey(grantbuilder.getGrantid()));
-        /* End of Grant builder */
-        return grantbuilder.build();
-    }
-
-    /* InstanceIdentifier for Grant instance grant */
-    public InstanceIdentifier<Grant> grantID = InstanceIdentifier.create(Authentication.class)
-                                                                 .child(Grant.class,
-                                                                         creategrant().getKey());
-
-    /* Mokito DataBroker method for grant Data Object */
-    public void addMokitoForgrant() throws NoSuchMethodException, SecurityException, InterruptedException, ExecutionException {
-        CheckedFuture<Optional<Grant>, ReadFailedException> read = mock(CheckedFuture.class);
-        DataBrokerReadMocker.getMocker(rot).addWhen("read",
-                new Object[] { LogicalDatastoreType.CONFIGURATION, grantID }, read);
-        Optional<Grant> optional = mock(Optional.class);
-        when(read.get()).thenReturn(optional);
-        when(optional.get()).thenReturn(grant);
-        when(optional.isPresent()).thenReturn(true);
-    }
-
-    /* InstanceIdentifier for Domain instance domain */
-    public InstanceIdentifier<Domain> domainID = InstanceIdentifier.create(Authentication.class)
-                                                                   .child(Domain.class,
-                                                                           new DomainKey(
-                                                                                   new String(
-                                                                                           "SETNAME")));
-
-    /* Mokito DataBroker method for domain Data Object */
-    public void addMokitoFordomain() throws NoSuchMethodException, SecurityException, InterruptedException, ExecutionException {
-        CheckedFuture<Optional<Domain>, ReadFailedException> read = mock(CheckedFuture.class);
-        DataBrokerReadMocker.getMocker(rot).addWhen("read",
-                new Object[] { LogicalDatastoreType.CONFIGURATION, domainID }, read);
-        Optional<Domain> optional = mock(Optional.class);
-        when(read.get()).thenReturn(optional);
-        when(optional.get()).thenReturn(domain);
-        when(optional.isPresent()).thenReturn(true);
-    }
-
-    /* InstanceIdentifier for Role instance role */
-    public InstanceIdentifier<Role> roleID = InstanceIdentifier.create(Authentication.class).child(
-            Role.class, createrole().getKey());
-
-    /* Mokito DataBroker method for role Data Object */
-    public void addMokitoForrole() throws NoSuchMethodException, SecurityException, InterruptedException, ExecutionException {
-        CheckedFuture<Optional<Role>, ReadFailedException> read = mock(CheckedFuture.class);
-        DataBrokerReadMocker.getMocker(rot).addWhen("read",
-                new Object[] { LogicalDatastoreType.CONFIGURATION, roleID }, read);
-        Optional<Role> optional = mock(Optional.class);
-        when(read.get()).thenReturn(optional);
-        when(optional.get()).thenReturn(role);
-        when(optional.isPresent()).thenReturn(true);
-    }
-
-    /* InstanceIdentifier for User instance user */
-    public InstanceIdentifier<User> userID = InstanceIdentifier.create(Authentication.class).child(
-            User.class, createuser().getKey());
-
-    /* Mokito DataBroker method for user Data Object */
-    public void addMokitoForuser() throws NoSuchMethodException, SecurityException, InterruptedException, ExecutionException {
-        CheckedFuture<Optional<User>, ReadFailedException> read = mock(CheckedFuture.class);
-        DataBrokerReadMocker.getMocker(rot).addWhen("read",
-                new Object[] { LogicalDatastoreType.CONFIGURATION, userID }, read);
-        Optional<User> optional = mock(Optional.class);
-        when(read.get()).thenReturn(optional);
-        when(optional.get()).thenReturn(user);
-        when(optional.isPresent()).thenReturn(true);
-    }
-}
diff --git a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/MDSALConvertTest.java b/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/MDSALConvertTest.java
deleted file mode 100644
index 9b7c9712..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/MDSALConvertTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.aaa.authn.mdsal.store;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.opendaylight.aaa.api.model.Domain;
-import org.opendaylight.aaa.api.model.Grant;
-import org.opendaylight.aaa.api.model.Role;
-import org.opendaylight.aaa.api.model.User;
-
-public class MDSALConvertTest {
-    @Test
-    public void testConvertDomain() {
-        Domain d = new Domain();
-        d.setDescription("hello");
-        d.setDomainid("hello");
-        d.setEnabled(true);
-        d.setName("Hello");
-        org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Domain mdsalDomain = IDMObject2MDSAL.toMDSALDomain(d);
-        Assert.assertNotNull(mdsalDomain);
-        Domain d2 = IDMObject2MDSAL.toIDMDomain(mdsalDomain);
-        Assert.assertNotNull(d2);
-        Assert.assertEquals(d, d2);
-    }
-
-    @Test
-    public void testConvertRole() {
-        Role r = new Role();
-        r.setDescription("hello");
-        r.setRoleid("Hello@hello");
-        r.setName("Hello");
-        r.setDomainid("hello");
-        org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Role mdsalRole = IDMObject2MDSAL.toMDSALRole(r);
-        Assert.assertNotNull(mdsalRole);
-        Role r2 = IDMObject2MDSAL.toIDMRole(mdsalRole);
-        Assert.assertNotNull(r2);
-        Assert.assertEquals(r, r2);
-    }
-
-    @Test
-    public void testConvertUser() {
-        User u = new User();
-        u.setDescription("hello");
-        u.setDomainid("hello");
-        u.setUserid("hello@hello");
-        u.setName("Hello");
-        u.setEmail("email");
-        u.setEnabled(true);
-        u.setPassword("pass");
-        u.setSalt("salt");
-        org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.User mdsalUser = IDMObject2MDSAL.toMDSALUser(u);
-        Assert.assertNotNull(mdsalUser);
-        User u2 = IDMObject2MDSAL.toIDMUser(mdsalUser);
-        Assert.assertNotNull(u2);
-        Assert.assertEquals(u, u2);
-    }
-
-    @Test
-    public void testConvertGrant() {
-        Grant g = new Grant();
-        g.setDomainid("hello");
-        g.setUserid("hello@hello");
-        g.setRoleid("hello@hello");
-        g.setGrantid("hello@hello@Hello");
-        org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.authentication.Grant mdsalGrant = IDMObject2MDSAL.toMDSALGrant(g);
-        Assert.assertNotNull(mdsalGrant);
-        Grant g2 = IDMObject2MDSAL.toIDMGrant(mdsalGrant);
-        Assert.assertNotNull(g2);
-        Assert.assertEquals(g, g2);
-    }
-}
diff --git a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/util/AuthNStoreUtilTest.java b/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/util/AuthNStoreUtilTest.java
deleted file mode 100644
index 10c18790..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/src/test/java/org/opendaylight/aaa/authn/mdsal/store/util/AuthNStoreUtilTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.aaa.authn.mdsal.store.util;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.opendaylight.aaa.api.Authentication;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.token_cache_times.token_list.UserTokens;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.tokencache.Claims;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.tokencache.ClaimsBuilder;
-import org.opendaylight.yang.gen.v1.urn.aaa.yang.authn.claims.rev141029.tokencache.ClaimsKey;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class AuthNStoreUtilTest {
-
-    private String token = "foo_token_test";
-    private String userId = "123";
-    private Long expire = new Long(365);
-    @Mock
-    private Authentication auth;
-    @Mock
-    private UserTokens tokens;
-    @Mock
-    private Claims claims;
-
-    @Test
-    public void testCreateInstIdentifierForTokencache() {
-        assertTrue(AuthNStoreUtil.createInstIdentifierForTokencache("") == null);
-        assertNotNull(AuthNStoreUtil.createInstIdentifierForTokencache(token));
-    }
-
-    @Test
-    public void testCreateInstIdentifierUserTokens() {
-        assertTrue(AuthNStoreUtil.createInstIdentifierUserTokens("", "") == null);
-        assertNotNull(AuthNStoreUtil.createInstIdentifierUserTokens(userId, token));
-    }
-
-    @Test
-    public void testCreateClaimsRecord() {
-        assertTrue(AuthNStoreUtil.createClaimsRecord("", null) == null);
-        assertNotNull(AuthNStoreUtil.createClaimsRecord(token, auth));
-    }
-
-    @Test
-    public void testCreateUserTokens() {
-        assertTrue(AuthNStoreUtil.createUserTokens("", null) == null);
-        assertNotNull(AuthNStoreUtil.createUserTokens(token, expire));
-    }
-
-    @Test
-    public void testCreateTokenList() {
-        assertTrue(AuthNStoreUtil.createTokenList(null, "") == null);
-        assertNotNull(AuthNStoreUtil.createTokenList(tokens, userId));
-    }
-
-    @Test
-    public void testConvertClaimToAuthentication() {
-        ClaimsKey claimsKey = new ClaimsKey(token);
-        ClaimsBuilder claimsBuilder = new ClaimsBuilder();
-        claimsBuilder.setClientId("123");
-        claimsBuilder.setDomain("foo_domain");
-        claimsBuilder.setKey(claimsKey);
-        List<String> roles = new ArrayList<String>();
-        roles.add("foo_role");
-        claimsBuilder.setRoles(roles);
-        claimsBuilder.setToken(token);
-        claimsBuilder.setUser("foo_usr");
-        claimsBuilder.setUserId(userId);
-        Claims fooClaims = claimsBuilder.build();
-
-        assertTrue(AuthNStoreUtil.convertClaimToAuthentication(null, expire) == null);
-        assertNotNull(AuthNStoreUtil.convertClaimToAuthentication(fooClaims, expire));
-    }
-
-}