diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2020-02-04 11:30:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-04 11:30:21 +0000 |
| commit | ce9d4e748b56fab270f9a697e6705dc410650bd9 (patch) | |
| tree | de692f19541f1f7aae281968665a4f4d793d6e34 /vid-app-common/src/main/java/org | |
| parent | 0814238f615f3e3b855a53add72730b957f6c790 (diff) | |
| parent | c3b17e4c5b7a42dc9d2727520f45e846be443555 (diff) | |
Merge "regression unit test for getServicesByOwningEntityId"
Diffstat (limited to 'vid-app-common/src/main/java/org')
3 files changed, 4 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java index be77e2bc0..1baca9ffa 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java @@ -143,7 +143,7 @@ public class AaiClient implements AaiClientInterface { } @Override - public AaiResponse getServicesByOwningEntityId(List<String> owningEntityIds){ + public AaiResponse<OwningEntityResponse> getServicesByOwningEntityId(List<String> owningEntityIds){ Response resp = doAaiGet(getUrlFromLIst("business/owning-entities?", "owning-entity-id=", owningEntityIds), false); return processAaiResponse(resp, OwningEntityResponse.class, null); } diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java index 5b36828c6..b39b80943 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java @@ -29,6 +29,7 @@ import org.onap.vid.aai.model.AaiGetOperationalEnvironments.OperationalEnvironme import org.onap.vid.aai.model.AaiGetPnfs.Pnf; import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse; import org.onap.vid.aai.model.ModelVer; +import org.onap.vid.aai.model.OwningEntityResponse; import org.onap.vid.aai.model.PortDetailsTranslator; import org.onap.vid.aai.model.Properties; import org.onap.vid.aai.model.ResourceType; @@ -53,7 +54,7 @@ public interface AaiClientInterface extends ProbeInterface { AaiResponse getServices(); - AaiResponse getServicesByOwningEntityId(List<String> owningEntityIds); + AaiResponse<OwningEntityResponse> getServicesByOwningEntityId(List<String> owningEntityIds); AaiResponse<GetTenantsResponse[]> getTenants(String globalCustomerId, String serviceType); diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java index 9db8233a7..a992519cf 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java @@ -173,7 +173,7 @@ public class AaiServiceImpl implements AaiService { } } - private List<ServiceInstanceSearchResult> getServicesByOwningEntityId(List<String> owningEntities, RoleValidator roleValidator) { + List<ServiceInstanceSearchResult> getServicesByOwningEntityId(List<String> owningEntities, RoleValidator roleValidator) { AaiResponse<OwningEntityResponse> owningEntityResponse = aaiClient.getServicesByOwningEntityId(owningEntities); List<ServiceInstanceSearchResult> serviceInstanceSearchResultList = new ArrayList<>(); if (owningEntityResponse.getT() != null) { |