Blueprints Processor Microservice

Refactor functon module as seperate module project.

Change-Id: I392fc62e6dfb6c5f38f478c00e46460d5084f85c
Issue-ID: CCSDK-688
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

8 files changed, 0 insertions, 253 deletions

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
deleted file mode 100644
index 0768c609..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*

- *  Copyright © 2017-2018 AT&T Intellectual Property.

- *  Modifications Copyright © 2018 IBM.

- *

- *  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.

- */

-

-package org.onap.ccsdk.apps.blueprintsprocessor.services.resolution;

-

-import com.fasterxml.jackson.databind.node.ObjectNode;

-import org.apache.commons.collections.CollectionUtils;

-import org.apache.commons.io.FileUtils;

-import org.junit.Assert;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionInput;

-import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionOutput;

-import org.onap.ccsdk.apps.blueprintsprocessor.core.factory.ResourceAssignmentProcessorFactory;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.DefaultResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.InputResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.MDSALResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.SdncResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.test.context.ContextConfiguration;

-import org.springframework.test.context.junit4.SpringRunner;

-

-import java.io.File;

-import java.nio.charset.Charset;

-import java.util.List;

-

-/**

- * ResourceResolutionServiceTest

- *

- * @author Brinda Santh DATE : 8/15/2018

- */

-@RunWith(SpringRunner.class)

-@ContextConfiguration(classes = {ResourceResolutionService.class, ResourceAssignmentProcessorFactory.class,

-        InputResourceAssignmentProcessor.class, DefaultResourceAssignmentProcessor.class,

-        SdncResourceAssignmentProcessor.class, MDSALResourceAssignmentProcessor.class})

-public class ResourceResolutionServiceTest {

-    private static Logger log = LoggerFactory.getLogger(ResourceResolutionServiceTest.class);

-

-    @Autowired

-    private ResourceResolutionService resourceResolutionService;

-

-    @Test

-    public void testResolveResource() throws Exception {

-

-        Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService);

-

-        String resourceResolutionInputContent = FileUtils.readFileToString(

-                new File("src/test/resources/payload/requests/sample-resourceresolution-request.json"), Charset.defaultCharset());

-

-        ResourceResolutionInput resourceResolutionInput = JacksonUtils.readValue(resourceResolutionInputContent, ResourceResolutionInput.class);

-        Assert.assertNotNull("failed to populate resourceResolutionInput request ", resourceResolutionInput);

-

-        String resourceAssignmentContent = FileUtils.readFileToString(

-                new File("src/test/resources/mapping/db/resource-assignments-simple.json"), Charset.defaultCharset());

-        List<ResourceAssignment> batchResourceAssignment =

-                JacksonUtils.getListFromJson(resourceAssignmentContent, ResourceAssignment.class);

-

-        Assert.assertTrue("failed to create ResourceAssignment from file", CollectionUtils.isNotEmpty(batchResourceAssignment));

-        resourceResolutionInput.setResourceAssignments(batchResourceAssignment);

-

-        ObjectNode inputContent = (ObjectNode) JacksonUtils.jsonNodeFromFile("src/test/resources/payload/inputs/input.json");

-        Assert.assertNotNull("failed to populate input payload ", inputContent);

-        resourceResolutionInput.setPayload(inputContent);

-        log.info("ResourceResolutionInput : {}", JacksonUtils.getJson(resourceResolutionInput, true));

-

-        ResourceResolutionOutput resourceResolutionOutput = resourceResolutionService.resolveResource(resourceResolutionInput);

-        Assert.assertNotNull("failed to populate output", resourceResolutionOutput);

-

-    }

