summaryrefslogtreecommitdiffstats
path: root/dpo/tosca_model
diff options
context:
space:
mode:
authorZlatko Murgoski <zlatko.murgoski@nokia.com>2019-03-05 11:31:48 +0100
committerZlatko Murgoski <zlatko.murgoski@nokia.com>2019-03-15 20:06:59 +0100
commit0f2c2039cd9d9b26482fc7488ae1bdf99f2544f5 (patch)
tree77bf8a43c44e5bb5ad991324f806b990f67edcee /dpo/tosca_model
parent4b8692b6fed457a9d194557abe681832fad4f576 (diff)
Collector authentication enhancement
Collector authentication enhancement Change-Id: I03a05cb83dd8c498fb218e82e9b3958348fbb4ac Issue-ID: DCAEGEN2-1101 Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
Diffstat (limited to 'dpo/tosca_model')
-rw-r--r--dpo/tosca_model/schema.yaml2
-rw-r--r--dpo/tosca_model/template.yaml2
-rw-r--r--dpo/tosca_model/translate.yaml6
3 files changed, 5 insertions, 5 deletions
diff --git a/dpo/tosca_model/schema.yaml b/dpo/tosca_model/schema.yaml
index 6182761b..6c1b2757 100644
--- a/dpo/tosca_model/schema.yaml
+++ b/dpo/tosca_model/schema.yaml
@@ -209,7 +209,7 @@ node_types:
type: string
docker_collector.service.secure.port:
type: string
- docker_header.authflag:
+ docker_auth.method:
type: string
docker_header.authlist:
type: string
diff --git a/dpo/tosca_model/template.yaml b/dpo/tosca_model/template.yaml
index ce0da721..73b4ad38 100644
--- a/dpo/tosca_model/template.yaml
+++ b/dpo/tosca_model/template.yaml
@@ -33,7 +33,7 @@ topology_template:
docker_collector.schema.file: ./etc/CommonEventFormat_27.2.json
docker_collector.service.port: '8080'
docker_collector.service.secure.port: '-1'
- docker_header.authflag: '0'
+ docker_auth.method: noAuth
docker_header.authlist: userid1,base64encodepwd1|userid2,base64encodepwd2
docker_tomcat.maxthreads: '200'
location_id:
diff --git a/dpo/tosca_model/translate.yaml b/dpo/tosca_model/translate.yaml
index 2de809b6..284f34bf 100644
--- a/dpo/tosca_model/translate.yaml
+++ b/dpo/tosca_model/translate.yaml
@@ -38,7 +38,7 @@ topology_template:
type: string
docker_collector.service.secure.port:
type: string
- docker_header.authflag:
+ docker_auth.method:
type: string
docker_header.authlist:
type: string
@@ -119,8 +119,8 @@ topology_template:
get_input: docker_collector.service.port
collector.service.secure.port:
get_input: docker_collector.service.secure.port
- header.authflag:
- get_input: docker_header.authflag
+ auth.method:
+ get_input: docker_auth.method
header.authlist:
get_input: docker_header.authlist
tomcat.maxthreads: