added generic fabric support to SO

Fix Autoincrement of ID field in table
Fix accidental removal of method
Update usage of requestdb client
removed unused imports in common tasks and test
Fix broken branch, have unit tests pass
references
the Epic branch
Fix broken branch from compiling
committing classpath for vfc adapter cause its not going away
added in the fail case for when there are no profiles
removed second set of adapters in application test yml
removed double adapters in request db application test
added jpa repo dependency to the so bpmn folder pom
add creation timestamp column to the table
added in null checks for Config returned from policy
switched to string in requestprocess with jenerate
switched to string in requestprocess with jenerate
updated aai version in common pom to 605 from 591
renamed the db scripts for flyway sync to register
added endpoint to application test yml for failing test
...

Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085
Issue-ID: SO-972
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

6 files changed, 133 insertions, 16 deletions

diff --git a/common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java b/common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java
index ce90ccdc0e..ea842719e8 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java
@@ -52,4 +52,18 @@ public class AAIObjectTypeTest {
 		AAIUri aaiUri = AAIUriFactory.createResourceUri(AAIObjectType.COLLECTION, id);
 		assertEquals("/network/collections/collection/test1", aaiUri.build().toString());
 	}
+	
+	@Test
+	public void genericVnfTest() {
+		AAIObjectType type = AAIObjectType.GENERIC_VNF;
+		assertEquals("/network/generic-vnfs/generic-vnf/{vnf-id}", type.uriTemplate());
+		assertEquals("/generic-vnfs/generic-vnf/{vnf-id}", type.partialUri());
+	}
+	
+	@Test
+	public void pInterfaceTest() {
+		AAIObjectType type = AAIObjectType.P_INTERFACE;
+		assertEquals("/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}", type.uriTemplate());
+		assertEquals("/p-interfaces/p-interface/{interface-name}", type.partialUri());
+	}
 }
diff --git a/common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java b/common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java
index 1e2e7471f1..37188bc4bc 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java
@@ -44,6 +44,7 @@ public class AAIPServerTest {
 		List<Pserver> list = client.getListOfPservers(json);
 		
 		assertEquals("", list.get(0).getHostname(), "test");
+		assertEquals("", list.size(), 2);
 	}
 	
 	@Test
diff --git a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java b/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java
index efd60a36a8..3d23213ff0 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.so.client.aai;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
diff --git a/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java b/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java
index 104d40f76e..4cb9bd0e16 100644
--- a/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java
+++ b/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java
@@ -23,8 +23,12 @@ package org.onap.so.client.policy;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Matchers.any;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,16 +37,28 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.so.client.defaultproperties.PolicyRestPropertiesImpl;
+import org.onap.so.client.policy.entities.Config;
+import org.onap.so.client.policy.entities.ConfigRequestParameters;
 import org.onap.so.client.policy.entities.DictionaryData;
