diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-05-08 15:39:37 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-05-09 10:38:47 -0400 |
| commit | 9eb34d921839ef5e32d2dd29d5af043e7dfe73dc (patch) | |
| tree | 56084cac1a82fb6ebd87ae9bede0c2cb58546459 /models-interactions/model-yaml | |
| parent | f53879588a464c727ece62f87c7625b47e6de7f1 (diff) | |
Change vFW payload from pg-streams to streams
Changed APPC payload from pg-streams to streams.
Also removed trafficgenerator.
Updated licenses.
Added log message when payload is null.
Replaced "ref$" with real payload values in yaml and docs.
Change-Id: I4b38b0f64784d5fffc8f62f3a26cd007e500fbc7
Issue-ID: POLICY-1752
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-yaml')
3 files changed, 4 insertions, 30 deletions
diff --git a/models-interactions/model-yaml/README-v2.0.0.md b/models-interactions/model-yaml/README-v2.0.0.md index d6613add2..bb72cc03e 100644 --- a/models-interactions/model-yaml/README-v2.0.0.md +++ b/models-interactions/model-yaml/README-v2.0.0.md @@ -1,4 +1,4 @@ -Copyright 2018 AT&T Intellectual Property. All rights reserved. +Copyright 2018-2019 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019 Nordix Foundation. This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE Full license text at https://creativecommons.org/licenses/by/4.0/legalcode @@ -307,7 +307,7 @@ policies: resourceID: Eace933104d443b496b8.nodes.heat.vpg payload: generic-vnf.vnf-id: {generic-vnf.vnf-id} - ref$: pgstreams.json + streams: '{"active-streams":5}' retry: 0 timeout: 300 success: final_success diff --git a/models-interactions/model-yaml/src/test/resources/v2.0.0/pgstreams.json b/models-interactions/model-yaml/src/test/resources/v2.0.0/pgstreams.json deleted file mode 100644 index 4d118afa1..000000000 --- a/models-interactions/model-yaml/src/test/resources/v2.0.0/pgstreams.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "pg-streams": { - "pg-stream": [ - { - "id": "fw_udp1", - "is-enabled": "true" - }, - { - "id": "fw_udp2", - "is-enabled": "true" - }, - { - "id": "fw_udp3", - "is-enabled": "true" - }, - { - "id": "fw_udp4", - "is-enabled": "true" - }, - { - "id": "fw_udp5", - "is-enabled": "true" - } - ] - } -}
\ No newline at end of file diff --git a/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml b/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml index caf3babbc..00b9b4cb1 100644 --- a/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml +++ b/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 AT&T Intellectual Property. All rights reserved +# Copyright 2018-2019 AT&T Intellectual Property. All rights reserved # Modifications Copyright (C) 2019 Nordix Foundation. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -61,7 +61,7 @@ policies: resourceID: Eace933104d443b496b8.nodes.heat.vpg payload: generic-vnf.vnf-id: {generic-vnf.vnf-id} - ref$: pgstreams.json + streams: '{"active-streams":5}' retry: 0 timeout: 300 success: final_success |