Moving all files to root directory

Change-Id: Ica5535fd6ec85f350fe1640b42137b49f83f10f0
Signed-off-by: Patrick Brady <pb071s@att.com>

7 files changed, 762 insertions, 0 deletions

diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
new file mode 100644
index 000000000..47e27f79d
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
@@ -0,0 +1,167 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.api;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.appc.lockmanager.api.LockException;
+import org.openecomp.appc.lockmanager.api.LockManager;
+
+public abstract class LockManagerBaseTests {
+
+	protected enum Resource {Resource1, Resource2};
+	protected enum Owner {A, B};
+
+	protected LockManager lockManager;
+
+	@Before
+	public void beforeTest() {
+		lockManager = createLockManager();
+	}
+
+	protected abstract LockManager createLockManager();
+
+	@Test
+	public void testAcquireLock() throws LockException {
+		boolean lockRes = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+		try {
+			Assert.assertTrue(lockRes);
+		} finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+	@Test
+	public void testAcquireLock_AlreadyLockedBySameOwner() throws LockException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+		try {
+			Assert.assertTrue(lockRes1);
+			boolean lockRes2 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+			Assert.assertFalse(lockRes2);
+		} finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+	@Test(expected = LockException.class)
+	public void testAcquireLock_AlreadyLockedByOtherOwner() throws LockException {
+		String owner2 = "B";
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+		try {
+			Assert.assertTrue(lockRes1);
+			boolean lockRes2 = lockManager.acquireLock(Resource.Resource1.name(), owner2);
+			Assert.assertFalse(lockRes2);
+		} finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+	@Test
+	public void testAcquireLock_LockDifferentResources() throws LockException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+		try {
+			Assert.assertTrue(lockRes1);
+			boolean lockRes2 = lockManager.acquireLock(Resource.Resource2.name(), Owner.B.name());
+			try {
+				Assert.assertTrue(lockRes2);
+			} finally {
+				lockManager.releaseLock(Resource.Resource2.name(), Owner.B.name());
+			}
+		} finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+	@Test(expected = LockException.class)
+	public void testReleaseLock_NotLockedResource() throws LockException {
+		lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+	}
+
+	@Test(expected = LockException.class)
+	public void testReleaseLock_LockedByOtherOwnerResource() throws LockException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+		try {
+			Assert.assertTrue(lockRes1);
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.B.name());
+		} finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+	@Test(expected = LockException.class)
+	public void testAcquireLock_LockExpired() throws LockException, InterruptedException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name(), 50);
+		Assert.assertTrue(lockRes1);
+		Thread.sleep(1000);
+		lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+	}
+
+	@Test
+	public void testAcquireLock_OtherLockExpired() throws LockException, InterruptedException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name(), 50);
+		Assert.assertTrue(lockRes1);
+		Thread.sleep(1000);
+		boolean lockRes2 = lockManager.acquireLock(Resource.Resource1.name(), Owner.B.name());
+		try {
+			Assert.assertTrue(lockRes2);
+		}finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.B.name());
+		}
+	}
+
+	@Test
+	public void testIsLocked_WhenLocked() throws LockException, InterruptedException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name(), 50);
+		try {
+		Assert.assertTrue(lockManager.isLocked(Resource.Resource1.name()));
+		}finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+
+    @Test(expected = LockException.class)
+	public void testIsLocked_LockExpired() throws LockException, InterruptedException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name(), 50);
+		Assert.assertTrue(lockRes1);
+		Assert.assertTrue(lockManager.isLocked(Resource.Resource1.name()));
+		Thread.sleep(1000);
+		try {
+			Assert.assertFalse(lockManager.isLocked(Resource.Resource1.name()));
+		}finally {
+			lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		}
+	}
+
+	@Test
+	public void testIsLocked_LockReleased() throws LockException, InterruptedException {
+		boolean lockRes1 = lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name(), 50);
+		lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+		Assert.assertFalse(lockManager.isLocked(Resource.Resource1.name()));
+	}
+
+	@Test
+	public void testIsLocked_NoLock() throws LockException, InterruptedException {
+		Assert.assertFalse(lockManager.isLocked(Resource.Resource1.name()));
+	}
+}
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
new file mode 100644
index 000000000..99faec23d
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.impl.inmemory;
+
+import org.openecomp.appc.lockmanager.api.LockManager;
+import org.openecomp.appc.lockmanager.api.LockManagerBaseTests;
+import org.openecomp.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl;
+
+
+public class LockManagerInMemoryImplTest extends LockManagerBaseTests {
+
+    @Override
+    protected LockManager createLockManager() {
+        return LockManagerInMemoryImpl.getLockManager();
+    }
+
+}
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
new file mode 100644
index 000000000..da5607819
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.impl.sql;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.appc.dao.util.DefaultJdbcConnectionFactory;
+import org.openecomp.appc.lockmanager.api.LockManager;
+import org.openecomp.appc.lockmanager.api.LockManagerBaseTests;
+import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.openecomp.appc.lockmanager.impl.sql.MySqlConnectionFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public abstract class MySqlLockManagerBaseTests extends LockManagerBaseTests {
+
+	private static final boolean USE_REAL_DB = Boolean.getBoolean("lockmanager.tests.useRealDb");
+	private static final String TABLE_LOCK_MANAGEMENT = "TEST_LOCK_MANAGEMENT";
+	private static final String JDBC_URL = System.getProperty("lockmanager.tests.jdbcUrl", "jdbc:mysql://192.168.1.2/test");
+	private static final String JDBC_USERNAME = System.getProperty("lockmanager.tests.jdbcUsername", "test");
+	private static final String JDBC_PASSWORD = System.getProperty("lockmanager.tests.jdbcPassword", "123456");
+
+	protected static final int CONCURRENT_TEST_WAIT_TIME = 10; // secs
+
+	@Rule
+	public TestName testName = new TestName();
+
+	@Override
+	protected LockManager createLockManager() {
+		JdbcLockManager jdbcLockManager = createJdbcLockManager(USE_REAL_DB);
+		DefaultJdbcConnectionFactory connectionFactory = new MySqlConnectionFactory();
+		connectionFactory.setJdbcURL(JDBC_URL);
+		connectionFactory.setJdbcUserName(JDBC_USERNAME);
+		connectionFactory.setJdbcPassword(JDBC_PASSWORD);
+		jdbcLockManager.setConnectionFactory(connectionFactory);
+		jdbcLockManager.setTableName(TABLE_LOCK_MANAGEMENT);
+		System.out.println("=> Running LockManager test [" + jdbcLockManager.getClass().getName() + "." + testName.getMethodName() + "]" + (USE_REAL_DB ? ". JDBC URL is [" + JDBC_URL + "]" : ""));
+		clearTestLocks(jdbcLockManager);
+		return jdbcLockManager;
+	}
+
+	protected abstract JdbcLockManager createJdbcLockManager(boolean useRealDb);
+
+	protected boolean setSynchronizer(Synchronizer synchronizer) {
+		if(!(lockManager instanceof SynchronizerReceiver)) {
+			System.err.println("Skipping concurrency test [" + testName.getMethodName() + "] for LockManager of type " + lockManager.getClass());
+			return false;
+		}
+		((SynchronizerReceiver)lockManager).setSynchronizer(synchronizer);
+		return true;
+	}
+
+	private static final String SQL_DELETE_LOCK_RECORD = String.format("DELETE FROM %s WHERE RESOURCE_ID=?", TABLE_LOCK_MANAGEMENT);
+	private void clearTestLocks(JdbcLockManager jdbcLockManager) {
+		Connection connection = jdbcLockManager.openDbConnection();
+		if(connection == null) {
+			return;
+		}
+		try {
+			for(Resource resource: Resource.values()) {
+				try(PreparedStatement statement = connection.prepareStatement(SQL_DELETE_LOCK_RECORD)) {
+					statement.setString(1, resource.name());
+					statement.executeUpdate();
+				}
+			}
+		} catch(SQLException e) {
+			throw new RuntimeException("Cannot clear test resources in table", e);
+		} finally {
+			jdbcLockManager.closeDbConnection(connection);
+		}
+	}
+}
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
new file mode 100644
index 000000000..8d1f0bbfd
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
@@ -0,0 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.impl.sql;
+
+public class Synchronizer {
+
+    private int participantNo;
+    private int participantCount;
+
+    public Synchronizer(int participantNo) {
+        this.participantNo = participantNo;
+    }
+
+    public int getParticipantCount() {
+        return participantCount;
+    }
+
+    public void postLoadLockRecord(String resource, String owner) {
+        synchronized(this) {
+            waitForAllParticipants(this, participantNo, ++participantCount);
+        }
+    }
+
+    public void preAddLockRecord(String resource, String owner) {
+    }
+
+    public void postAddLockRecord(String resource, String owner) {
+    }
+
+    public void preUpdateLockRecord(String resource, String owner) {
+    }
+
+    public void postUpdateLockRecord(String resource, String owner) {
+    }
+
+    public void releaseWait() {
+        synchronized(this) {
+            this.notifyAll();
+        }
+    }
+
+    protected void waitOn(Object obj, long timeout) {
+        try {
+            obj.wait(timeout);
+        } catch(InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected void waitOn(Object obj) {
+        waitOn(obj, 0);
+    }
+
+    protected void waitForAllParticipants(Object waitObj, int totalParticipantsNo, int currentParticipantsNo) {
+        if(totalParticipantsNo > currentParticipantsNo) {
+            waitOn(waitObj);
+        } else {
+            waitObj.notifyAll();
+        }
+    }
+}
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
new file mode 100644
index 000000000..945fed10b
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.impl.sql;
+
+public interface SynchronizerReceiver {
+
+    void setSynchronizer(Synchronizer synchronizer);
+}
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
new file mode 100644
index 000000000..3e6a236ba
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
@@ -0,0 +1,132 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
+import org.openecomp.appc.lockmanager.impl.sql.SynchronizerReceiver;
+import org.openecomp.appc.lockmanager.impl.sql.optimistic.LockRecord;
+import org.openecomp.appc.lockmanager.impl.sql.optimistic.MySqlLockManager;
+
+class MySqlLockManagerMock extends MySqlLockManager implements SynchronizerReceiver {
+
+	private final ConcurrentMap<String, LockRecord> locks = new ConcurrentHashMap<>();
+	private boolean useReal;
+	private Synchronizer synchronizer;
+
+	MySqlLockManagerMock(boolean useReal) {
+		this.useReal = useReal;
+	}
+
+	@Override
+	public void setSynchronizer(Synchronizer synchronizer) {
+		this.synchronizer = synchronizer;
+	}
+
+	@Override
+	protected Connection openDbConnection() {
+		if(useReal) {
+			return super.openDbConnection();
+		}
+		return null;
+	}
+
+	@Override
+	protected void closeDbConnection(Connection connection) {
+		if(useReal) {
+			super.closeDbConnection(connection);
+		}
+	}
+
+	@Override
+	protected LockRecord loadLockRecord(Connection connection, String resource) throws SQLException {
+		LockRecord res;
+		if(useReal) {
+			res = super.loadLockRecord(connection, resource);
+		} else {
+			res = locks.get(resource);
+		}
+		if(synchronizer != null) {
+			synchronizer.postLoadLockRecord(resource, (res == null) ? null : res.getOwner());
+		}
+		return res;
+	}
+
+	@Override
+	protected void addLockRecord(Connection connection, String resource, String owner, long timeout) throws SQLException {
+		if(synchronizer != null) {
+			synchronizer.preAddLockRecord(resource, owner);
+		}
+		try {
+			if(useReal) {
+				super.addLockRecord(connection, resource, owner, timeout);
+				return;
+			}
+			LockRecord lockRecord = new LockRecord(resource);
+			lockRecord.setOwner(owner);
+			lockRecord.setUpdated(System.currentTimeMillis());
+			lockRecord.setTimeout(timeout);
+			lockRecord.setVer(1);
+			LockRecord prevLockRecord = locks.putIfAbsent(resource, lockRecord);
+			if(prevLockRecord != null) {
+				// simulate unique constraint violation
+				throw new SQLException("Duplicate PK exception", "23000", 1062);
+			}
+		} finally {
+			if(synchronizer != null) {
+				synchronizer.postAddLockRecord(resource, owner);
+			}
+		}
+	}
+
+	@Override
+	protected boolean updateLockRecord(Connection connection, String resource, String owner, long timeout, long ver) throws SQLException {
+		if(synchronizer != null) {
+			synchronizer.preUpdateLockRecord(resource, owner);
+		}
+		try {
+			if(useReal) {
+				return super.updateLockRecord(connection, resource, owner, timeout, ver);
+			}
+			LockRecord lockRecord = loadLockRecord(connection, resource);
+			synchronized(lockRecord) {
+				// should be atomic operation
+				if(ver != lockRecord.getVer()) {
+					return false;
+				}
+				lockRecord.setOwner(owner);
+				lockRecord.setUpdated(System.currentTimeMillis());
+				lockRecord.setTimeout(timeout);
+				lockRecord.setVer(ver + 1);
+			}
+			return true;
+		} finally {
+			if(synchronizer != null) {
+				synchronizer.postUpdateLockRecord(resource, owner);
+			}
+		}
+	}
+}
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
new file mode 100644
index 000000000..6106dd84b
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
@@ -0,0 +1,227 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : APP-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.appc.lockmanager.api.LockException;
+import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.openecomp.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
+import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
+
+import java.util.concurrent.*;
+
+public class TestMySqlLockManager extends MySqlLockManagerBaseTests {
+
+	@Override
+	protected JdbcLockManager createJdbcLockManager(boolean useReal) {
+		return new MySqlLockManagerMock(useReal);
+	}
+
+	@Test
+	public void testConcurrentLockDifferentOwners() throws LockException, InterruptedException, ExecutionException, TimeoutException {
+
+		final int participantsNo = 2;
+		Synchronizer synchronizer = new Synchronizer(participantsNo) {
+
+			private boolean wait = true;
+
+			@Override
+			public void preAddLockRecord(String resource, String owner) {
+				if(Owner.A.name().equals(owner)) {
+					synchronized(this) {
+						if(wait) {
+							waitOn(this);
+						}
+					}
+				}
+			}
+
+			@Override
+			public void postAddLockRecord(String resource, String owner) {
+				if(!Owner.A.name().equals(owner)) {
+					synchronized(this) {
+						notifyAll();
+						wait = false;
+					}
+				}
+			}
+
+			@Override
+			public void preUpdateLockRecord(String resource, String owner) {
+				preAddLockRecord(resource, owner);
+			}
+
+			@Override
+			public void postUpdateLockRecord(String resource, String owner) {
+				postAddLockRecord(resource, owner);
+			}
+		};
+		if(!setSynchronizer(synchronizer)) {
+			return;
+		}
+		ExecutorService executor = Executors.newFixedThreadPool(participantsNo);
+		// acquireLock by owner A should fail as it will wait for acquireLock by owner B
+		Future<Boolean> future1 = executor.submit(new Callable<Boolean>() {
+			@Override
+			public Boolean call() throws Exception {
+				try {
+					lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+					return false;
+				} catch(LockException e) {
+					// this call should fail as Synchronizer delays its lock to make sure the second call locks the resource first
+					Assert.assertEquals("Cannot lock resource [" + Resource.Resource1.name() + "] for [" + Owner.A.name() + "]: already locked by [" + Owner.B.name() + "]", e.getMessage());
+					return true;
+				}
+			}
+		});
+		try {
+			// acquireLock by owner B should success
+			Future<Boolean> future2 = executor.submit(new Callable<Boolean>() {
+				@Override
+				public Boolean call() throws Exception {
+					// this call should success as Synchronizer delays the above lock to make sure this call success to lock the resource
+					return lockManager.acquireLock(Resource.Resource1.name(), Owner.B.name());
+				}
+			});
+			try {
+				Assert.assertTrue(future2.get(CONCURRENT_TEST_WAIT_TIME, TimeUnit.SECONDS));
+				Assert.assertTrue(future1.get(CONCURRENT_TEST_WAIT_TIME, TimeUnit.SECONDS));
+			} finally {
+				future2.cancel(true);
+			}
+		} finally {
+			future1.cancel(true);
+		}
+	}
+
+	@Test
+	public void testConcurrentLockSameOwner() throws LockException, InterruptedException, ExecutionException, TimeoutException {
+		final int participantsNo = 2;
+		Synchronizer synchronizer = new Synchronizer(participantsNo) {
+
+			private boolean wait = true;
+
+			@Override
+			public void preAddLockRecord(String resource, String owner) {
+				synchronized(this) {
+					if(wait) {
+						wait = false;
+						waitOn(this);
+					}
+				}
+			}
+
+			@Override
+			public void postAddLockRecord(String resource, String owner) {
+				synchronized(this) {
+					notifyAll();
+				}
+			}
+		};
+		if(!setSynchronizer(synchronizer)) {
+			return;
+		}
+		ExecutorService executor = Executors.newFixedThreadPool(participantsNo);
+		// one acquireLock should return true and the other should return false
+		Callable<Boolean> callable = new Callable<Boolean>() {
+			@Override
+			public Boolean call() throws Exception {
+				return lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+			}
+		};
+		Future<Boolean> future1 = executor.submit(callable);
+		try {
+			Future<Boolean> future2 = executor.submit(callable);
+			try {
+				boolean future1Res = future1.get(CONCURRENT_TEST_WAIT_TIME, TimeUnit.SECONDS);
+				boolean future2Res = future2.get(CONCURRENT_TEST_WAIT_TIME, TimeUnit.SECONDS);
+				// one of the lock requests should return true, the other one false as lock is requested simultaneously from 2 threads by same owner
+				Assert.assertNotEquals(future1Res, future2Res);
+			} finally {
+				future2.cancel(true);
+			}
+		} finally {
+			future1.cancel(true);
+		}
+	}
+
+	@Test
+	public void testConcurrentUnlockSameOwner() throws LockException, InterruptedException, ExecutionException, TimeoutException {
+		lockManager.acquireLock(Resource.Resource1.name(), Owner.A.name());
+		final int participantsNo = 2;
+		Synchronizer synchronizer = new Synchronizer(participantsNo) {
+
+			private boolean wait = true;
+
+			@Override
+			public void preUpdateLockRecord(String resource, String owner) {
+				synchronized(this) {
+					// make sure second call updates the LockRecord first
+					if(wait) {
+						wait = false;
+						waitOn(this);
+					}
+				}
+			}
+
+			@Override
+			public void postUpdateLockRecord(String resource, String owner) {
+				synchronized(this) {
+					notifyAll();
+				}
+			}
+		};
+		if(!setSynchronizer(synchronizer)) {
+			return;
+		}
+		ExecutorService executor = Executors.newFixedThreadPool(participantsNo);
+		Callable<Boolean> callable = new Callable<Boolean>() {
+			@Override
+			public Boolean call() throws Exception {
+				try {
+					lockManager.releaseLock(Resource.Resource1.name(), Owner.A.name());
+					// one of the unlock calls should success
+					return true;
+				} catch(LockException e) {
+					// one of the unlock calls should throw the LockException as the resource should already be unlocked by other call
+					Assert.assertEquals("Error unlocking resource [" + Resource.Resource1.name() + "]: resource is not locked", e.getMessage());
+					return false;
+				}
+			}
+		};
+		Future<Boolean> future1 = executor.submit(callable);
+		try {
+			Future<Boolean> future2 = executor.submit(callable);
+			try {
+				boolean future1Res = future1.get(CONCURRENT_TEST_WAIT_TIME, TimeUnit.SECONDS);
+				boolean future2Res = future2.get(CONCURRENT_TEST_WAIT_TIME, TimeUnit.SECONDS);
+				// one of the unlock calls should return true, the other one false as unlock is requested simultaneously from 2 threads by same owner
+				Assert.assertNotEquals(future1Res, future2Res);
+			} finally {
+				future2.cancel(true);
+			}
+		} finally {
+			future1.cancel(true);
+		}
+	}
+}