Mercurial > hg > release > thermostat-0.4
view tools/src/test/java/com/redhat/thermostat/tools/cli/VmStatCommandTest.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 | 4238b97fc746 |
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.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.TimeZone; import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import com.redhat.thermostat.common.Timer; 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.CommandException; import com.redhat.thermostat.common.cli.SimpleArgumentSpec; import com.redhat.thermostat.common.cli.SimpleArguments; import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.VmCpuStatDAO; import com.redhat.thermostat.common.dao.VmMemoryStatDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.VmCpuStat; import com.redhat.thermostat.common.model.VmMemoryStat; import com.redhat.thermostat.common.model.VmMemoryStat.Generation; import com.redhat.thermostat.common.model.VmMemoryStat.Space; import com.redhat.thermostat.test.TestCommandContextFactory; import com.redhat.thermostat.test.TestTimerFactory; public class VmStatCommandTest { private static Locale defaultLocale; private static TimeZone defaultTimeZone; @BeforeClass public static void setUpClass() { defaultLocale = Locale.getDefault(); Locale.setDefault(Locale.US); defaultTimeZone = TimeZone.getDefault(); TimeZone.setDefault(TimeZone.getTimeZone("UTC")); } @AfterClass public static void tearDownClass() { TimeZone.setDefault(defaultTimeZone); Locale.setDefault(defaultLocale); } private VMStatCommand cmd; private VmCpuStatDAO vmCpuStatDAO; private TestCommandContextFactory cmdCtxFactory; private VmMemoryStatDAO vmMemoryStatDAO; private TestTimerFactory timerFactory; @Before public void setUp() { ApplicationContextUtil.resetApplicationContext(); timerFactory = new TestTimerFactory(); ApplicationContext.getInstance().setTimerFactory(timerFactory); setupCommandContextFactory(); cmd = new VMStatCommand(); setupDAOs(); } @After public void tearDown() { vmCpuStatDAO = null; cmdCtxFactory = null; cmd = null; timerFactory = null; ApplicationContextUtil.resetApplicationContext(); } private void setupCommandContextFactory() { cmdCtxFactory = new TestCommandContextFactory(); } private void setupDAOs() { vmCpuStatDAO = mock(VmCpuStatDAO.class); int vmId = 234; HostRef host = new HostRef("123", "dummy"); VmRef vm = new VmRef(host, 234, "dummy"); VmCpuStat cpustat1 = new VmCpuStat(2, vmId, 65); VmCpuStat cpustat2 = new VmCpuStat(3, vmId, 70); List<VmCpuStat> cpuStats = Arrays.asList(cpustat1, cpustat2); List<VmCpuStat> cpuStats2 = Collections.emptyList(); when(vmCpuStatDAO.getLatestVmCpuStats(vm, Long.MIN_VALUE)).thenReturn(cpuStats).thenReturn(cpuStats2); DAOFactory daoFactory = mock(DAOFactory.class); when(daoFactory.getVmCpuStatDAO()).thenReturn(vmCpuStatDAO); ApplicationContext.getInstance().setDAOFactory(daoFactory); VmMemoryStat.Space space1_1_1 = newSpace("space1", 123456, 12345, 1, 0); VmMemoryStat.Space space1_1_2 = newSpace("space2", 123456, 12345, 1, 0); List<VmMemoryStat.Space> spaces1_1 = Arrays.asList(space1_1_1, space1_1_2); VmMemoryStat.Generation gen1_1 = newGeneration("gen1", "col1", 123456, 12345, spaces1_1); VmMemoryStat.Space space1_2_1 = newSpace("space3", 123456, 12345, 1, 0); VmMemoryStat.Space space1_2_2 = newSpace("space4", 123456, 12345, 1, 0); List<VmMemoryStat.Space> spaces1_2 = Arrays.asList(space1_2_1, space1_2_2); VmMemoryStat.Generation gen1_2 = newGeneration("gen2", "col1", 123456, 12345, spaces1_2); List<VmMemoryStat.Generation> gens1 = Arrays.asList(gen1_1, gen1_2); VmMemoryStat memStat1 = new VmMemoryStat(1, vmId, gens1); VmMemoryStat.Space space2_1_1 = newSpace("space1", 123456, 12345, 2, 0); VmMemoryStat.Space space2_1_2 = newSpace("space2", 123456, 12345, 2, 0); List<VmMemoryStat.Space> spaces2_1 = Arrays.asList(space2_1_1, space2_1_2); VmMemoryStat.Generation gen2_1 = newGeneration("gen1", "col1", 123456, 12345, spaces2_1); VmMemoryStat.Space space2_2_1 = newSpace("space3", 123456, 12345, 3, 0); VmMemoryStat.Space space2_2_2 = newSpace("space4", 123456, 12345, 4, 0); List<VmMemoryStat.Space> spaces2_2 = Arrays.asList(space2_2_1, space2_2_2); VmMemoryStat.Generation gen2_2 = newGeneration("gen2", "col1", 123456, 12345, spaces2_2); List<VmMemoryStat.Generation> gens2 = Arrays.asList(gen2_1, gen2_2); VmMemoryStat memStat2 = new VmMemoryStat(2, vmId, gens2); VmMemoryStat.Space space3_1_1 = newSpace("space1", 123456, 12345, 4, 0); VmMemoryStat.Space space3_1_2 = newSpace("space2", 123456, 12345, 5, 0); List<VmMemoryStat.Space> spaces3_1 = Arrays.asList(space3_1_1, space3_1_2); VmMemoryStat.Generation gen3_1 = newGeneration("gen1", "col1", 123456, 12345, spaces3_1); VmMemoryStat.Space space3_2_1 = newSpace("space3", 123456, 12345, 6, 0); VmMemoryStat.Space space3_2_2 = newSpace("space4", 123456, 12345, 7, 0); List<VmMemoryStat.Space> spaces3_2 = Arrays.asList(space3_2_1, space3_2_2); VmMemoryStat.Generation gen3_2 = newGeneration("gen2", "col1", 123456, 12345, spaces3_2); List<VmMemoryStat.Generation> gens3 = Arrays.asList(gen3_1, gen3_2); VmMemoryStat memStat3 = new VmMemoryStat(3, vmId, gens3); VmMemoryStat.Space space4_1_1 = newSpace("space1", 123456, 12345, 8, 0); VmMemoryStat.Space space4_1_2 = newSpace("space2", 123456, 12345, 9, 0); List<VmMemoryStat.Space> spaces4_1 = Arrays.asList(space4_1_1, space4_1_2); VmMemoryStat.Generation gen4_1 = newGeneration("gen4", "col1", 123456, 12345, spaces4_1); VmMemoryStat.Space space4_2_1 = newSpace("space3", 123456, 12345, 10, 0); VmMemoryStat.Space space4_2_2 = newSpace("space4", 123456, 12345, 11, 0); List<VmMemoryStat.Space> spaces4_2 = Arrays.asList(space4_2_1, space4_2_2); VmMemoryStat.Generation gen4_2 = newGeneration("gen4", "col1", 123456, 12345, spaces4_2); List<VmMemoryStat.Generation> gens4 = Arrays.asList(gen4_1, gen4_2); VmMemoryStat memStat4 = new VmMemoryStat(4, vmId, gens4); vmMemoryStatDAO = mock(VmMemoryStatDAO.class); when(vmMemoryStatDAO.getLatestVmMemoryStats(vm, Long.MIN_VALUE)) .thenReturn(Arrays.asList(memStat1, memStat2, memStat3)); when(vmMemoryStatDAO.getLatestVmMemoryStats(vm, memStat3.getTimeStamp())).thenReturn(Arrays.asList(memStat4)); when(daoFactory.getVmMemoryStatDAO()).thenReturn(vmMemoryStatDAO); } private Space newSpace(String name, long maxCapacity, long capacity, long used, int index) { VmMemoryStat.Space space = new VmMemoryStat.Space(); space.name = name; space.maxCapacity = maxCapacity; space.capacity = capacity; space.used = used; space.index = index; return space; } private Generation newGeneration(String name, String collector, long maxCapacity, long capacity, List<Space> spaces) { VmMemoryStat.Generation gen = new VmMemoryStat.Generation(); gen.name = name; gen.collector = collector; gen.maxCapacity = capacity; gen.spaces = spaces; return gen; } @Test public void testBasicCPUMemory() throws CommandException { SimpleArguments args = new SimpleArguments(); args.addArgument("vmId", "234"); args.addArgument("hostId", "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "TIME %CPU MEM.space1 MEM.space2 MEM.space3 MEM.space4\n" + "12:00:00 AM 1 B 1 B 1 B 1 B\n" + "12:00:00 AM 65.0 2 B 2 B 3 B 4 B\n" + "12:00:00 AM 70.0 4 B 5 B 6 B 7 B\n"; assertEquals(expected, cmdCtxFactory.getOutput()); } @Test public void testContinuousMode() throws CommandException { Thread t = new Thread() { public void run() { SimpleArguments args = new SimpleArguments(); args.addArgument("vmId", "234"); args.addArgument("hostId", "123"); args.addArgument("continuous", "true"); try { cmd.run(cmdCtxFactory.createContext(args)); } catch (CommandException e) { // TODO Auto-generated catch block e.printStackTrace(); } } }; t.start(); try { Thread.sleep(200); } catch (InterruptedException e) { return; } assertTrue(timerFactory.isActive()); String expected = "TIME %CPU MEM.space1 MEM.space2 MEM.space3 MEM.space4\n" + "12:00:00 AM 1 B 1 B 1 B 1 B\n" + "12:00:00 AM 65.0 2 B 2 B 3 B 4 B\n" + "12:00:00 AM 70.0 4 B 5 B 6 B 7 B\n"; assertEquals(expected, cmdCtxFactory.getOutput()); assertEquals(1, timerFactory.getDelay()); assertEquals(1, timerFactory.getInitialDelay()); assertEquals(TimeUnit.SECONDS, timerFactory.getTimeUnit()); assertEquals(Timer.SchedulingType.FIXED_RATE, timerFactory.getSchedulingType()); timerFactory.getAction().run(); expected = "TIME %CPU MEM.space1 MEM.space2 MEM.space3 MEM.space4\n" + "12:00:00 AM 1 B 1 B 1 B 1 B\n" + "12:00:00 AM 65.0 2 B 2 B 3 B 4 B\n" + "12:00:00 AM 70.0 4 B 5 B 6 B 7 B\n" + "12:00:00 AM 70.0 8 B 9 B 10 B 11 B\n"; assertEquals(expected, cmdCtxFactory.getOutput()); cmdCtxFactory.setInput(" "); try { Thread.sleep(200); } catch (InterruptedException e) { return; } assertFalse(timerFactory.isActive()); } @Test public void testName() { assertEquals("vm-stat", cmd.getName()); } @Test public void testDescription() { assertEquals("show various statistics about a VM", cmd.getDescription()); } @Test public void testUsage() { assertEquals("show various statistics about a VM", cmd.getUsage()); } @Test public void testAcceptedArguments() { Collection<ArgumentSpec> args = cmd.getAcceptedArguments(); assertNotNull(args); assertEquals(3, args.size()); assertTrue(args.contains(new SimpleArgumentSpec("vmId", "the ID of the VM to monitor", true, true))); assertTrue(args.contains(new SimpleArgumentSpec("hostId", "the ID of the host to monitor", true, true))); assertTrue(args.contains(new SimpleArgumentSpec("continuous", "c", "print data continuously", false, false))); } @Test public void testStorageRequired() { assertTrue(cmd.isStorageRequired()); } }