Add DistributedLock test commands and STC tests
Change-Id: If410a91418fe1749e738cdc12494859af1c74245
(cherry picked from commit 2c9b159066a564b3ee61802819d81ecadc2aef4a)
diff --git a/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/DistributedPrimitivesTest.java b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/DistributedPrimitivesTest.java
index a83c7db..3296046 100644
--- a/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/DistributedPrimitivesTest.java
+++ b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/DistributedPrimitivesTest.java
@@ -27,6 +27,7 @@
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.service.DistributedLock;
import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.LeaderElector;
import org.onosproject.store.service.StorageService;
@@ -35,7 +36,6 @@
import static org.slf4j.LoggerFactory.getLogger;
-
/**
* Simple application to test distributed primitives.
*/
@@ -56,6 +56,7 @@
private final Map<String, EventuallyConsistentMap<String, String>> maps = Maps.newConcurrentMap();
private final Map<String, LeaderElector> electors = Maps.newConcurrentMap();
+ private final Map<String, DistributedLock> locks = Maps.newConcurrentMap();
@Activate
protected void activate() {
@@ -90,8 +91,21 @@
*/
public LeaderElector getLeaderElector(String name) {
return electors.computeIfAbsent(name, n -> storageService.leaderElectorBuilder()
- .withName(name)
- .build()
- .asLeaderElector());
+ .withName(name)
+ .build()
+ .asLeaderElector());
+ }
+
+ /**
+ * Returns a lock instance by name.
+ *
+ * @param name the lock name
+ * @return the lock
+ */
+ public DistributedLock getLock(String name) {
+ return locks.computeIfAbsent(name, n -> storageService.lockBuilder()
+ .withName(name)
+ .build()
+ .asLock());
}
}
diff --git a/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/DistributedLockTestCommand.java b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/DistributedLockTestCommand.java
new file mode 100644
index 0000000..9e23cb2
--- /dev/null
+++ b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/DistributedLockTestCommand.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.
+ */
+package org.onosproject.distributedprimitives.cli;
+
+import java.time.Duration;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.distributedprimitives.DistributedPrimitivesTest;
+import org.onosproject.store.service.DistributedLock;
+
+@Command(scope = "onos", name = "lock-test",
+ description = "DistributedLock test cli fixture")
+public class DistributedLockTestCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "name",
+ description = "lock name",
+ required = true,
+ multiValued = false)
+ String name = null;
+
+ @Argument(index = 1, name = "operation",
+ description = "operation",
+ required = true,
+ multiValued = false)
+ String operation = null;
+
+ @Argument(index = 2, name = "durationMillis",
+ description = "lock attempt duration in milliseconds",
+ required = false,
+ multiValued = false)
+ Long durationMillis = null;
+
+ DistributedLock lock;
+
+ @Override
+ protected void execute() {
+ DistributedPrimitivesTest test = get(DistributedPrimitivesTest.class);
+ lock = test.getLock(name);
+ if ("lock".equals(operation)) {
+ lock.lock();
+ } else if ("tryLock".equals(operation)) {
+ if (durationMillis == null) {
+ print("%b", lock.tryLock().isPresent());
+ } else {
+ print("%b", lock.tryLock(Duration.ofMillis(durationMillis)).isPresent());
+ }
+ } else if ("unlock".equals(operation)) {
+ lock.unlock();
+ }
+ }
+}
diff --git a/apps/test/distributed-primitives/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/test/distributed-primitives/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index ce02720..30401a0 100644
--- a/apps/test/distributed-primitives/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/test/distributed-primitives/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -52,6 +52,9 @@
<command>
<action class="org.onosproject.distributedprimitives.cli.LeaderElectorTestCommand"/>
</command>
+ <command>
+ <action class="org.onosproject.distributedprimitives.cli.DistributedLockTestCommand"/>
+ </command>
</command-bundle>
</blueprint>