summaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main/java
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-09-01 16:24:41 +0300
committerEylon Malin <eylon.malin@intl.att.com>2019-09-01 16:59:37 +0300
commit03f54a0b7de599e0a012ff6d35d0e74e20ca36c2 (patch)
tree3e70969a2142fc7fe5153cab3adcc451e22b0a9f /vid-app-common/src/main/java
parente6c30425575cd76a3955b03ab389150ed74fbb1d (diff)
add getNewestModelVersionByInvariant to controller and service
Also add testGetActiveNetworkList UT Issue-ID: VID-378 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: I97c2ae029272aba915d5f9699bccff0eb9d49329 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Diffstat (limited to 'vid-app-common/src/main/java')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/AaiController2.java7
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/AaiService.java3
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java5
3 files changed, 15 insertions, 0 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController2.java b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController2.java
index d7d2f85db..e0d211c24 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController2.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController2.java
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.onap.vid.aai.AaiClientInterface;
import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
+import org.onap.vid.aai.model.ModelVer;
import org.onap.vid.aai.model.Permissions;
import org.onap.vid.model.aaiTree.Network;
import org.onap.vid.model.aaiTree.RelatedVnf;
@@ -116,4 +117,10 @@ public class AaiController2 extends VidRestrictedBaseController {
.filter(network -> StringUtils.equalsIgnoreCase(network.getOrchStatus(), "active"))
.collect(Collectors.toList());
}
+
+ @RequestMapping(value = "/aai_get_newest_model_version_by_invariant/{invariantId}",
+ method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ public ModelVer getNewestModelVersionByInvariant(@PathVariable("invariantId") String invariantId) {
+ return aaiService.getNewestModelVersionByInvariantId(invariantId);
+ }
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiService.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiService.java
index 31fbe65d8..bc26b5eb0 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/AaiService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiService.java
@@ -32,6 +32,7 @@ import org.onap.vid.aai.model.AaiGetInstanceGroupsByCloudRegion;
import org.onap.vid.aai.model.AaiGetOperationalEnvironments.OperationalEnvironmentList;
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.PortDetailsTranslator;
import org.onap.vid.asdc.beans.Service;
import org.onap.vid.model.SubscriberList;
@@ -99,4 +100,6 @@ public interface AaiService {
List<VpnBinding> getVpnListByVpnType(String vpnType);
List<Network> getL3NetworksByCloudRegion(String cloudRegionId, String tenantId, String networkRole);
+
+ ModelVer getNewestModelVersionByInvariantId(String modelInvariantId);
}
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 b50dcc3b5..b6404fa68 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
@@ -702,4 +702,9 @@ public class AaiServiceImpl implements AaiService {
return "{\"start\":\"/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId + "\"," +
"\"query\":\"query/l3-networks-by-cloud-region?tenantId=" + tenantId + networkRolePart + "\"}";
}
+
+ @Override
+ public ModelVer getNewestModelVersionByInvariantId(String modelInvariantId){
+ return aaiClient.getLatestVersionByInvariantId(modelInvariantId);
+ }
}