From 78b300c7c459a74ebcdc553e2bc315237bebe82c Mon Sep 17 00:00:00 2001 From: Jon Hall Date: Tue, 4 Aug 2015 15:52:55 -0700 Subject: [PATCH] WIP: Transactional map cli for system tests - get a key from the test map - Push a value to n number of keys named key(1 to n) in the test map Change-Id: I1778acbaabcede2d123f77f01db87e3f59633668 --- .../cli/TransactionalMapTestGetCommand.java | 73 +++++++++++++++++ .../cli/TransactionalMapTestPutCommand.java | 81 +++++++++++++++++++ .../OSGI-INF/blueprint/shell-config.xml | 6 ++ 3 files changed, 160 insertions(+) create mode 100644 apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestGetCommand.java create mode 100644 apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestPutCommand.java diff --git a/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestGetCommand.java b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestGetCommand.java new file mode 100644 index 0000000000..e41ccc8dd7 --- /dev/null +++ b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestGetCommand.java @@ -0,0 +1,73 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * 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 org.apache.karaf.shell.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Option; +import org.onosproject.cli.AbstractShellCommand; +import org.onosproject.store.serializers.KryoNamespaces; +import org.onosproject.store.service.Serializer; +import org.onosproject.store.service.StorageService; +import org.onosproject.store.service.TransactionContext; +import org.onosproject.store.service.TransactionalMap; + +/** + * CLI command to get a value associated with a specific key in a transactional map. + */ +@Command(scope = "onos", name = "transactional-map-test-get", + description = "Get a value associated with a specific key in a transactional map") +public class TransactionalMapTestGetCommand extends AbstractShellCommand { + + @Option(name = "-i", aliases = "--inMemory", description = "use in memory map?", + required = false, multiValued = false) + private boolean inMemory = false; + + @Argument(index = 0, name = "key", + description = "Key to get the value of", + required = true, multiValued = false) + private String key = null; + + TransactionalMap map; + String mapName = "Test-Map"; + Serializer serializer = Serializer.using(KryoNamespaces.BASIC); + + @Override + protected void execute() { + StorageService storageService = get(StorageService.class); + TransactionContext context; + if (inMemory) { + context = storageService.transactionContextBuilder().withPartitionsDisabled().build(); + } else { + context = storageService.transactionContextBuilder().build(); + } + context.begin(); + try { + map = context.getTransactionalMap(mapName, serializer); + String response = map.get(key); + context.commit(); + + if (response == null) { + print("Key %s not found.", key); + } else { + print("Key-value pair (%s, %s) found.", key, response); + } + } catch (Exception e) { + context.abort(); + throw e; + } + } +} diff --git a/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestPutCommand.java b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestPutCommand.java new file mode 100644 index 0000000000..0e0e44a700 --- /dev/null +++ b/apps/test/distributed-primitives/src/main/java/org/onosproject/distributedprimitives/cli/TransactionalMapTestPutCommand.java @@ -0,0 +1,81 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * 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 org.apache.karaf.shell.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Option; +import org.onosproject.cli.AbstractShellCommand; +import org.onosproject.store.serializers.KryoNamespaces; +import org.onosproject.store.service.Serializer; +import org.onosproject.store.service.StorageService; +import org.onosproject.store.service.TransactionContext; +import org.onosproject.store.service.TransactionalMap; + +/** + * CLI command to put a value into a transactional map. + */ +@Command(scope = "onos", name = "transactional-map-test-put", + description = "Put a value into a transactional map") +public class TransactionalMapTestPutCommand extends AbstractShellCommand { + + @Option(name = "-i", aliases = "--inMemory", description = "use in memory map?", + required = false, multiValued = false) + private boolean inMemory = false; + + @Argument(index = 0, name = "numKeys", + description = "Number of keys to put the value into", + required = true, multiValued = false) + private int numKeys = 1; + + @Argument(index = 1, name = "value", + description = "Value to map with the keys in the map", + required = true, multiValued = false) + private String value = null; + + TransactionalMap map; + String prefix = "Key"; + String mapName = "Test-Map"; + Serializer serializer = Serializer.using(KryoNamespaces.BASIC); + + @Override + protected void execute() { + StorageService storageService = get(StorageService.class); + TransactionContext context; + if (inMemory) { + context = storageService.transactionContextBuilder().withPartitionsDisabled().build(); + } else { + context = storageService.transactionContextBuilder().build(); + } + context.begin(); + try { + map = context.getTransactionalMap(mapName, serializer); + for (int i = 1; i <= numKeys; i++) { + String key = prefix + i; + String response = map.put(key, value); + if (response == null) { + print("Created Key %s with value %s.", key, value); + } else { + print("Put %s into key %s. The old value was %s.", value, key, response); + } + } + context.commit(); + } catch (Exception e) { + context.abort(); + throw e; + } + } +} 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 00ad9752db..295171d71a 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 @@ -28,6 +28,12 @@ + + + + + +