From 289f5aea8fc8421aa5f68b246676bed985a3c08c Mon Sep 17 00:00:00 2001 From: crusader Date: Sun, 10 Jun 2018 20:34:41 +0900 Subject: [PATCH] ing --- pom.xml | 2 +- .../service/central/infra/InfraHostIPService.java | 11 ++++++++++- .../overflow/service/central/infra/InfraService.java | 7 +++++++ .../service/central/infra/InfraZoneService.java | 5 ++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3b49388..2cdd6ae 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.loafle.overflow commons-java jar - 1.0.18-SNAPSHOT + 1.0.19-SNAPSHOT com.loafle.overflow.commons-java diff --git a/src/main/java/com/loafle/overflow/service/central/infra/InfraHostIPService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraHostIPService.java index f9cc766..c907ee0 100644 --- a/src/main/java/com/loafle/overflow/service/central/infra/InfraHostIPService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraHostIPService.java @@ -1,5 +1,7 @@ package com.loafle.overflow.service.central.infra; +import java.util.List; + import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.model.infra.InfraHostIP; @@ -9,6 +11,13 @@ import com.loafle.overflow.model.infra.InfraHostIP; public interface InfraHostIPService { InfraHostIP regist(InfraHostIP infraHostIP) throws OverflowException; + InfraHostIP read(Long id) throws OverflowException; - InfraHostIP readByAddressAndMetaIPTypeKey(String address, String ipTypeKey) throws OverflowException; + + List readByInfraHostID(Long infraHostID) throws OverflowException; + + List readByInfraHostIDAndMetaIPTypeKey(Long infraHostID, String metaIPTypeKey) throws OverflowException; + + InfraHostIP readByInfraHostIDAndMetaIPTypeKeyAndAddress(Long infraHostID, String metaIPTypeKey, String address) + throws OverflowException; } diff --git a/src/main/java/com/loafle/overflow/service/central/infra/InfraService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraService.java index 96b7c9f..72bb993 100644 --- a/src/main/java/com/loafle/overflow/service/central/infra/InfraService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraService.java @@ -1,9 +1,14 @@ package com.loafle.overflow.service.central.infra; +import java.util.List; + import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.model.PageParams; +import com.loafle.overflow.model.discovery.Host; +import com.loafle.overflow.model.discovery.Service; import com.loafle.overflow.model.infra.Infra; +import com.loafle.overflow.model.infra.InfraZone; import org.springframework.data.domain.Page; @@ -24,4 +29,6 @@ public interface InfraService { @WebappAPI Page readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException; + @WebappAPI + InfraZone regist(Long probeID, List hosts, List services) throws OverflowException; } diff --git a/src/main/java/com/loafle/overflow/service/central/infra/InfraZoneService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraZoneService.java index 96045b6..35942ff 100644 --- a/src/main/java/com/loafle/overflow/service/central/infra/InfraZoneService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraZoneService.java @@ -1,5 +1,7 @@ package com.loafle.overflow.service.central.infra; +import java.util.List; + import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.model.infra.InfraZone; @@ -10,5 +12,6 @@ import com.loafle.overflow.model.infra.InfraZone; public interface InfraZoneService { InfraZone regist(InfraZone infraZone) throws OverflowException; InfraZone read(Long id) throws OverflowException; - InfraZone readAllByDomainID(Long domainID) throws OverflowException; + List readAllByProbeID(Long probeID) throws OverflowException; + List readAllByDomainID(Long domainID) throws OverflowException; }