From 65ca9cb2cc392dcd9793f7758d9d1fd0dd592fb7 Mon Sep 17 00:00:00 2001 From: "Plummer, Brittany" Date: Thu, 6 Jun 2019 16:02:00 -0400 Subject: resume request support copy request body rewrite requestorid added missing curly brace case to regex Updated how we are updating requestorId in requestBody Removed unused imports from RequestHandlerUtils Replaced requestorId in requestBody string Began updating requestorId in requestBody Change-Id: I54bd8097b196899b271956f03395bb98d295e1e0 Issue-ID: SO-1990 Signed-off-by: Benjamin, Max (mb388a) --- .../ResumeOrchestrationRequest/RequestBody.json | 14 +++++++------- .../RequestBodyNewRequestorId.json | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBodyNewRequestorId.json (limited to 'mso-api-handlers/mso-api-handler-infra/src/test/resources') diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBody.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBody.json index 7e8ed4dee1..d6406338a0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBody.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBody.json @@ -1,5 +1,11 @@ { "requestDetails":{ + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1.0", + "modelType":"service", + "modelName":"serviceModel" + }, "requestInfo":{ "source":"VID", "requestorId":"xxxxxx", @@ -8,12 +14,6 @@ }, "requestParameters":{ "aLaCarte":"false" - }, - "modelInfo":{ - "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", - "modelVersion": "1.0", - "modelType":"service", - "modelName":"serviceModel" - } + } } } \ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBodyNewRequestorId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBodyNewRequestorId.json new file mode 100644 index 0000000000..740d4e2ec2 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ResumeOrchestrationRequest/RequestBodyNewRequestorId.json @@ -0,0 +1,19 @@ +{ + "requestDetails":{ + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1.0", + "modelType":"service", + "modelName":"serviceModel" + }, + "requestInfo":{ + "source":"VID", + "requestorId":"yyyyyy", + "instanceName":"testService", + "productFamilyId":"test" + }, + "requestParameters":{ + "aLaCarte":"false" + } + } +} \ No newline at end of file -- cgit 1.2.3-korg