summaryrefslogtreecommitdiffstats
path: root/src/test/resources/example/sdc
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2019-05-09 11:03:53 +0200
committersebdet <sebastien.determe@intl.att.com>2019-05-09 11:53:52 +0200
commit4545e770dd5ab7cab80ea115ed326e60a944cbc4 (patch)
treede696c84c0f7cb2e18ac441cbdfbd08d56477805 /src/test/resources/example/sdc
parentc87a8c05937361d7d5fd239c75f8bca60f543068 (diff)
Fix model type searching
Change the way we get the model type in the dcaeblueprint Issue-ID: CLAMP-370 Change-Id: I961a20e5d993049c73acd67b6cbfe245e1676dda Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src/test/resources/example/sdc')
-rw-r--r--src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json3
-rw-r--r--src/test/resources/example/sdc/blueprint-dcae/tca.yaml2
-rw-r--r--src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml2
-rw-r--r--src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml6
4 files changed, 9 insertions, 4 deletions
diff --git a/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json b/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json
index f8f53165..012c46e9 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json
+++ b/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json
@@ -40,7 +40,8 @@
"cbs_host": "config-binding-service.dcae.svc.cluster.local",
"cbs_port": "10000",
"external_port": "32012",
- "policy_id": "AUTO_GENERATED_POLICY_ID_AT_SUBMIT"
+ "policy_id": "AUTO_GENERATED_POLICY_ID_AT_SUBMIT",
+ "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app"
}
}
]
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
index edaa0be2..0cb9cdb6 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
+++ b/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
@@ -17,7 +17,7 @@ node_templates:
properties:
policy_id:
get_input: policy_id
- policy_type_id: onap.policies.monitoring.cdap.tca.hi.lo.app
+ policy_model_id: "onap.policies.monitoring.cdap.tca.hi.lo.app"
cdap_host_host:
type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure
properties:
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
index 56ae32a7..00ebfe7f 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
+++ b/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
@@ -171,4 +171,4 @@ node_templates:
properties:
policy_id:
get_input: policy_id
- policy_type_id: onap.policies.monitoring.cdap.tca.hi.lo.app
+ policy_model_id: "onap.policies.monitoring.cdap.tca.hi.lo.app"
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
index 53cfc4f7..6fab504b 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
+++ b/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
@@ -51,6 +51,9 @@ inputs:
type: string
description: Kubernetes node port on which CDAPgui is exposed
default: "32012"
+ policy_model_id:
+ type: string
+ default: "onap.policies.monitoring.cdap.tca.hi.lo.app"
node_templates:
tca_k8s:
@@ -150,4 +153,5 @@ node_templates:
properties:
policy_id:
get_input: policy_id
- policy_type_id: onap.policies.monitoring.cdap.tca.hi.lo.app
+ policy_model_id:
+ get_input: policy_model_id