-}

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-array.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-array.json
deleted file mode 100644
index 679b92db..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-array.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{

-	"locations": {

-		"name": "locations",

-		"data-type": "list",

-		"entry-schema": "dt-location",

-		"source": {

-			"db": {

-				"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

-				"input-key-mapping": {

-					"profile_name": "profile_name"

-				},

-				"output-key-mapping": {

-					"db-country": "country",

-					"db-state": "state"

-				}

-			}

-		},

-		"candidate-dependency": {

-			"db": {

-				"names": [

-					"profile_name"

-				]

-			}

-		}

-	},

-	"profile_name": {

-		"name": "profile_name",

-		"data-type": "string",

-		"source": {

-			"input": {

-				

-			}

-		}

-	}

-}

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-complex.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-complex.json
deleted file mode 100644
index 32d04b69..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-complex.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{

-	"location": {

-		"name": "location",

-		"data-type": "dt-location",

-		"source": {

-			"db": {

-				"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

-				"input-key-mapping": {

-					"profile_name": "profile_name"

-				},

-				"output-key-mapping": {

-					"db-country": "country",

-					"db-state": "state"

-				}

-			}

-		}

-	},

-	"profile_name": {

-		"name": "profile_name",

-		"data-type": "string",

-		"source": {

-			"input": {

-				

-			}

-		}

-	}

-}

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-simple.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-simple.json
deleted file mode 100644
index 841404f2..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/db-simple.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{

-	"country": {

-		"name": "country",

-		"data-type": "string",

-		"source": {

-			"db": {

-				"query": "SELECT country FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

-				"input-key-mapping": {

-					"profile_name": "profile_name"

-				},

-				"output-key-mapping": {

-					"country": "country"

-				}

-			}

-		}

-	},

-	"profile_name": {

-		"name": "profile_name",

-		"data-type": "string",

-		"source": {

-			"input": {

-				

-			}

-		}

-	}

-}

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/dt-location.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/dt-location.json
deleted file mode 100644
index 52e0a796..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/dt-location.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{

-	"version": "1.0.0",

-	"description": "test Data Type",

-	"properties": {

-		"country": {

-			"required": true,

-			"type": "string"

-		},

-		"state": {

-			"required": false,

-			"type": "string"

-		}

-	},

-	"derived_from": "tosca.datatypes.Root"

-}

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json
deleted file mode 100644
index ddcf32ee..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[

-  {

-    "name": "country",

-    "input-param": true,

-    "property": {

-      "type": "string"

-    },

-    "dictionary-name": "country",

-    "dictionary-source": "db",

-    "dependencies": ["state"]

-  },

-  {

-    "name": "state",

-    "input-param": true,

-    "property": {

-      "type": "string"

-    },

-    "dictionary-name": "state",

-    "dictionary-source": "input",

-    "dependencies": []

-  }

-]

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/payload/inputs/input.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/payload/inputs/input.json
deleted file mode 100644
index cd6fac12..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/payload/inputs/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{

-	"api-ver": "2.00",

-	"originator-id": "MSO",

-	"request-id": "123456",

-	"service-instance-id": "ibcx0001vm001",

-	"service-type": "AVPN",

-	"vnf-type": "vUSP - vDBE-IPX HUB",

-	"vnf-id": 123456,

-	"service-template-name": "VRR-baseconfiguration",

-	"service-template-version": "1.0.0",

-	"action-name": "resource-assignment-action",

-	"group-name": "sample group name",

-	"bundle-id": "sample bundle id",

-	"bundle-mac": [

-		"Sample bundle mac",

-		"Sample bundle mac"

-	]

-}

diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/payload/requests/sample-resourceresolution-request.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/payload/requests/sample-resourceresolution-request.json
deleted file mode 100644
index e8830a8a..00000000
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/payload/requests/sample-resourceresolution-request.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{

-  "actionIdentifiers": {

-    "actionName": "sample-action",

-    "blueprintName": "sample-blurprint",

-    "blueprintVersion": "1.0.0",

-    "mode": "sync"

-  },

-  "commonHeader": {

-    "flags": {

-      "force": true,

-      "ttl": 3600

-    },

-    "originatorId": "sdnc",

-    "requestId": "123456-1000",

-    "subRequestId": "sub-123456-1000",

-    "timestamp": "2012-04-23T18:25:43.511Z"

-  },

-  "payload": {

-  },

-  "resourceAssignments": [

-  ]

-}