diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-05-08 14:33:57 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-05-08 16:24:35 -0400 |
| commit | 10b21aae2bde224ab7f91f4b5ab1b89369c8fd1c (patch) | |
| tree | 0417099e379e8be69f90221e8fd066fc40def62b /controlloop/templates | |
| parent | 01841878936986bc80a974977ccdeaceaf7f9a78 (diff) | |
Add payload to vFW policy yaml
Added new "streams" payload to vFW policy yaml files.
Removed references to pg-streams.
Also deleted directories that were moved to policy/models.
Also removed references to trafficgenerator.
Updated licenses.
Removed some trailing whitespace.
Change-Id: I6becaa573628eee677f0959fadf86f9a9f032f88
Issue-ID: POLICY-1752
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/templates')
7 files changed, 12 insertions, 70 deletions
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml index 2fb5d868b..ccb8951f4 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml @@ -95,15 +95,10 @@ <version>${dependenciesVersion}</version> </dependency> <dependency> - <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> - <artifactId>trafficgenerator</artifactId> - <version>${dependenciesVersion}</version> - </dependency> - <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>eventmanager</artifactId> <version>${dependenciesVersion}</version> - </dependency> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>guard</artifactId> diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json index 2c6570d03..4f956885e 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json @@ -12,30 +12,7 @@ "Value": "SUCCESS" }, "Payload": { - "generic-vnf.vnf-id": "jimmy-test-vnf2", - "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" - } - ] + "generic-vnf.vnf-id": "jimmy-test-vnf2" } } }
\ No newline at end of file diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/vFW.yaml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/vFW.yaml index 7d0ac84be..b517e76b3 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/vFW.yaml +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/vFW.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 AT&T Intellectual Property. All rights reserved +# Copyright 2018-2019 AT&T Intellectual Property. All rights reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ controlLoop: trigger_policy: unique-policy-id-1-modifyConfig timeout: 3600 abatement: false - + policies: - id: unique-policy-id-1-modifyConfig name: modify packet gen config @@ -27,6 +27,8 @@ policies: target: resourceID: Eace933104d443b496b8.nodes.heat.vpg type: VNF + payload: + streams: '{"active-streams":5}' retry: 2 timeout: 1200 success: final_success diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml index 40e65da88..bef11cd1b 100644 --- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml @@ -95,15 +95,10 @@ <version>${dependenciesVersion}</version> </dependency> <dependency> - <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> - <artifactId>trafficgenerator</artifactId> - <version>${dependenciesVersion}</version> - </dependency> - <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>eventmanager</artifactId> <version>${dependenciesVersion}</version> - </dependency> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>guard</artifactId> diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json index 2c6570d03..4f956885e 100644 --- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json +++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json @@ -12,30 +12,7 @@ "Value": "SUCCESS" }, "Payload": { - "generic-vnf.vnf-id": "jimmy-test-vnf2", - "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" - } - ] + "generic-vnf.vnf-id": "jimmy-test-vnf2" } } }
\ No newline at end of file diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vFW.yaml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vFW.yaml index dcbdf5459..01f67959f 100644 --- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vFW.yaml +++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vFW.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 AT&T Intellectual Property. All rights reserved +# Copyright 2018-2019 AT&T Intellectual Property. All rights reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ controlLoop: trigger_policy: unique-policy-id-1-modifyConfig timeout: 3600 abatement: false - + policies: - id: unique-policy-id-1-modifyConfig name: modify packet gen config @@ -27,6 +27,8 @@ policies: target: resourceID: Eace933104d443b496b8.nodes.heat.vpg type: VNF + payload: + streams: '{"active-streams":5}' retry: 2 timeout: 1200 success: final_success diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml index 862fa2809..d12fc4490 100644 --- a/controlloop/templates/template.demo/pom.xml +++ b/controlloop/templates/template.demo/pom.xml @@ -85,12 +85,6 @@ </dependency> <dependency> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> - <artifactId>trafficgenerator</artifactId> - <version>${policy.models.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>vfc</artifactId> <version>${policy.models.version}</version> <scope>provided</scope> |