aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-03-14 02:07:32 -0400
committerRob Daugherty <rd472p@att.com>2018-03-14 04:08:41 -0400
commit38f720752af4d4aad8c4e467a288d9048659f688 (patch)
treee81066a8b5c77272e30fb57a64999573c4db4d86 /bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks
parentaee3d223f92a6f250f43e17558a2dfd576ff7294 (diff)
AT&T 1712 and 1802 release code
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks')
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json5
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf11
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net17
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf3
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf2
5 files changed, 24 insertions, 14 deletions
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json
index 0fdada5c68..09026d1d8c 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json
@@ -38,8 +38,9 @@
"nfRole": "",
"nfType": "",
"nfFunction": "",
- "nfNamingCode": ""
- }
+ "nfNamingCode": "",
+ "multiStageDesign": "N"
+ }
],
"serviceNetworks": []
}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
index 19f18cce52..372f5d9e4d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
@@ -30,7 +30,7 @@
"serviceResourceId": "testResourceIdVNF"
}
],
- "placement": [
+ "placementInfo": [
{
"assignmentInfo": [
{
@@ -54,7 +54,8 @@
"inventoryType": "service",
"resourceModuleName": "ALLOTTED_RESOURCE",
"serviceInstanceId": "testSIID1",
- "serviceResourceId": "testResourceIdAR"
+ "serviceResourceId": "testResourceIdAR",
+ "isRehome": "False"
},
{
"assignmentInfo": [
@@ -79,7 +80,8 @@
"inventoryType": "service",
"resourceModuleName": "ALLOTTED_RESOURCE",
"serviceInstanceId": "testSIID2",
- "serviceResourceId": "testResourceIdAR2"
+ "serviceResourceId": "testResourceIdAR2",
+ "isRehome": "False"
},
{
"assignmentInfo": [
@@ -100,7 +102,8 @@
"inventoryType": "cloud",
"resourceModuleName": "VNF",
"serviceInstanceId": "",
- "serviceResourceId": "testResourceIdVNF"
+ "serviceResourceId": "testResourceIdVNF",
+ "isRehome": "False"
}
]
}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
index 5a9ef4b4f9..694419700d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
@@ -42,7 +42,7 @@
"serviceResourceId": "testResourceIdVNF"
}
],
- "placement": [
+ "placementInfo": [
{
"assignmentInfo": [
{
@@ -66,7 +66,8 @@
"inventoryType": "service",
"resourceModuleName": "ALLOTTED_RESOURCE",
"serviceInstanceId": "testSIID1",
- "serviceResourceId": "testResourceIdAR"
+ "serviceResourceId": "testResourceIdAR",
+ "isRehome": "False"
},
{
"assignmentInfo": [
@@ -91,7 +92,8 @@
"inventoryType": "service",
"resourceModuleName": "ALLOTTED_RESOURCE",
"serviceInstanceId": "testSIID2",
- "serviceResourceId": "testResourceIdAR2"
+ "serviceResourceId": "testResourceIdAR2",
+ "isRehome": "False"
},
{
"assignmentInfo": [
@@ -116,7 +118,8 @@
"inventoryType": "service",
"resourceModuleName": "NETWORK",
"serviceInstanceId": "testServiceInstanceIdNet",
- "serviceResourceId": "testResourceIdNet"
+ "serviceResourceId": "testResourceIdNet",
+ "isRehome": "False"
},
{
"assignmentInfo": [
@@ -137,7 +140,8 @@
"inventoryType": "cloud",
"resourceModuleName": "NETWORK",
"serviceInstanceId": "",
- "serviceResourceId": "testResourceIdNet2"
+ "serviceResourceId": "testResourceIdNet2",
+ "isRehome": "False"
},
{
"assignmentInfo": [
@@ -158,7 +162,8 @@
"inventoryType": "cloud",
"resourceModuleName": "VNF",
"serviceInstanceId": "",
- "serviceResourceId": "testResourceIdVNF"
+ "serviceResourceId": "testResourceIdVNF",
+ "isRehome": "False"
}
]
}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf
index f80ff65d04..9159d80c43 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf
@@ -4,13 +4,14 @@
"requestState": "complete",
"statusMessage": "",
"solutionInfo": {
- "placement": [
+ "placementInfo": [
{
"serviceResourceId": "test-resource-id-000",
"resourceModuleName": "ADIOD vRouter vCE",
"inventoryType": "service",
"serviceInstanceId": "service-instance-01234",
"cloudRegionId": "mtmnj1a",
+ "isRehome": "False",
"assignmentInfo": [
{
"variableName": "cloudOwner",
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf
index 5dcf71a7c8..2af6bf3423 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf
@@ -2,7 +2,7 @@
"requestInfo": {
"transactionId": "testRequestId",
"requestId": "testRequestId",
- "callbackUrl": "http://localhost:28090/workflows/messages/message/SNIROResponse/testRequestId",
+ "callbackUrl": "http://localhost:8090/workflows/messages/message/SNIROResponse/testRequestId",
"sourceId": "mso",
"optimizer": [
"placement",