Mercurial > hg > release > thermostat-0.4
view tools/src/test/java/com/redhat/thermostat/tools/cli/ListVMsCommandTest.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 | ac3d23577264 |
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.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collection; import org.junit.After; import org.junit.Before; import org.junit.Test; import com.redhat.thermostat.common.appctx.ApplicationContext; 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.dao.DAOFactory; import com.redhat.thermostat.common.dao.HostInfoDAO; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.VmInfoDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.VmInfo; import com.redhat.thermostat.test.TestCommandContextFactory; public class ListVMsCommandTest { private ListVMsCommand cmd; private TestCommandContextFactory cmdCtxFactory; private HostInfoDAO hostsDAO; private VmInfoDAO vmsDAO; @Before public void setUp() { ApplicationContextUtil.resetApplicationContext(); setupCommandContextFactory(); cmd = new ListVMsCommand(); setupDAOs(); } private void setupCommandContextFactory() { cmdCtxFactory = new TestCommandContextFactory(); } private void setupDAOs() { hostsDAO = mock(HostInfoDAO.class); vmsDAO = mock(VmInfoDAO.class); DAOFactory daoFactory = mock(DAOFactory.class); when(daoFactory.getHostInfoDAO()).thenReturn(hostsDAO); when(daoFactory.getVmInfoDAO()).thenReturn(vmsDAO); ApplicationContext.getInstance().setDAOFactory(daoFactory); } @After public void tearDown() { vmsDAO = null; hostsDAO = null; cmdCtxFactory = null; cmd = null; ApplicationContextUtil.resetApplicationContext(); } @Test public void verifyOutputFormatOneLine() throws CommandException { HostRef host1 = new HostRef("123", "h1"); VmRef vm1 = new VmRef(host1, 1, "n"); VmInfo vm1Info = new VmInfo(1, 0, 1, "", "", "", "", "", "", "", "", null, null, null); when(hostsDAO.getHosts()).thenReturn(Arrays.asList(host1)); when(vmsDAO.getVMs(host1)).thenReturn(Arrays.asList(vm1)); when(vmsDAO.getVmInfo(eq(vm1))).thenReturn(vm1Info); SimpleArguments args = new SimpleArguments(); args.addArgument("--dbUrl", "fluff"); CommandContext ctx = cmdCtxFactory.createContext(args); cmd.run(ctx); String output = cmdCtxFactory.getOutput(); assertEquals("HOST_ID HOST VM_ID STATUS VM_NAME\n" + "123 h1 1 EXITED n\n", output); } @Test public void verifyOutputFormatMultiLines() throws CommandException { HostRef host1 = new HostRef("123", "h1"); HostRef host2 = new HostRef("456", "longhostname"); when(hostsDAO.getHosts()).thenReturn(Arrays.asList(host1, host2)); VmRef vm1 = new VmRef(host1, 1, "n"); VmRef vm2 = new VmRef(host1, 2, "n1"); VmRef vm3 = new VmRef(host2, 123456, "longvmname"); VmInfo vmInfo = new VmInfo(1, 0, 1, "", "", "", "", "", "", "", "", null, null, null); when(vmsDAO.getVMs(host1)).thenReturn(Arrays.asList(vm1, vm2)); when(vmsDAO.getVMs(host2)).thenReturn(Arrays.asList(vm3)); when(vmsDAO.getVmInfo(isA(VmRef.class))).thenReturn(vmInfo); SimpleArguments args = new SimpleArguments(); args.addArgument("--dbUrl", "fluff"); CommandContext ctx = cmdCtxFactory.createContext(args); cmd.run(ctx); String output = cmdCtxFactory.getOutput(); assertEquals("HOST_ID HOST VM_ID STATUS VM_NAME\n" + "123 h1 1 EXITED n\n" + "123 h1 2 EXITED n1\n" + "456 longhostname 123456 EXITED longvmname\n", output); } @Test public void testName() { assertEquals("list-vms", cmd.getName()); } @Test public void testDescription() { assertEquals("lists all currently monitored VMs", cmd.getDescription()); } @Test public void testUsage() { String expected = "lists all currently monitored VMs"; assertEquals(expected, cmd.getUsage()); } @Test public void testAcceptedArguments() { Collection<ArgumentSpec> args = cmd.getAcceptedArguments(); assertNotNull(args); assertTrue(args.isEmpty()); } }