Added Blueprint configuration

Changes made:
1. Removed Spring DM configuration for resource-assignment
2. Added blueprint configuration for resource-assignment

Change-Id: Ib084b863a6a5ee1283ba3dfb7b61d61619a27c38
Issue-ID: CCSDK-102
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>

2 files changed, 14 insertions, 7 deletions

diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java
index b0345157c..e0f201230 100644..100755
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ * 						reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,9 +48,8 @@ import org.apache.commons.lang.StringUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
+import org.junit.Test;
 import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
 import org.onap.ccsdk.sli.adaptors.aai.AAIClient;
 import org.onap.ccsdk.sli.adaptors.aai.AAIDeclarations;
 import org.onap.ccsdk.sli.adaptors.aai.AAIRequest;
@@ -58,6 +57,8 @@ import org.onap.ccsdk.sli.adaptors.aai.AAIService;
 import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v11.GenericVnf;
 import org.openecomp.aai.inventory.v11.InventoryResponseItems;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,7 +80,7 @@ public class R1607AutoGeneratedTest {
 	public static void setUp() throws Exception {
 //		super.setUp();
 		URL url = AAIService.class.getResource(AAIService.AAICLIENT_PROPERTIES);
-		client = new AAIService(url);
+//		client = new AAIService(url);
 		LOG.info("\nTaicAAIResourceTest.setUp\n");
 	}
 
@@ -476,7 +477,8 @@ public class R1607AutoGeneratedTest {
 		}
 	}
 
-static class MySchemaOutputResolver extends SchemaOutputResolver {
+
+	static class MySchemaOutputResolver extends SchemaOutputResolver {
 
 	    public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
 	        File file = new File(suggestedFileName);
diff --git a/aai-service/provider/src/test/resources/aaiclient.properties b/aai-service/provider/src/test/resources/aaiclient.properties
index e615fc124..c09be3a4b 100755
--- a/aai-service/provider/src/test/resources/aaiclient.properties
+++ b/aai-service/provider/src/test/resources/aaiclient.properties
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-# 			reserved.
+# 						reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,8 +40,13 @@ org.onap.ccsdk.sli.adaptors.aai.application=CCSDK
 #
 # Configuration file for A&AI Client
 #
-#org.onap.ccsdk.sli.adaptors.aai.uri=https://localhost:8443
+#org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-ext1.test.att.com:8443
+#org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-int1.test.att.com:8443
+#org.onap.ccsdk.sli.adaptors.aai.uri=https://mtanjv9aaas40.aic.cip.att.com:8443
 org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-int2.test.att.com:8443
+#
+connection.timeout=60000
+read.timeout=60000
 
 # query
 org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v11/search/sdn-zone-query