Merge "CDS actor was not registered"

diff --git a/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json b/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json
new file mode 100644 (file)
index 0000000..f7acf1e
--- /dev/null
+++ b/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json
@@ -0,0 +1,28 @@
+{
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+    "topology_template": {
+        "policies": [
+            {
+                "usecases": {
+                    "type": "onap.policies.native.drools.Artifact",
+                    "type_version": "1.0.0",
+                    "name": "usecases.artifacts",
+                    "version": "1.0.0",
+                    "metadata": {
+                        "policy-id": "usecases.artifacts"
+                    },
+                    "properties": {
+                        "rulesArtifact": {
+                            "groupId": "org.onap.policy.drools-applications.controlloop.common",
+                            "artifactId": "controller-usecases",
+                            "version": "1.6.1"
+                        },
+                        "controller": {
+                            "name": "usecases"
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}

diff --git a/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.yaml b/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.yaml
new file mode 100644 (file)
index 0000000..f45ba27
--- /dev/null
+++ b/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.yaml
@@ -0,0 +1,17 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+topology_template:
+  policies:
+    - usecases:
+        type: onap.policies.native.drools.Artifact
+        type_version: 1.0.0
+        name: usecases.artifacts
+        version: 1.0.0
+        metadata:
+          policy-id: usecases.artifacts
+        properties:
+          rulesArtifact:
+            groupId: org.onap.policy.drools-applications.controlloop.common
+            artifactId: controller-usecases
+            version: 1.6.1
+          controller:
+            name: usecases

diff --git a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json
index 870c22b..7bea9c5 100644 (file)
--- a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json
+++ b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {

diff --git a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml
index f40992a..df9fe5b 100644 (file)
--- a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
   policies:
     - usecases:

diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh b/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
index 0f7a7b3..3eac29d 100644 (file)
--- a/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
+++ b/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
+#  Copyright (C) 2019-2020 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ then
     CONFIG_FILE="$PDP_SIM_HOME/etc/config/OnapPfConfig.json"
 fi
 
-echo "PDP simulatior configuration file: $CONFIG_FILE
+echo "PDP simulator configuration file:" $CONFIG_FILE
 
 $JAVA_HOME/bin/java \
     -cp "$PDP_SIM_HOME/etc:$PDP_SIM_HOME/lib/*" \