From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 30 Jul 2018 15:56:09 -0400 Subject: Containerization feature of SO Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) --- .../src/test/resources/BaseTaskTest.bpmn | 156 ++++++++++----------- .../src/test/resources/application-dev.yaml | 5 + .../MSOCoreBPMN/src/test/resources/camunda.cfg.xml | 47 ------- .../resources/json-examples/AllottedResource.json | 6 + .../resources/json-examples/ConfigResource.json | 6 + .../resources/json-examples/NetworkResource.json | 6 + .../test/resources/json-examples/SNIROExample.json | 2 +- .../json-examples/ServiceDecomposition.json | 22 +++ .../ServiceDecompositionExpected.json | 51 +++++++ .../test/resources/json-examples/VnfResource.json | 12 ++ .../src/test/resources/logback-test.xml | 4 +- .../src/test/resources/mso.bpmn.properties | 22 --- .../src/test/resources/mso.bpmn.urn.properties | 21 --- bpmn/MSOCoreBPMN/src/test/resources/request.json | 2 +- 14 files changed, 191 insertions(+), 171 deletions(-) create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml delete mode 100644 bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json create mode 100644 bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json delete mode 100644 bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties delete mode 100644 bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties (limited to 'bpmn/MSOCoreBPMN/src/test/resources') diff --git a/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn b/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn index bb15ce2e5e..4d531d23e2 100644 --- a/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn +++ b/bpmn/MSOCoreBPMN/src/test/resources/BaseTaskTest.bpmn @@ -1,79 +1,79 @@ - - - - - SequenceFlow_1 - - - - - Hello World - - - ${firstName} - - - ${undefinedVariable} - - - 42 - - - ${age} - - - ${undefinedVariable} - - - 123456789 - - - ${lastVisit} - - - ${undefinedVariable} - - - goodVariable - - - bad Variable - - - SequenceFlow_1 - SequenceFlow_2 - - - - - SequenceFlow_2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_1 + + + + + Hello World + + + ${firstName} + + + ${undefinedVariable} + + + 42 + + + ${age} + + + ${undefinedVariable} + + + 123456789 + + + ${lastVisit} + + + ${undefinedVariable} + + + goodVariable + + + bad Variable + + + SequenceFlow_1 + SequenceFlow_2 + + + + + SequenceFlow_2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml b/bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml new file mode 100644 index 0000000000..7aa9a26e63 --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/application-dev.yaml @@ -0,0 +1,5 @@ +log: + debug: + TestTask: 'true' + +testKey: 'testValue' \ No newline at end of file diff --git a/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml b/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml deleted file mode 100644 index bc218f0125..0000000000 --- a/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json new file mode 100644 index 0000000000..9731e70dde --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/AllottedResource.json @@ -0,0 +1,6 @@ +{ + "allottedResource" : { + "resourceId" : "allottedResourceId", + "resourceType" : "ALLOTTED_RESOURCE" + } +} diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json new file mode 100644 index 0000000000..412d13bcb6 --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ConfigResource.json @@ -0,0 +1,6 @@ +{ + "configResource" : { + "resourceId" : "configResourceId", + "resourceType" : "CONFIGURATION" + } +} diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json new file mode 100644 index 0000000000..57d3c5d70d --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/NetworkResource.json @@ -0,0 +1,6 @@ +{ + "networkResource" : { + "resourceId" : "networkResourceId", + "resourceType" : "NETWORK" + } +} diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json index 7e56b1a59d..838bcd85a7 100644 --- a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json @@ -11,7 +11,7 @@ ] } ], - "placement": [ + "placementInfo": [ { "assignmentInfo": [ { diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json new file mode 100644 index 0000000000..9acaabe2d1 --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecomposition.json @@ -0,0 +1,22 @@ +{ + "serviceResources" : { + "modelInfo" : { + "modelName" : "modelName", + "modelUuid" : "modelUuid", + "modelInvariantUuid" : "modelInvariantUuid", + "modelVersion" : "modelVersion", + "modelCustomizationUuid" : "modelCustomizationUuid", + "modelCustomizationName" : "modelCustomizationName", + "modelInstanceName" : "modelInstanceName", + "modelType" : "modelType" + }, + "serviceType" : "serviceType", + "serviceRole" : "serviceRole", + "project" : {}, + "owningEntity" : {}, + "vnfResource" : [], + "networkResource" : [], + "allottedResource" : [], + "configResource" : [] + } +} diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json new file mode 100644 index 0000000000..c424293ca2 --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/ServiceDecompositionExpected.json @@ -0,0 +1,51 @@ +{ + "serviceResources" : { + "modelInfo" : { + "modelName" : "modelName", + "modelUuid" : "modelUuid", + "modelInvariantUuid" : "modelInvariantUuid", + "modelVersion" : "modelVersion", + "modelCustomizationUuid" : "modelCustomizationUuid", + "modelCustomizationName" : "modelCustomizationName", + "modelInstanceName" : "modelInstanceName", + "modelType" : "modelType" + }, + "serviceType" : "serviceType", + "serviceRole" : "serviceRole", + "project" : {}, + "owningEntity" : {}, + "serviceInstance" : { + "serviceInstanceId" : "serviceInstanceId" + }, + "serviceVnfs" : [ + { + "resourceId" : "vnfResourceId", + "resourceType" : "VNF", + "resourceInstance" : {}, + "homingSolution" : { + "license" : {}, + "rehome" : false + }, + "vfModules" : [] + } + ], + "networkResource" : [ + { + "resourceId" : "networkResourceId", + "resourceType" : "NETWORK" + } + ], + "serviceAllottedResources" : [ + { + "resourceId" : "allottedResourceId", + "resourceType" : "ALLOTTED_RESOURCE" + } + ], + "configResource" : [ + { + "resourceId" : "configResourceId", + "resourceType" : "CONFIGURATION" + } + ] + } +} diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json new file mode 100644 index 0000000000..cd8c59d248 --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/VnfResource.json @@ -0,0 +1,12 @@ +{ + "vnfResource" : { + "resourceId" : "vnfResourceId", + "resourceType" : "VNF", + "resourceInstance" : {}, + "homingSolution" : { + "license" : {}, + "rehome" : false + }, + "vfModules" : [] + } +} diff --git a/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml b/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml index 92876fcb19..02ac437db6 100644 --- a/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml +++ b/bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml @@ -39,7 +39,9 @@ - + + + diff --git a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties b/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties deleted file mode 100644 index d329dbb207..0000000000 --- a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.properties +++ /dev/null @@ -1,22 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ECOMP MSO -# ================================================================================ -# Copyright (C) 2017 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========================================================= -### - -URNMapping.FileSystemLoading.Enabled=true -testKey=testValue diff --git a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties deleted file mode 100644 index 7fa587311a..0000000000 --- a/bpmn/MSOCoreBPMN/src/test/resources/mso.bpmn.urn.properties +++ /dev/null @@ -1,21 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ECOMP MSO -# ================================================================================ -# Copyright (C) 2017 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========================================================= -### - -log.debug.TestTask=true diff --git a/bpmn/MSOCoreBPMN/src/test/resources/request.json b/bpmn/MSOCoreBPMN/src/test/resources/request.json index 8fa195b839..9513e81d6a 100644 --- a/bpmn/MSOCoreBPMN/src/test/resources/request.json +++ b/bpmn/MSOCoreBPMN/src/test/resources/request.json @@ -1,7 +1,7 @@ { "variables": { "bpmnRequest": { - "value": "\n \n d00eb185-b1d7-429e-aca3-42a61b459535\n Layer3ServiceActivateRequest\n OMX\n http://localhost:28080/simulada/CSI/SendManagedNetworkStatusNotification\n 19630501\n 1\n \n \n SDN-ETHERNET-INTERNET\n AA01|VLXM|003717||SW_INTERNET\n TEST_4306301\n \n \n \n 01|VLXM|121601/PT\n PointToPoint\n MTSNJA4LX01\n \n \n \n 10\n Mbps\n ds\n \n \n none\n \n primary\n \n \n 1\n 32.10.30.116\n 32\n \n \n \n \n 1\n 2507:0CB4:85A5:0030:0000:0000:0000:0010\n 48\n \n \n \n Y\n Y\n Y\n Y\n \n \n Y\n N\n \n \n Y\n Y\n \n \n \n \n \n\n", + "value": "\n \n d00eb185-b1d7-429e-aca3-42a61b459535\n Layer3ServiceActivateRequest\n OMX\n http://localhost:28080/simulada/CSI/SendManagedNetworkStatusNotification\n 19630501\n 1\n \n \n SDN-ETHERNET-INTERNET\n AA01|VLXM|003717||SW_INTERNET\n TEST_4306301\n \n \n \n 01|VLXM|121601/PT\n PointToPoint\n MTSNJA4LX01\n \n \n \n 10\n Mbps\n ds\n \n \n none\n \n primary\n \n \n 1\n 32.10.30.116\n 32\n \n \n \n \n 1\n 2507:0CB4:85A5:0030:0000:0000:0000:0010\n 48\n \n \n \n Y\n Y\n Y\n Y\n \n \n Y\n N\n \n \n Y\n Y\n \n \n \n \n \n\n", "type": "String" }, "host": { -- cgit 1.2.3-korg