diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/pom.xml | 2 | ||||
| -rw-r--r-- | common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml | 19 | ||||
| -rw-r--r-- | common/src/main/resources/tosca/PolicyControlLoopElementType.yaml | 4 | ||||
| -rw-r--r-- | common/src/test/resources/demo/Notes.txt | 31 |
4 files changed, 43 insertions, 13 deletions
diff --git a/common/pom.xml b/common/pom.xml index 063a68c05..1c2645342 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.2-SNAPSHOT</version> + <version>6.1.3-SNAPSHOT</version> </parent> <artifactId>policy-clamp-common</artifactId> diff --git a/common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml b/common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml index e45a06257..a17cb7624 100644 --- a/common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml +++ b/common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml @@ -47,7 +47,7 @@ node_types: type: integer required: false constraints: - - greater-or-equal: 0 + - greater_or_equal: 0 metadata: common: true description: A value indicating the start phase in which this control loop element will be started, the @@ -58,7 +58,7 @@ node_types: type: integer required: false constraints: - - greater-or-equal: 0 + - greater_or_equal: 0 default: 60 metadata: common: true @@ -67,7 +67,7 @@ node_types: type: integer required: false constraints: - - greater-or-equal: 0 + - greater_or_equal: 0 default: 60 metadata: common: true @@ -76,7 +76,7 @@ node_types: type: integer required: false constraints: - - greater-or-equal: 0 + - greater_or_equal: 0 default: 60 metadata: common: true @@ -85,11 +85,20 @@ node_types: type: integer required: false constraints: - - greater-or-equal: 0 + - greater_or_equal: 0 default: 60 metadata: common: true description: The maximum time in seconds to wait for a state chage from passive to uninitialized + startDelay: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 0 + metadata: + common: true + description: The number of milliseconds that the start of this control loop element should be delayed org.onap.policy.clamp.controlloop.ControlLoop: version: 1.0.1 derived_from: tosca.nodetypes.Root diff --git a/common/src/main/resources/tosca/PolicyControlLoopElementType.yaml b/common/src/main/resources/tosca/PolicyControlLoopElementType.yaml index bf66718ca..b4631ba14 100644 --- a/common/src/main/resources/tosca/PolicyControlLoopElementType.yaml +++ b/common/src/main/resources/tosca/PolicyControlLoopElementType.yaml @@ -37,3 +37,7 @@ node_types: default: defaultGroup description: The PDP group to which the policy should be deployed. This parameter is used when the policy is deployed to PAP. The value defaults to the "defaultGroup", which always exists. + pdpType: + type: string + required: true + description: The PDP type to which the policy will run on. This parameter is used when the policy is deployed to PAP.
\ No newline at end of file diff --git a/common/src/test/resources/demo/Notes.txt b/common/src/test/resources/demo/Notes.txt index 43b75e915..f937e0969 100644 --- a/common/src/test/resources/demo/Notes.txt +++ b/common/src/test/resources/demo/Notes.txt @@ -14,15 +14,14 @@ Go to clamp/runtime-controlloop mvn spring-boot:run -Dspring-boot.run.arguments="--topicServer=localhost --mariadb.host=localhost" Run Participant from command line using Maven -mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8080 --topicServer=localhost" -mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8081 --topicServer=localhost" -mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8082 --topicServer=localhost" +mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8080 +mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8081 +mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8082 Run Participant from command line using Jar -java -jar -Dserver.port=8080 -DtopicServer=localhost target/policy-clamp-participant-impl-simulator-6.1.2-SNAPSHOT.jar -java -jar -Dserver.port=8081 -DtopicServer=localhost target/policy-clamp-participant-impl-dcae-6.1.2-SNAPSHOT.jar -java -jar -Dserver.port=8082 -DtopicServer=localhost target/policy-clamp-participant-impl-policy-6.1.2-SNAPSHOT.jar -java -jar -DtopicServer=localhost target/policy-clamp-participant-impl-kubernetes-6.1.2-SNAPSHOT.jar +java -jar -Dserver.port=8080 target/policy-clamp-participant-impl-simulator-6.1.2-SNAPSHOT.jar +java -jar -Dserver.port=8082 target/policy-clamp-participant-impl-policy-6.1.2-SNAPSHOT.jar +java -jar target/policy-clamp-participant-impl-kubernetes-6.1.2-SNAPSHOT.jar Config of DB @@ -39,6 +38,24 @@ MariaDB [(none)]> SHOW GRANTS for 'policy'@localhost; +---------------------------------------------------------------------------------------------------------------+ 2 rows in set (0.000 sec) +//Generate the keystore +//clone policy/docker +cd docker/csit +./gen_truststore.sh +./gen_keystore.sh +//the keystore generated: /docker/csit/config/ks.jks + +Run Participant from command line using Docker +docker run --add-host=message-router:<ip-router> -p 6969:6969 --mount type=bind,source=<path-keystore-file>,target=/opt/app/policy/clamp/etc/ssl/policy-keystore onap/policy-clamp-cl-runtime +docker run --add-host=message-router:<ip-router> -p 8083:8083 --mount type=bind,source=<path-keystore-file>,target=/opt/app/policy/clamp/etc/ssl/policy-keystore onap/policy-clamp-cl-k8s-ppnt +docker run --add-host=message-router:<ip-router> --mount type=bind,source=<path-keystore-file>,target=/opt/app/policy/clamp/etc/ssl/policy-keystore onap/policy-clamp-cl-http-ppnt +docker run --add-host=message-router:<ip-router> --mount type=bind,source=<path-keystore-file>,target=/opt/app/policy/clamp/etc/ssl/policy-keystore onap/policy-clamp-cl-pf-ppnt + +Note: +/policy-clamp-tarball/src/main/resources/etc/ssl/policy-truststore is the truststore for DMaap of oom project +Participant-k8 swagger: https://localhost:8083/onap/k8sparticipant/swagger-ui/ +CL-Runtime swagger: https://localhost:6969/onap/controlloop/swagger-ui/ + Run Policy API: mvn exec:java -Dexec.mainClass=org.onap.policy.api.main.startstop.Main -Dexec.args="-c ../../clamp-tpn/tosca-controlloop/common/src/test/resources/demo/policy-api/PolicyAPIConfig.json" |