diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-03-23 15:04:46 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-03-23 16:03:48 -0400 |
| commit | 56bc6f68baeb376b99e0dbe4de4790f494dbe3c2 (patch) | |
| tree | 70e5282b76cbe48aa63bcdd4a88f67c3a4919c44 /models-interactions/model-actors/actor.guard/src/test/resources | |
| parent | ef5768de060c6cbf10b06569e00617b052dc7e61 (diff) | |
New Guard actor request structure is incorrect
Missing various fields within the request structure (e.g.,
ONAPName). Fixed.
In the process, also modified makeGuardPayload() so that it
only constructs the inner "guard" JSON object, making it easier
for invoking code to modify it.
Issue-ID: POLICY-2434
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I7d34a279845bb98425caf66565eab7513d310815
Diffstat (limited to 'models-interactions/model-actors/actor.guard/src/test/resources')
4 files changed, 18 insertions, 16 deletions
diff --git a/models-interactions/model-actors/actor.guard/src/test/resources/makeReq.json b/models-interactions/model-actors/actor.guard/src/test/resources/makeReq.json deleted file mode 100644 index 2716d030e..000000000 --- a/models-interactions/model-actors/actor.guard/src/test/resources/makeReq.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "action": "some action", - "hello": "world", - "r u there?": "yes", - "requestId": "abcdefghi", - "resource": { - "abc": "def", - "ghi": "jkl" - } -} diff --git a/models-interactions/model-actors/actor.guard/src/test/resources/makeReqDefault.json b/models-interactions/model-actors/actor.guard/src/test/resources/makeReqDefault.json index d757eb993..a08f13f43 100644 --- a/models-interactions/model-actors/actor.guard/src/test/resources/makeReqDefault.json +++ b/models-interactions/model-actors/actor.guard/src/test/resources/makeReqDefault.json @@ -1,4 +1,10 @@ { + "ONAPName": "my-onap-name", + "ONAPComponent": "my-onap-component", + "ONAPInstance": "my-onap-instance", + "requestId": "abcdefghi", "action": "guard", - "requestId": "abcdefghi" + "resource": { + "guard": {} + } } diff --git a/models-interactions/model-actors/actor.guard/src/test/resources/makeReqStd.json b/models-interactions/model-actors/actor.guard/src/test/resources/makeReqStd.json index 6ae886726..fd1f4c716 100644 --- a/models-interactions/model-actors/actor.guard/src/test/resources/makeReqStd.json +++ b/models-interactions/model-actors/actor.guard/src/test/resources/makeReqStd.json @@ -1,11 +1,13 @@ { + "ONAPName": "my-onap-name", "ONAPComponent": "my-onap-component", "ONAPInstance": "my-onap-instance", - "ONAPName": "my-onap-name", - "action": "my-action", "requestId": "abcdefghi", + "action": "guard", "resource": { - "actor": "resource-actor", - "operation": "resource-operation" + "guard": { + "abc": "123", + "hello": "world" + } } -}
\ No newline at end of file +} diff --git a/models-interactions/model-actors/actor.guard/src/test/resources/service.yaml b/models-interactions/model-actors/actor.guard/src/test/resources/service.yaml index 131cf785b..998928d44 100644 --- a/models-interactions/model-actors/actor.guard/src/test/resources/service.yaml +++ b/models-interactions/model-actors/actor.guard/src/test/resources/service.yaml @@ -26,6 +26,10 @@ httpClients: actors: GUARD: clientName: my-client + onapName: my-onap-name + onapComponent: my-onap-component + onapInstance: my-onap-instance + action: guard operations: Decision: path: decide
\ No newline at end of file |