+import org.onap.so.client.policy.entities.PolicyConfig;
 import org.onap.so.client.policy.entities.PolicyDecision;
 import org.onap.so.client.policy.entities.PolicyServiceType;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 public class PolicyClientImplTest {
-	
+
 	@BeforeClass
 	public static void setUp() {
 		System.setProperty("mso.config.path", "src/test/resources");
 	}
+
+	private static String RESOURCE_PATH = "src/test/resources/__files/Policy/";
+
 	@Test
 	public void successReadProperties() {
 		PolicyRestClient client = new PolicyRestClient(new PolicyRestPropertiesImpl(), PolicyServiceType.GET_DECISION);
@@ -52,7 +68,7 @@ public class PolicyClientImplTest {
 		assertEquals("Found expected Authorization", "Basic dGVzdHBkcDphbHBoYTEyMw==", map.get("Authorization"));
 		assertEquals("Found expected Environment", "TEST", map.get("Environment"));
 	}
-	
+
 	@Test
 	@Ignore
 	public void getDecisionTest() {
@@ -61,10 +77,10 @@ public class PolicyClientImplTest {
 		assertEquals("Decision is correct", decision.getDecision(), "PERMIT");
 		assertEquals("Decision details is correct", decision.getDetails(), "Retry");
 	}
-	
+
 	@Test
 	@Ignore
-	public void getAllowedTreatmentsTest(){
+	public void getAllowedTreatmentsTest() {
 		PolicyClient client = new PolicyClientImpl();
 		DictionaryData dictClient = client.getAllowedTreatments("BB1", "1");
 		final String dictBbidString = dictClient.getBbid().getString();
@@ -72,7 +88,7 @@ public class PolicyClientImplTest {
 		assertEquals("DictionaryData matches a response Bbid", dictBbidString, "BB1");
 		assertEquals("DicitonaryData matches a response WorkStep", dictWorkStepString, "1");
 	}
-	
+
 	@Test
 	public void getDecisionMockTest() {
 		String serviceType = "S";
@@ -80,11 +96,11 @@ public class PolicyClientImplTest {
 		String bbID = "BB1";
 		String workStep = "1";
 		String errorCode = "123";
-		
+
 		PolicyDecision expected = new PolicyDecision();
 		expected.setDecision("PERMIT");
 		expected.setDetails("Retry");
-		
+
 		DecisionAttributes decisionAttributes = new DecisionAttributes();
 		decisionAttributes.setServiceType(serviceType);
 		decisionAttributes.setVNFType(vnfType);
@@ -92,20 +108,43 @@ public class PolicyClientImplTest {
 		decisionAttributes.setWorkStep(workStep);
 		decisionAttributes.setErrorCode(errorCode);
 		PolicyClient client = Mockito.spy(PolicyClientImpl.class);
-		
+
 		doReturn(expected).when(client).getDecision(serviceType, vnfType, bbID, workStep, errorCode);
 
 		PolicyDecision actual = client.getDecision(serviceType, vnfType, bbID, workStep, errorCode);
 		assertThat(actual, sameBeanAs(expected));
 	}
+
+	@Test
+	public void getConfigFromStringJsonTest() throws JsonParseException, JsonMappingException, IOException {
+		PolicyClientImpl client = new PolicyClientImpl();
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
+		Config expected = mapper.readValue(new File(RESOURCE_PATH + "configJson.json"), Config.class);
+		PolicyConfig[] returnedPolicyConfigList = mapper.readValue(new File(RESOURCE_PATH + "policyConfig.json"), PolicyConfig[].class);
+		String configJson = returnedPolicyConfigList[0].getConfig();
+		Config actual = client.getConfigFromStringJson(configJson);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
 	
-	/*
 	@Test
-	public void getAllowedTreatmentsTest() {
-		PolicyClient client = new PolicyClientImpl();
-		AllowedTreatments allowedTreatments = client.getAllowedTreatments("BB1", "1");
-		int expectedSizeOfList = 4;
-		int sizeOfList = allowedTreatments.getAllowedTreatments().size();
-		assertEquals("Decision is correct", sizeOfList, expectedSizeOfList);
-	}*/
+	public void getConfigWithPolicyNameTest() throws JsonParseException, JsonMappingException, IOException {
+		PolicyClientImpl client = Mockito.spy(PolicyClientImpl.class);
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
+		PolicyConfig[] returnedPolicyConfigList = mapper.readValue(new File(RESOURCE_PATH + "policyConfig.json"), PolicyConfig[].class);
+		Config expected = mapper.readValue(new File(RESOURCE_PATH + "configJson.json"), Config.class);
+		
+		PolicyRestClient mockedClient = Mockito.mock(PolicyRestClient.class);
+		doReturn(mockedClient).when(client).getPolicyRestClient(PolicyServiceType.GET_CONFIG);
+		doReturn(returnedPolicyConfigList).when(mockedClient).post(isA(ConfigRequestParameters.class), any());
+		
+		Config actual = client.getConfigWithPolicyName("policyName");
+		
+		assertThat(actual, sameBeanAs(expected));
+		
+	}
 }
diff --git a/common/src/test/resources/__files/Policy/configJson.json b/common/src/test/resources/__files/Policy/configJson.json
new file mode 100644
index 0000000000..b206998b41
--- /dev/null
+++ b/common/src/test/resources/__files/Policy/configJson.json
@@ -0,0 +1,23 @@
+{
+	"configName": "Testing",
+	"riskLevel": "1",
+	"policyName": "fabric_configuration",
+	"policyScope": "resource=Test1,service=vSCP,type=configuration,closedLoopControlName=Firewall",
+	"guard": "False",
+	"description": "null",
+	"priority": "9",
+	"uuid": "1234",
+	"version": "1.0",
+	"content": {
+		"fabric-config-models": [
+			{
+				"vnfProfile": "v5",
+				"lagProfile": "N1"
+			}
+		]
+	},
+	"riskType": "test",
+	"service": "mso-fabric-configuration-model",
+	"location": " Edge",
+	"templateVersion": "1607"
+}
\ No newline at end of file
diff --git a/common/src/test/resources/__files/Policy/policyConfig.json b/common/src/test/resources/__files/Policy/policyConfig.json
new file mode 100644
index 0000000000..b67c9c0e48
--- /dev/null
+++ b/common/src/test/resources/__files/Policy/policyConfig.json
@@ -0,0 +1,20 @@
+[
+	{
+		"policyConfigMessage": "Config Retrieved! ",
+		"policyConfigStatus": "CONFIG_RETRIEVED",
+		"type": "JSON",
+		"config": "{\"configName\":\"Testing\",\"riskLevel\":\"1\",\"policyName\":\"fabric_configuration\",\"policyScope\":\"resource=Test1,service=vSCP,type=configuration,closedLoopControlName=Firewall\",\"guard\":\"False\",\"description\":\"null\",\"priority\":\"9\",\"uuid\":\"1234\",\"version\":\"1.0\",\"content\":{\"fabric-config-models\":[{\"vnfProfile\":\"v5\",\"lagProfile\":\"N1\"}]},\"riskType\":\"test\",\"service\":\"mso-fabric-configuration-model\",\"location\":\" Edge\",\"templateVersion\":\"1607\"}",
+		"policyName": "MSO_Policy.Config_MS_fabric_configuration_vPE.2.xml",
+		"policyType": "MicroService",
+		"policyVersion": "2",
+		"matchingConditions": {
+			"ECOMPName": "MSO",
+			"ONAPName": "MSO",
+			"service": "mso-fabric-configuration-model"
+		},
+		"responseAttributes": {
+			
+		},
+		"property": null
+	}
+]
\ No newline at end of file