Skip to content

Дмитрий Корытько / hware

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 7d75e9a9 7d75e9a9a6148414f0fb8dd80dc7e3d8bf9be2ff by root
Options

save

1 parent c1e87c75
Inline Side-by-side
Showing 47 changed files with 431 additions and 137 deletions
......@@ -123,7 +123,6 @@
</dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
......@@ -136,7 +135,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.16</version>
<version>1.19</version>
</dependency>
<dependency>
......@@ -175,17 +174,12 @@
</repository>
<repository>
<repository>
<id>project.local</id>
<name>project</name>
<url>file:/root/git/hardwareconfig/DevTools/repo</url>
</repository>
<repository>
<id>org.repo.jfrog.artifactory.libs-releases</id>
<name>Repository1</name>
......@@ -196,8 +190,6 @@
</repository>
<repository>
<id>com.gradle.artifactoryonline.gradle.libs</id>
<name>Repository2</name>
......
68bbcceb162642ef73ba7cbc1a566298
\ No newline at end of file
f25a2cb290554b0386fd490cfe37e70efd2fee19
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.17</version>
</project>
58bd90bbafd0f760fd1b3431a441254a
\ No newline at end of file
12681302bf7ad714b51559323a7c329f8a144762
\ No newline at end of file
a5031e7fae238946730cb327db61a6dd
\ No newline at end of file
1a36b59b9e38024990e1d254a880565e6b58f89c
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.18</version>
</project>
4fc7dbffb85bff4447fadeef1c278d3c
\ No newline at end of file
acca07e8810ca848c73079faa0391b90cd57a42c
\ No newline at end of file
f73db6aa09b61179237636fe50579b09
\ No newline at end of file
1fa268fb3c9205c4a7dae4b90c7a91764d7aeb71
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.19</version>
</project>
27ce43deaf1b550eb735a663bdf8d213
\ No newline at end of file
a8dc0d60d637a828a75edc0d1e980098d9cedc69
\ No newline at end of file
......@@ -3,7 +3,7 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.16</release>
<release>1.19</release>
<versions>
<version>1.0</version>
<version>1.1</version>
......@@ -22,7 +22,10 @@
<version>1.14</version>
<version>1.15</version>
<version>1.16</version>
<version>1.17</version>
<version>1.18</version>
<version>1.19</version>
</versions>
<lastUpdated>20150803074609</lastUpdated>
<lastUpdated>20150803150448</lastUpdated>
</versioning>
</metadata>
......
9fa98839bb65299a3438bf0ffc3b165b
\ No newline at end of file
d34ae0920d262ed8a7e7789704f6bd3f
\ No newline at end of file
......
3c3be89a42621a3776013729d2f02ed02873b834
\ No newline at end of file
8b381d539ac70fc11e401d627b0d6ff9d263d66d
\ No newline at end of file
......
......@@ -64,6 +64,15 @@ public class EthController {
public @ResponseBody MsgResult update(@RequestBody EthBean m) {
return Msg.getMsgResultByCode(EthService.INSTANCE.Upd(m));
}
@RequestMapping(value="eth/reload" , method = RequestMethod.POST)
public @ResponseBody MsgResult reload(@RequestBody EthBean m) {
return Msg.getMsgResultByCode(EthService.INSTANCE.Reload(m));
}
}
......
package org.emercit.devtools.app;
import java.util.Locale;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.*;
import javax.servlet.ServletContext;
import java.io.*;
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Vector;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
import org.emercit.devtools.service.GSMService;
@Controller
@RequestMapping("api")
public class GsmModemController {
@RequestMapping(value = "gsm", method = RequestMethod.GET)
public @ResponseBody GSMBean getGSM() {
return GSMService.INSTANCE.getGsm();
}
@RequestMapping(value="gsm/update" , method = RequestMethod.POST)
public @ResponseBody MsgResult update(@RequestBody GSMBean m) {
return Msg.getMsgResultByCode(GSMService.INSTANCE.Update(m));
}
}
......
......@@ -31,7 +31,6 @@ public enum DevControlService {
public DateInfo getDateInfo() {
DateInfo dateinfo=new DateInfo();
dateinfo.setNtp(ntplinux.getUseNtpServer());
Calendar calendar = Calendar.getInstance();
......@@ -40,7 +39,6 @@ public enum DevControlService {
TimeZone timeZone = calendar.getTimeZone();
Date date=calendar.getTime();
dateinfo.setDt(new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(new Date()));
......
......@@ -38,6 +38,10 @@ public enum EthService {
public int Upd(EthBean m) {
return ethlinux.Update(m);
}
public int Reload(EthBean m) {
return ethlinux.reload(m.getName());
}
}
......
......@@ -11,9 +11,11 @@ import org.emercit.svmanager.model.SvBean;
import java.util.Vector;
import org.emercit.pckutils.checkservice.STService;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.Paths;
import org.apache.log4j.Logger;
import org.emercit.pckutils.checkservice.STService;
public enum SvService {
......@@ -42,10 +44,8 @@ public enum SvService {
public Vector<SvBean> getSvBeans() {
svbeans=sv.get();
for (SvBean s:svbeans) { // проверяем запущен или остановлен
try {
boolean status=st.IsRun(s.getProcess());
......@@ -55,18 +55,12 @@ public enum SvService {
}
try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) {};
}
return svbeans;
}
/*
*
*/
public int Update(SvBean bean) {
svbeans=sv.get();
......@@ -80,20 +74,31 @@ public enum SvService {
return sv.set(svbeans);
}
public int Start(SvBean svbean) {
svcontrol=new SvControl(svbean);
return svcontrol.start();
}
public int Start(SvBean svbean) {
try {
if (!st.IsRun(svbean.getProcess())) {
svcontrol=new SvControl(svbean);
return svcontrol.start();
}else {
return Msg.ProcessIsRunnig.getCode();
}
} catch(Exception e) {
log.error(e.getMessage());
return Msg.ProcessRestartError.getCode();
}
}
public int Stop(SvBean svbean) {
svcontrol=new SvControl(svbean);
return svcontrol.stop();
}
public int Restart(SvBean svbean) {
svcontrol=new SvControl(svbean);
return svcontrol.restart();
}
}
\ No newline at end of file
......
......@@ -20,7 +20,6 @@ public enum UtilsService {
Vector<String> result=cmdexec.Run("ping -c 7 "+host);
return result;
}catch(Exception e) {
return new Vector<String>();
......
......@@ -82,6 +82,8 @@
background:url(img/button-white.png) 20px no-repeat !important;
}
.fieladtime {
background-image:none;
......
......@@ -17,7 +17,7 @@ Ext.define('App.store.Sv', {
api: {
read: 'api/sv/all',
create : 'null',
update : 'null',
update : 'api/sv/update',
destroy : 'null'
},
actionMethods :
......
......@@ -8,9 +8,9 @@ function renderercell(value, metaData, record, row, col, store, gridView) {
function rendererstatusimg(value, metaData, record, rowIndex, colIndex, store) {
if(value) {
// return '<div style="font-size: 14px; color:#3892d3; text-align:center;">'+'Запущен'+'</div>';
return '<span><img src="resources/img/button-green.png" height="18" width="18"/> </span>';
return '<span><img src="resources/img/up.png" height="18" width="18"/> </span>';
}else {
return '<div style="font-size: 14px; color:#3892d3; text-align:center;">'+'Остановлен'+'</div>';
return '<span><img src="resources/img/down.png" height="18" width="18"/> </span>';
}
}
......@@ -118,6 +118,9 @@ Ext.define('App.view.Sv', {
grid.unmask();
grid.store.load();
grid.getView().refresh();
var result = Ext.JSON.decode(response.responseText);
......@@ -134,20 +137,76 @@ Ext.define('App.view.Sv', {
icon: 'resources/img/stop.png',
tooltip: 'Остановить',
handler: function(grid, rowIndex, colIndex) {
var rec = grid.getStore().getAt(rowIndex);
console.log(rec);
//alert("Terminate " + rec.get('firstname'));
var rec = grid.getStore().getAt(rowIndex);
var data=Ext.util.JSON.encode(rec.data);
grid.mask("Остановка...");
Ext.Ajax.request({
method: "POST",
url: 'api/sv/stop',
timeout: 60000,
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
params:data,
success: function(response, opts) {
grid.unmask();
grid.store.load();
grid.getView().refresh();
var result = Ext.JSON.decode(response.responseText);
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
grid.unmask();
Ext.Msg.alert('Failure', 'Ошибка соединения');
}
});
}
},
{
icon: 'resources/img/replay.png',
tooltip: 'Перезапустить',
handler: function(grid, rowIndex, colIndex) {
var rec = grid.getStore().getAt(rowIndex);
console.log(rec);
var rec = grid.getStore().getAt(rowIndex);
var data=Ext.util.JSON.encode(rec.data);
grid.mask("Перезапуск...");
Ext.Ajax.request({
method: "POST",
url: 'api/sv/restart',
timeout: 60000,
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
params:data,
success: function(response, opts) {
grid.unmask();
grid.store.load();
grid.getView().refresh();
var result = Ext.JSON.decode(response.responseText);
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
grid.unmask();
Ext.Msg.alert('Failure', 'Ошибка соединения');
}
});
}
}
......
......@@ -61,7 +61,7 @@ private static final long serialVersionUID = 1L;
}
public boolean getDhcp() {
return this.dhcp;
return dhcp;
}
public void setDhcp(boolean value) {
......
......@@ -36,6 +36,28 @@ public class EthLinux implements IEth {
return (Vector<EthBean>)db.select();
}
public int reload(String name) {
try {
Vector<String> buff=cmdexec.Run("ifdown "+name);
Thread.sleep(5000);
buff=cmdexec.Run("ifup "+name);
Thread.sleep(5000);
Msg msg=Msg.RestartEthSucc;
log.info(msg.getDescription());
return msg.getCode();
}catch(Exception e) {
log.error(e.getMessage());
return Msg.RestartEthErr.getCode();
}
}
/*
* Список интерфейсов Ethernet на данном устройстве
* @see org.emercit.ethmanager.service.IEth#getListEth()
......@@ -87,11 +109,11 @@ public class EthLinux implements IEth {
String addr=cmdexec.Run("ifconfig"+" "+eb.getName()+" "+"| grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'").firstElement();
String mask=cmdexec.Run("ifconfig"+" "+eb.getName()+" "+"| grep 'inet addr:' | cut -d: -f4 | awk '{ print $1}'").firstElement();
String gateway=cmdexec.Run("/sbin/route -n | grep 'UG' | awk '{print $2}'").firstElement();
//String gateway=cmdexec.Run("/sbin/route -n | grep 'UG' | awk '{print $2}'").firstElement();
eb.setIp(addr);
eb.setNetmask(mask);
eb.setGateway(gateway);
eb.setGateway("");
}
return eb;
......@@ -146,12 +168,10 @@ public class EthLinux implements IEth {
bw.write("\n");
bw.write("\n");
int id=0;
for (EthBean eb:ebs) {
eb.setId(id);
if (!eb.getDhcp()) {
bw.write("auto "+eb.getName());
......@@ -175,7 +195,7 @@ public class EthLinux implements IEth {
bw.write("\n");
bw.write("\n");
id++;
}
bw.close();
......@@ -191,7 +211,7 @@ public class EthLinux implements IEth {
public int setDefaults() {
ebs=(Vector<EthBean>)db.select();
ebs=new Vector<EthBean>();
Vector<String> v=new Vector<String>();
v.add("");
......@@ -202,7 +222,7 @@ public class EthLinux implements IEth {
//Eth0
NewEb.setName(DefSettings.Eth0_name);
NewEb.setBroadcast(DefSettings.Eth0_broadcast);
NewEb.setDhcp(DefSettings.Eth1_dhcp);
NewEb.setDhcp(DefSettings.Eth0_dhcp);
NewEb.setIp(DefSettings.Eth0_ip);
NewEb.setNetmask(DefSettings.Eth0_netmask);
NewEb.setGateway(DefSettings.Eth0_gateway);
......@@ -212,19 +232,21 @@ public class EthLinux implements IEth {
ebs.add(NewEb);
//Eth1
NewEb=new EthBean();
/*
EthBean NewEb1=new EthBean();
NewEb.setName(DefSettings.Eth1_name);
NewEb.setDhcp(DefSettings.Eth1_dhcp);
NewEb.setIp(DefSettings.Eth1_ip);
NewEb.setNetmask(DefSettings.Eth1_netmask);
NewEb.setGateway(DefSettings.Eth1_gateway);
NewEb.setBroadcast(DefSettings.Eth1_broadcast);
NewEb.setMac(DefSettings.Eth1_mac);
NewEb.setId(DefSettings.Eth1_id);
NewEb.setInfo(v);
NewEb1.setName(DefSettings.Eth1_name);
NewEb1.setDhcp(DefSettings.Eth1_dhcp);
NewEb1.setIp(DefSettings.Eth1_ip);
NewEb1.setNetmask(DefSettings.Eth1_netmask);
NewEb1.setGateway(DefSettings.Eth1_gateway);
NewEb1.setBroadcast(DefSettings.Eth1_broadcast);
NewEb1.setMac(DefSettings.Eth1_mac);
NewEb1.setId(DefSettings.Eth1_id);
NewEb1.setInfo(v);
ebs.add(NewEb);
ebs.add(NewEb1);
*/
}
return Config(ebs);
......
......@@ -11,5 +11,7 @@ public interface IEth {
public int Update(EthBean m);
public EthBean getEthByName(String name);
public Vector<String> getListEth();
public int reload(String name);
}
......
......@@ -34,7 +34,7 @@ public class Servers implements IServers {
Vector<ServerBean> beans=new Vector<ServerBean>();
ServerBean rsb=new ServerBean();
ServerBean rsb=new ServerBean();
rsb.setId(DefSettings.Server_id);
rsb.setIp(DefSettings.Server_ip);
......
......@@ -23,7 +23,6 @@ private static final long serialVersionUID = 1L;
}
public int getId() {
return this.id;
}
......
......@@ -49,7 +49,7 @@ public class Sv {
svbeans.add(svbean);
int res=set(svbeans);
for (SvBean sv:svbeans ) {
svcontrol=new SvControl(sv);
......
......@@ -27,18 +27,20 @@ public class SvControl implements ISvControl {
public SvControl(SvBean svbean) {
this.svbean=svbean;
}
/*
* Остановка процесса
* @see org.emercit.svmanager.service.ISvControl#stop()
*/
public int stop() {
try {
cmdLog.print(cmdexec.Run(Paths.dirInit_d+" "+this.svbean.getProcess()+" "+"stop"));
cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"stop"));
Thread.sleep(this.svbean.getStoptime());
if(st.IsRun(this.svbean.getProcess())) { //если еще запущен
log.error(Msg.ProcessStopError.getDescription());
return Msg.ProcessStopError.getCode();
}
......@@ -50,7 +52,6 @@ public class SvControl implements ISvControl {
return Msg.ProcessStopSucc.getCode();
}
/*
* Запуск процесса
* @see org.emercit.svmanager.service.ISvControl#start()
......@@ -59,8 +60,6 @@ public class SvControl implements ISvControl {
try {
System.out.println(Paths.dirInit_d+this.svbean.getProcess()+" "+"start");
cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"start"));
Thread.sleep(this.svbean.getStarttime());
......@@ -86,14 +85,15 @@ public class SvControl implements ISvControl {
*/
public int restart() {
try {
cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"restart"));
typeCode =Msg.getByCode(stop()).getTypeVariable().getCode();
if (typeCode==0) { // Нет ошибки
typeCode=Msg.getByCode(start()).getTypeVariable().getCode();
if (typeCode==0) {
log.info(Msg.ProcessRestartSucc.getDescription());
......@@ -109,7 +109,6 @@ public class SvControl implements ISvControl {
}catch(Exception e) {
log.error(e.getMessage());
}
return Msg.ProcessRestartError.getCode();
}
......@@ -119,7 +118,7 @@ public class SvControl implements ISvControl {
*/
public int addAutoRun() {
try {
cmdLog.print(cmdexec.Run("update-rc.d "+this.svbean.getProcess()+" default"));
cmdLog.print(cmdexec.Run("update-rc.d "+this.svbean.getProcess()+" defaults"));
}catch(Exception e) {
return Msg.ProcessAddAutoRunError.getCode();
};
......
package org.emercit.utilstools;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.svmanager.model.SvBean;
import org.emercit.svmanager.service.SvControl;
import org.emercit.svmanager.service.Sv;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.ethmanager.service.EthLinux;
import java.util.Vector;
import org.apache.log4j.Logger;
public class App
{
private static final Logger log = Logger.getLogger(App.class);
private static EthLinux ethlinux=new EthLinux();
public static void main( String[] args )
{
System.out.println("");;
Vector<EthBean> neans=ethlinux.getEthBeans();
EthBean bb=ethlinux.getEthByName("eth0");
System.out.println("");
}
}
......
......@@ -27,10 +27,10 @@ public class DefSettings {
public static final int Eth1_id=1;
public static final String Eth1_name="eth1";
public static final String Eth1_mac="";
public static final boolean Eth1_dhcp=true;
public static final String Eth1_ip="";
public static final String Eth1_netmask="";
public static final String Eth1_gateway="";
public static final boolean Eth1_dhcp=false;
public static final String Eth1_ip="192.168.99.1";
public static final String Eth1_netmask="255.255.255.0";
public static final String Eth1_gateway="192.168.99.2";
public static final String Eth1_broadcast="";
public static final String Eth1_extinfo="";
//GSM
......@@ -83,5 +83,4 @@ public class DefSettings {
public static final String devtools_title="Web интерфейс для конфигурации";
}
......
......@@ -28,15 +28,22 @@ public enum Msg {
ProcessStartSucc(13,TypeMsg.INFO,"Процесс успешно запущен"),
ProcessStartError(14,TypeMsg.ERROR,"Ошибка запуска процесса"),
ProcessRestartSucc(15,TypeMsg.INFO,"Выполнена перезагрузка процесса"),
ProcessRestartError(16,TypeMsg.ERROR,"Ошибка при перезагрузки процесса"),
ProcessAddAutoRunSucc(17,TypeMsg.INFO,"Процесс успешно добалвен в автозагрузку"),
ProcessDelAutoRunSucc(18,TypeMsg.INFO,"Процесс удален из автозагрузки"),
ProcessAddAutoRunError(19,TypeMsg.INFO,"Ошибка при добавлении процесса в автозагрузку"),
ProcessDelAutoRunError(20,TypeMsg.INFO,"Ошибка при удалении процесса из автозагрузки");
ProcessAddAutoRunError(19,TypeMsg.ERROR,"Ошибка при добавлении процесса в автозагрузку"),
ProcessDelAutoRunError(20,TypeMsg.ERROR,"Ошибка при удалении процесса из автозагрузки"),
ProcessIsRunnig(21,TypeMsg.INFO,"Процесс выполняется"),
RestartEthSucc(22,TypeMsg.INFO,"Перезагрузка сетевого интерфейса успешно выполнена"),
RestartEthErr(23,TypeMsg.ERROR,"Перезагрузка сетевого интерфейса не выполнена");
private int code;
......
......@@ -20,7 +20,7 @@ public class Paths {
public static final String FINDPROCESS_SCRIPT=dirScripts+"findprocess.sh";
//PROCESS
public static final String JETTY="strt";
public static final String JETTY="jetty";
public static final String CTRLPNL="ctrlpnl";
public static final String UTILSTOOLS_LOGFILE="/var/log/devtools.log";
......
package org.emercit.utilstools;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.emercit.pckutils.checkservice.STService;
public class TestCheckProccess extends TestCase {
private STService stservice=new STService();
@Ignore
@Before
public void testCheck() {
try {
// assertTrue(stservice.IsRun("jetty"));
}
catch(Exception e) {
// fail("Тест завален");
}
assertTrue( true );
//assertFalse(!stservice.IsRun("start.jar")); // Если true - то тест завален
// assertEquals(stservice.IsRun("start.jar")); // Если не равны - тест завален
// assertNotNull(stservice.IsRun("start.jar"))); // Если null - тест завален
//assertNull(stservice.IsRun("start.jar"))); // Если не null - тест завален
//assertNotSame(stservice.IsRun("start.jar")); // Если оба объекта являются одинаковыми(не одно и то же, что равны) - тест завален
//assertSame(stservice.IsRun("start.jar")); // Если оба объекта не являются одинаковыми - тест завален
}
}
\ No newline at end of file
package org.emercit.utilstools;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import static org.junit.Assert.*;
import java.util.Vector;
import org.emercit.utilstools.config.Msg;
import org.junit.Before;
import org.junit.After;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.ethmanager.service.EthLinux;
public class TestEthLinux extends TestCase {
private EthBean bean;
private Vector<EthBean> beans;
private EthLinux ethlinux;
private int value;
private Msg msg;
public TestEthLinux( String testName )
{
super( testName );
}
public static Test suite()
{
return new TestSuite( TestEthLinux.class );
}
@Before
public void upEthLinux()
{
}
@After
public void downEthLinux()
{
}
/*
* Установка и сбро сетевых настроек
*/
public void testEthLinux()
{
ethlinux=new EthLinux();
assertNotNull(ethlinux);
// INIT
int value=ethlinux.setDefaults();
msg=Msg.getByCode(value);
if (msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
beans=ethlinux.getEthBeans();
assertNotNull(beans);
bean=beans.firstElement();
assertNotNull(bean);
value=ethlinux.reload(bean.getName());
msg=Msg.getByCode(value);
if (msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
bean.setIp("192.168.99.1");
value=ethlinux.Update(bean);
msg=Msg.getByCode(value);
if (msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
assertTrue( true );
}
}
//assertFalse(!stservice.IsRun("start.jar")); // Если true - то тест завален
// assertEquals(stservice.IsRun("start.jar")); // Если не равны - тест завален
// assertNotNull(stservice.IsRun("start.jar"))); // Если null - тест завален
//assertNull(stservice.IsRun("start.jar"))); // Если не null - тест завален
//assertNotSame(stservice.IsRun("start.jar")); // Если оба объекта являются одинаковыми(не одно и то же, что равны) - тест завален
//assertSame(stservice.IsRun("start.jar")); // Если оба объекта не являются одинаковыми - тест завален
package org.emercit.utilstools;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
......@@ -11,6 +10,7 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.emercit.svmanager.service.SvControl;
import org.emercit.svmanager.service.Sv;
import org.emercit.svmanager.model.SvBean;
......@@ -19,6 +19,7 @@ import java.util.Vector;
import org.emercit.utilstools.config.Msg;
@Ignore
public class TestSvControl extends TestCase {
private Sv sv;
......@@ -36,6 +37,7 @@ public class TestSvControl extends TestCase {
}
public static Test suite()
{
return new TestSuite( TestSvControl.class );
......@@ -44,8 +46,10 @@ public class TestSvControl extends TestCase {
/*
* Тестирование управления процессами
*/
@Ignore
public void testSvControl()
{
sv=new Sv();
svbeans=sv.get();
......@@ -54,22 +58,39 @@ public class TestSvControl extends TestCase {
for (SvBean svbean:svbeans) {
svcontrol=new SvControl(svbean);
//START
Msg msg=Msg.getByCode(svcontrol.start());
if(msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
//RESTART
msg=Msg.getByCode(svcontrol.restart());
if(msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
//STOP
msg=Msg.getByCode(svcontrol.stop());
if(msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
msg=Msg.getByCode(svcontrol.addAutoRun());
if(msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
msg=Msg.getByCode(svcontrol.delAutoRun());
if(msg.getTypeVariable().getCode()==1) {
fail("Тест завален");
}
}
assertTrue( true );
}
......