7 files changed, 53 insertions, 14 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
index b1486c9686..a25a140334 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
@@ -20,6 +20,9 @@
 
 package org.onap.so.apihandlerinfra;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.UUID;
@@ -72,6 +75,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -124,6 +128,9 @@ public class Onap3gppServiceInstances {
     @Autowired
     private ResponseHandler responseHandler;
 
+    @Value("${subnetCapability.config.file}")
+    private String subnetCapabilityConfigFile;
+
     /**
      * POST Requests for 3GPP Service create Instance on a version provided
      *
@@ -583,13 +590,23 @@ public class Onap3gppServiceInstances {
         }
     }
 
-    // To be implemented for fetching Subnet capabilities
     private Response getSubnetCapabilities(List<SubnetTypes> subnetTypes, String version) throws ApiException {
         ObjectMapper oMapper = new ObjectMapper();
-        InputStream inputStream = TypeReference.class.getResourceAsStream("/subnetCapability.json");
+        String inputFileString = "";
         Map<String, Object> subnetCapability = new HashMap<>();
+        BufferedReader br = null;
         try {
-            subnetCapability = oMapper.readValue(inputStream, Map.class);
+            logger.debug("Reading SubnetCapability file");
+            br = new BufferedReader(new FileReader(new File(subnetCapabilityConfigFile)));
+            StringBuilder sb = new StringBuilder();
+            String line = br.readLine();
+            while (line != null) {
+                sb.append(line);
+                sb.append("\n");
+                line = br.readLine();
+            }
+            inputFileString = sb.toString();
+            subnetCapability = oMapper.readValue(inputFileString, Map.class);
         } catch (Exception e) {
             logger.debug("Exception while reading subnet capability value from json", e);
         }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java
index 1492baf1cd..e330d2116c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java
@@ -34,6 +34,7 @@ public class AaiClientPropertiesImpl implements AAIProperties {
     private String auth;
     private String key;
     private Long readTimeout;
+    private Long connectionTimeout;
     private boolean enableCaching;
     private Long cacheMaxAge;
 
@@ -43,7 +44,8 @@ public class AaiClientPropertiesImpl implements AAIProperties {
         aaiEndpoint = context.getEnvironment().getProperty("mso.aai.endpoint");
         this.auth = context.getEnvironment().getProperty("aai.auth");
         this.key = context.getEnvironment().getProperty("mso.msoKey");
-        this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, new Long(60000));
+        this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, 60000L);
+        this.connectionTimeout = context.getEnvironment().getProperty("aai.connectionTimeout", Long.class, 60000L);
         this.enableCaching = context.getEnvironment().getProperty("aai.caching.enabled", Boolean.class, false);
         this.cacheMaxAge = context.getEnvironment().getProperty("aai.caching.maxAge", Long.class, 60000L);
     }
@@ -79,6 +81,11 @@ public class AaiClientPropertiesImpl implements AAIProperties {
     }
 
     @Override
+    public Long getConnectionTimeout() {
+        return this.connectionTimeout;
+    }
+
+    @Override
     public boolean isCachingEnabled() {
         return this.enableCaching;
     }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
index b46690f2a7..6064f73e23 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
@@ -83,3 +83,7 @@ org:
       adapters:
         network:
           encryptionKey: aa3871669d893c7fb8abbcda31b88b4f
+
+subnetCapability:
+  config:
+      file: /app/subnetCapability.json
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java
index 95f00c3a39..14a87bf915 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java
@@ -187,7 +187,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
         String request = "{\"subnetTypes\":[\"AN\"]}";
         QuerySubnetCapability subnetCapabilityRequest = MAPPER.readValue(request, QuerySubnetCapability.class);
         String expectedResponse =
-                "{\"AN\":{\"latency\":\"5\",\"maxNumberofUEs\":\"100\",\"maxThroughput\":\"150\",\"terminalDensity\":\"50\"}}";
+                "{\"AN\":{\"latency\":5,\"maxNumberofUEs\":\"100\",\"maxThroughput\":\"150\",\"terminalDensity\":\"50\"}}";
         Response response = objUnderTest.getSliceSubnetCapabilities(subnetCapabilityRequest, "v1");
         String actualResponse = (String) response.getEntity();
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/subnetCapability.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Onap3gppServiceInstancesTest/subnetCapability.json
index 0d5acef64a..55b3831502 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/subnetCapability.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Onap3gppServiceInstancesTest/subnetCapability.json
@@ -1,25 +1,31 @@
 {
   "AN": {
-    "latency": "5",
+    "latency": 5,
     "maxNumberofUEs": "100",
     "maxThroughput": "150",
     "terminalDensity": "50"
   },
   "CN": {
-    "latency": "10",
+    "latency": 10,
     "maxThroughput": "50",
     "maxNumberofConns": "100"
   },
   "TN_FH": {
-    "latency": "10",
+    "latency": 10,
     "maxThroughput": "100"
   },
   "TN_MH": {
-    "latency": "5",
+    "latency": 5,
     "maxThroughput": "50"
   },
   "TN_BH": {
-    "latency": "10",
+    "latency": 10,
     "maxThroughput": "100"
+  },
+  "AN_NF": {
+    "latency": 5,
+    "maxNumberofUEs": "100",
+    "maxThroughput": "150",
+    "terminalDensity": "50"
   }
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
index 1429ac9b52..bcd36b8643 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
@@ -140,3 +140,8 @@ org:
       adapters:
         network:
           encryptionKey: aa3871669d893c7fb8abbcda31b88b4f
+
+subnetCapability:
+  config:
+      file: src/test/resources/Onap3gppServiceInstancesTest/subnetCapability.json
+
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
index 11f2d4b2c3..e0ec216399 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
@@ -651,7 +651,7 @@ CREATE TABLE `network_resource` (
   `TOSCA_NODE_TYPE` varchar(200) DEFAULT NULL,
   `AIC_VERSION_MIN` varchar(20) NULL,
   `AIC_VERSION_MAX` varchar(20) DEFAULT NULL,
-  `ORCHESTRATION_MODE` varchar(20) DEFAULT 'HEAT',
+  `ORCHESTRATION_MODE` varchar(20) NOT NULL DEFAULT 'HEAT',
   `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `RESOURCE_CATEGORY` varchar(200) DEFAULT NULL,
   `RESOURCE_SUB_CATEGORY` varchar(200) DEFAULT NULL,
@@ -958,8 +958,8 @@ CREATE TABLE `vf_module_customization` (
   `ID` int(13) NOT NULL AUTO_INCREMENT,
   `MODEL_CUSTOMIZATION_UUID` varchar(200) NOT NULL,
   `LABEL` varchar(200) DEFAULT NULL,
-  `INITIAL_COUNT` int(11) DEFAULT '0',
-  `MIN_INSTANCES` int(11) DEFAULT '0',
+  `INITIAL_COUNT` int(11) NOT NULL DEFAULT '0',
+  `MIN_INSTANCES` int(11) NOT NULL DEFAULT '0',
   `MAX_INSTANCES` int(11) DEFAULT NULL,
   `AVAILABILITY_ZONE_COUNT` int(11) DEFAULT NULL,
   `HEAT_ENVIRONMENT_ARTIFACT_UUID` varchar(200) DEFAULT NULL,
@@ -1493,7 +1493,7 @@ CREATE TABLE IF NOT EXISTS `workflow` (
   `RESOURCE_TARGET` varchar(200) NOT NULL,
   `SOURCE` varchar(200) NOT NULL,
   `TIMEOUT_MINUTES` int(11) DEFAULT NULL,
-  `ARTIFACT_CHECKSUM` varchar(200) DEFAULT 'MANUAL RECORD',
+  `ARTIFACT_CHECKSUM` varchar(200) NULL DEFAULT 'MANUAL RECORD',
   `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`ID`),
   UNIQUE KEY `UK_workflow` (`ARTIFACT_UUID`,`NAME`,`VERSION`,`SOURCE`)