Merge branch 'master' of https://git.loafle.net/overflow/overflow_server
This commit is contained in:
commit
bc14645d0b
|
@ -95,16 +95,6 @@ public class TargetDiscoveryService {
|
||||||
|
|
||||||
this.infraHostService.regist(infraHost);
|
this.infraHostService.regist(infraHost);
|
||||||
|
|
||||||
// Infra infraByHost = Infra.CreateInfraByType(infraHost.getId(), InfraHost.class);
|
|
||||||
// this.infraDAO.save(infraByHost);
|
|
||||||
|
|
||||||
// if(host.isTarget()) {
|
|
||||||
// Target targetHost = new Target();
|
|
||||||
//// targetHost.setInfra(infraByHost);
|
|
||||||
//// targetHost.setProbe(probe);
|
|
||||||
// this.targetDAO.save(targetHost);
|
|
||||||
// }
|
|
||||||
|
|
||||||
if(host.getPorts() == null) {
|
if(host.getPorts() == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -126,9 +116,6 @@ public class TargetDiscoveryService {
|
||||||
infraOSPort.setVendor(MetaInfraVendor.CreateInfraVendorByPort(port.getPortNumber()));
|
infraOSPort.setVendor(MetaInfraVendor.CreateInfraVendorByPort(port.getPortNumber()));
|
||||||
this.infraOSPortService.regist(infraOSPort);
|
this.infraOSPortService.regist(infraOSPort);
|
||||||
|
|
||||||
// Infra infraByPort = Infra.CreateInfraByType(infraOSPort.getId(), InfraOSPort.class);
|
|
||||||
// this.infraDAO.save(infraByPort);
|
|
||||||
|
|
||||||
if(port.getServices() == null) {
|
if(port.getServices() == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -158,11 +145,6 @@ public class TargetDiscoveryService {
|
||||||
|
|
||||||
this.infraServiceService.regist(infraService);
|
this.infraServiceService.regist(infraService);
|
||||||
|
|
||||||
// Infra infraByService = Infra.CreateInfraByType(infraService.getId(), InfraService.class);
|
|
||||||
// this.infraDAO.save(infraByService);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -171,4 +153,14 @@ public class TargetDiscoveryService {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private InfraHost createAndReadHost(Host host, Probe probe) {
|
||||||
|
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user