From 19efd68c8f8babdaf8a2eb7f78b4522940339da2 Mon Sep 17 00:00:00 2001
From: Elena Kuleshov <ek1439@att.com>
Date: Wed, 28 Mar 2018 11:25:31 -0400
Subject: ControllerType update for CM flows

Change-Id: I42c60ba45baaf29fa5fe54a8bb7ffc0aab5622c7
Signed-off-by: Elena Kuleshov <ek1439@att.com>
Issue-ID: SO-526
---
 .../resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json  | 1 +
 .../resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json | 1 +
 .../resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json  | 1 +
 .../__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json     | 1 +
 bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties | 4 +++-
 5 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/test')

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
index 04040028c3..3fc25944f2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
@@ -33,6 +33,7 @@
 }
 ],
 "requestParameters": {
+"controllerType" : "appc",
 "payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration-         parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}"
 }
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
index 7c9717244b..a018f50355 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
@@ -34,6 +34,7 @@
 ],
 "requestParameters": {
 "usePreload": false,
+"controllerType" : "appc",
 "userParams" : [
 	{
 		"name" : "someUserParam",
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
index 40e7b598c0..e6d3e97a5c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
@@ -34,6 +34,7 @@
 ],
 "requestParameters": {
 "usePreload": false,
+"controllerType" : "appc",
 "userParams" : [
 	{
 		"name" : "someUserParam",
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
index 009db93d68..588ef1cbec 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
@@ -9,6 +9,7 @@
 "requestorId": "ab1234"
 },
 "requestParameters": {
+"controllerType": "",
 "payload":
 "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
index 2e5a199cdb..245d753f3e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -106,6 +106,7 @@ log.debug.CreateGenericALaCarteServiceInstance=true
 log.debug.DecomposeService=true
 log.debug.DoCreateServiceInstance=true
 log.debug.DoDeleteServiceInstance=true
+log.debug.VnfInPlaceUpdate=true
 
 policy.client.auth=Basic bTAzNzQzOnBvbGljeVIwY2sk
 policy.auth=Basic dGVzdHBkcDphbHBoYTEyMw==
@@ -117,9 +118,10 @@ appc.topic.read=APPC-CL-FUSION-LCM-RESPONSE
 appc.topic.read.timeout=100
 appc.client.response.timeout=300
 appc.topic.write=APPC-CL-FUSION-LCM
-appc.pool.members=localhost:28090
+appc.poolMembers=localhost:28090
 appc.client.key=iaEMAfjsVsZnraBP
 appc.client.secret=wcivUjsjXzmGFBfxMmyJu9dz
+appc.service=ueb
 
 sdnc.si.sv.types=PORT-MIRROR,PPROBES
 mso.bpmn.optimisticlockingexception.retrycount=3
-- 
cgit 1.2.3-korg