Mercurial > hg > release > thermostat-0.4
view tools/src/test/java/com/redhat/thermostat/tools/cli/DisconnectCommandTest.java @ 636:9e4437930235
Add DB connection service
This should improve usability of the Thermostat shell. In particular in a
remote setup. The current situation is that if a shell is fired up it does not
make a connection to storage. So if a user has storage set up to bind to a
"public" IP, 192.1.1.129 say, then mongo requires username/password for
connections. This results in bad usability of the shell:
./bin/thermostat shell
Thermostat > ping
Could not connect to db mongodb://192.168.1.14:27518
(creds are missing or incorrect host IP in user prefs)
Thermostat > ping --username blah --password blah -d
mongodb://example.org
(works)
Thermostat > list-vms --username blah --password blah -d ...
(i.e. a user needs to pass credential info for every command on the
shell).
This patch introduces a "connect" and "disconnect" command which
establishes a DB connection on demand and registers a DbService. The
above shell session becomes:
./bin/thermostat shell
Thermostat > ping
Could not connect to db mongodb://192.168.1.14:27518
Thermostat > connect -d mongodb://192.168.1.14:27518 -u blah -p blah
Thermostat > ping agent-id
(works)
Thermostat > list-vms
(works)
Thermostat > disconnect
(disconnects from mongo storage at 192.168.1.14:27518)
Thermostat > ping
Could not connect to db mongodb://192.168.1.14:27518
Details of the patch:
-----------------------------------------------------------------
1. It removes AppContextSetup/AppContextSetupImpl
2. Modifies LauncherImpl in order to use the new DbService (i.e.
other use cases remain the same)
3. OSGIUtils now returns the ServiceRegistration for registered
services.
4. Added a method which allows services to be null to OSGIUtils.
Existing getService() throws a NPE if the service reference is
null (bundleContext.getServiceReference(clazz)).
5. Adds ConnectCommand ("connect" on shell)
6. Adds DisconnectCommand ("disconnect" on shell)
7. Tests
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-September/003341.html
PR1164
author | Severin Gehwolf <sgehwolf@redhat.com> |
---|---|
date | Fri, 21 Sep 2012 18:17:41 +0200 |
parents | |
children | 73c182a706fc |
line wrap: on
line source
/* * Copyright 2012 Red Hat, Inc. * * This file is part of Thermostat. * * Thermostat is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2, or (at your * option) any later version. * * Thermostat is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Thermostat; see the file COPYING. If not see * <http://www.gnu.org/licenses/>. * * Linking this code with other modules is making a combined work * based on this code. Thus, the terms and conditions of the GNU * General Public License cover the whole combination. * * As a special exception, the copyright holders of this code give * you permission to link this code with independent modules to * produce an executable, regardless of the license terms of these * independent modules, and to copy and distribute the resulting * executable under terms of your choice, provided that you also * meet, for each linked independent module, the terms and conditions * of the license of that module. An independent module is a module * which is not derived from or based on this code. If you modify * this code, you may extend this exception to your version of the * library, but you are not obligated to do so. If you do not wish * to do so, delete this exception statement from your version. */ package com.redhat.thermostat.tools.cli; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collection; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceRegistration; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import com.redhat.thermostat.common.appctx.ApplicationContextUtil; import com.redhat.thermostat.common.cli.ArgumentSpec; import com.redhat.thermostat.common.cli.CommandContext; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; import com.redhat.thermostat.common.utils.OSGIUtils; import com.redhat.thermostat.launcher.DbService; import com.redhat.thermostat.test.TestCommandContextFactory; import com.redhat.thermostat.tools.LocaleResources; import com.redhat.thermostat.tools.Translate; @RunWith(PowerMockRunner.class) @PrepareForTest({ OSGIUtils.class, FrameworkUtil.class }) public class DisconnectCommandTest { private DisconnectCommand cmd; private TestCommandContextFactory cmdCtxFactory; private BundleContext bundleContext; @Before public void setUp() { ApplicationContextUtil.resetApplicationContext(); setupCommandContextFactory(); cmd = new DisconnectCommand(); } private void setupCommandContextFactory() { Bundle sysBundle = mock(Bundle.class); bundleContext = mock(BundleContext.class); when(bundleContext.getBundle(0)).thenReturn(sysBundle); cmdCtxFactory = new TestCommandContextFactory(bundleContext); } @After public void tearDown() { cmdCtxFactory = null; cmd = null; ApplicationContextUtil.resetApplicationContext(); } @Test public void verifyNotConnectedThrowsException() { OSGIUtils utils = mock(OSGIUtils.class); PowerMockito.mockStatic(OSGIUtils.class); when(OSGIUtils.getInstance()).thenReturn(utils); when(utils.getServiceAllowNull(DbService.class)).thenReturn(null); try { cmd.run(cmdCtxFactory.createContext(new SimpleArguments())); fail("cmd.run() should have thrown exception."); } catch (CommandException e) { assertEquals(Translate.localize(LocaleResources.COMMAND_DISCONNECT_NOT_CONNECTED), e.getMessage()); } } @SuppressWarnings({ "rawtypes" }) @Test public void verifyConnectedDisconnectsAndUnregistersService() throws CommandException { DbService dbService = mock(DbService.class); OSGIUtils utils = mock(OSGIUtils.class); PowerMockito.mockStatic(OSGIUtils.class); when(OSGIUtils.getInstance()).thenReturn(utils); when(utils.getServiceAllowNull(DbService.class)).thenReturn(dbService); ServiceRegistration registration = mock(ServiceRegistration.class); when(dbService.getServiceRegistration()).thenReturn(registration); CommandContext ctx = cmdCtxFactory.createContext(new SimpleArguments()); cmd.run(ctx); verify(dbService).disconnect(); verify(registration).unregister(); } @Test public void testIsNotAvailableOutsideShell() { assertFalse(cmd.isAvailableOutsideShell()); } @Test public void testIsAvailableInShell() { assertTrue(cmd.isAvailableInShell()); } @Test public void testIsStorageRequired() { assertFalse(cmd.isStorageRequired()); } @Test public void testName() { assertEquals("disconnect", cmd.getName()); } @Test public void testDescription() { assertEquals("disconnect from the currently used database", cmd.getDescription()); } @Test public void testUsage() { String expected = "disconnect"; assertEquals(expected, cmd.getUsage()); } @Test public void testAcceptedArguments() { Collection<ArgumentSpec> args = cmd.getAcceptedArguments(); assertNotNull(args); assertTrue(args.size() == 0); } }