From 815bcc529480e122c270771dc974cba3d754233e Mon Sep 17 00:00:00 2001
From: "Smokowski, Steve (ss835w)" <ss835w@us.att.com>
Date: Tue, 4 Dec 2018 15:33:20 -0500
Subject: Updated Network Logic

Added logic to get aggregate route, updated unit test, fixed bugs,
refactored select code.

Change-Id: I3269da1967ba903dd11459f76030c3fc2aad797a
Issue-ID: SO-1270
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
---
 common/pom.xml                                             | 14 +++++++-------
 .../main/java/org/onap/so/client/aai/AAIObjectType.java    |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'common')

diff --git a/common/pom.xml b/common/pom.xml
index b9fd64e04e..88722ccbcf 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -16,11 +16,11 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>		
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-aspects</artifactId>			
+			<artifactId>spring-aspects</artifactId>
 		</dependency>
 		<dependency>
             <groupId>org.springframework.boot</groupId>
@@ -29,10 +29,10 @@
 		<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>        		
+        </dependency>
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path</artifactId>			
+			<artifactId>json-path</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.onap.aai.aai-common</groupId>
 			<artifactId>aai-schema</artifactId>
-			<version>1.3.1</version>
+			<version>1.4.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>
@@ -85,7 +85,7 @@
 					<artifactId>commons-lang3</artifactId>
 				</exclusion>
 			</exclusions>
-		</dependency>		
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-ext</artifactId>
@@ -106,7 +106,7 @@
 		</dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>          
+            <artifactId>spring-security-web</artifactId>
         </dependency>
 		<dependency>
 			<groupId>org.onap.logging-analytics</groupId>
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java b/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java
index 51d09006db..f003dc0628 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java
@@ -25,6 +25,7 @@ import java.util.Map;
 
 import org.onap.aai.annotations.Metadata;
 import org.onap.aai.domain.yang.AllottedResource;
+import org.onap.aai.domain.yang.AggregateRoute;
 import org.onap.aai.domain.yang.CloudRegion;
 import org.onap.aai.domain.yang.Collection;
 import org.onap.aai.domain.yang.Complex;
@@ -113,6 +114,7 @@ public enum AAIObjectType implements GraphInventoryObjectType {
 	SP_PARTNER(AAINamespaceConstants.BUSINESS, SpPartner.class),
 	DEVICE(AAINamespaceConstants.NETWORK, Device.class),
 	EXT_AAI_NETWORK(AAINamespaceConstants.NETWORK, ExtAaiNetwork.class),
+	AGGREGATE_ROUTE(AAINamespaceConstants.NETWORK, AggregateRoute.class),
 	UNKNOWN("", "");
 
 	private final String uriTemplate;
-- 
cgit 1.2.3-korg