From f0ea0913f413865bf0e8f90223f76d9124b3eb82 Mon Sep 17 00:00:00 2001 From: Philippe Merle Date: Tue, 7 May 2019 13:53:33 +0200 Subject: [PATCH] Corrected syntaxic and typing errors --- .../secured-docker-registry/types.yml | 14 +++++---- .../consul/topologies/ConsulOnBS/types.yaml | 18 ++++++----- org/ystia/flink/linux/bash/types.yml | 4 +-- org/ystia/kibana/linux/bash/types.yml | 2 +- org/ystia/kubernetes/linux/ansible/types.yml | 2 +- org/ystia/logstash/linux/bash/types.yml | 2 +- .../elk_apache_log_generator/types.yml | 6 ++-- .../samples/topologies/elk_beats/types.yml | 6 ++-- .../topologies/elk_dummylogs/types.yml | 6 ++-- .../topologies/elk_heartbeat/types.yml | 6 ++-- .../samples/topologies/elk_nifi/types.yml | 6 ++-- .../samples/topologies/elk_twitter/types.yml | 6 ++-- .../tests/topologies/elk_elastic/types.yml | 6 ++-- .../tests/topologies/elk_kafka/types.yml | 2 +- .../tests/topologies/elk_kibana/types.yml | 6 ++-- org/ystia/tests/topologies/nifi/types.yml | 6 ++-- .../a4c_yorc_basic_secured/types.yaml | 2 +- org/ystia/topologies/elk_basic/types.yml | 6 ++-- org/ystia/topologies/elk_broker/types.yml | 10 +++--- org/ystia/topologies/elk_geonames/types.yml | 6 ++-- org/ystia/topologies/elk_ha/types.yml | 31 ++++++++++++------- org/ystia/topologies/jupyter/types.yml | 12 ++++--- org/ystia/topologies/rstudio/types.yml | 14 +++++---- org/ystia/yorc/yorc/linux/ansible/types.yaml | 3 +- 24 files changed, 112 insertions(+), 70 deletions(-) diff --git a/org/ystia/docker/topologies/secured-docker-registry/types.yml b/org/ystia/docker/topologies/secured-docker-registry/types.yml index 093b0809..3cc14d85 100644 --- a/org/ystia/docker/topologies/secured-docker-registry/types.yml +++ b/org/ystia/docker/topologies/secured-docker-registry/types.yml @@ -41,6 +41,7 @@ topology_template: node: Network capability: tosca.capabilities.Connectivity relationship: tosca.relationships.Network + - local_storage: BlockStorage # Replace requirements of BlockStorage capabilities: os: properties: @@ -119,12 +120,13 @@ topology_template: default_instances: 1 BlockStorage: type: tosca.nodes.BlockStorage - requirements: - - attachToComputeAttach: - type_requirement: attachment - node: Compute - capability: tosca.capabilities.Attachment - relationship: tosca.relationships.AttachTo +# attachment is not a requirement of BlockStorage +# requirements: +# - attachToComputeAttach: +# type_requirement: attachment +# node: Compute +# capability: tosca.capabilities.Attachment +# relationship: tosca.relationships.AttachTo LinuxFileSystem: type: alien.nodes.LinuxFileSystem properties: diff --git a/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml b/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml index a57fc10b..b021b8ea 100644 --- a/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml +++ b/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml @@ -72,6 +72,7 @@ topology_template: node: PublicNetwork capability: tosca.capabilities.Connectivity relationship: tosca.relationships.Network + - local_storage: BlockStorage # Replace requirements of BlockStorage capabilities: os: properties: @@ -87,6 +88,7 @@ topology_template: protocol: tcp network_name: PRIVATE initiator: source + ConsulAgentDC1: type: org.ystia.yorc.experimental.consul.linux.ansible.nodes.ConsulAgent properties: @@ -154,13 +156,15 @@ topology_template: type: tosca.nodes.BlockStorage properties: size: "1 GIB" - device: "/dev/vdb" - requirements: - - attachToComputeCsdc1Attach: - type_requirement: attachment - node: ComputeCSDC1 - capability: tosca.capabilities.Attachment - relationship: tosca.relationships.AttachTo +# device: "/dev/vdb" # not a property of tosca.nodes.BlockStorage, isn't it? +# +# attachment is not a requirement of BlockStorage +# requirements: +# - attachToComputeCsdc1Attach: +# type_requirement: attachment +# node: ComputeCSDC1 +# capability: tosca.capabilities.Attachment +# relationship: tosca.relationships.AttachTo LinuxFileSystem: type: alien.nodes.LinuxFileSystem properties: diff --git a/org/ystia/flink/linux/bash/types.yml b/org/ystia/flink/linux/bash/types.yml index daade42f..b27af427 100644 --- a/org/ystia/flink/linux/bash/types.yml +++ b/org/ystia/flink/linux/bash/types.yml @@ -44,7 +44,7 @@ node_types: type: integer description: > JVM heap size (in megabytes) for the JobManager - default: "512" + default: 512 # integer instead of string, isn't it? repository: type: string default: http://archive.apache.org/dist/flink @@ -118,7 +118,7 @@ node_types: This value should be as large as possible. If the cluster is exclusively running Flink, the total amount of available memory per machine minus some memory for the operating system (maybe 1-2 GB) is a good value. - default: "512" + default: 512 # should be an integer instead of a string, shouldn't it? taskmanager_numberOfTaskSlots: type: integer description: > diff --git a/org/ystia/kibana/linux/bash/types.yml b/org/ystia/kibana/linux/bash/types.yml index fac9fe73..b616ac91 100644 --- a/org/ystia/kibana/linux/bash/types.yml +++ b/org/ystia/kibana/linux/bash/types.yml @@ -11,7 +11,7 @@ metadata: template_version: 2.2.0-SNAPSHOT template_author: Ystia -description: +description: '' # instead of null, isn't it? imports: - tosca-normative-types:1.0.0-ALIEN20 diff --git a/org/ystia/kubernetes/linux/ansible/types.yml b/org/ystia/kubernetes/linux/ansible/types.yml index 30121b6d..acd45a87 100644 --- a/org/ystia/kubernetes/linux/ansible/types.yml +++ b/org/ystia/kubernetes/linux/ansible/types.yml @@ -213,7 +213,7 @@ node_types: derived_from: org.ystia.kubernetes.pub.nodes.KubernetesApp tags: icon: /images/kubernetes-app-icon.png - properties: +# properties: isn't it? interfaces: Standard: inputs: diff --git a/org/ystia/logstash/linux/bash/types.yml b/org/ystia/logstash/linux/bash/types.yml index 858b8537..ed10beab 100644 --- a/org/ystia/logstash/linux/bash/types.yml +++ b/org/ystia/logstash/linux/bash/types.yml @@ -11,7 +11,7 @@ metadata: template_version: 2.2.0-SNAPSHOT template_author: Ystia -description: +description: '' # instead of null, isn't it? imports: - tosca-normative-types:1.0.0-ALIEN20 diff --git a/org/ystia/samples/topologies/elk_apache_log_generator/types.yml b/org/ystia/samples/topologies/elk_apache_log_generator/types.yml index a2db751d..e4e2096c 100644 --- a/org/ystia/samples/topologies/elk_apache_log_generator/types.yml +++ b/org/ystia/samples/topologies/elk_apache_log_generator/types.yml @@ -104,8 +104,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/samples/topologies/elk_beats/types.yml b/org/ystia/samples/topologies/elk_beats/types.yml index 7011d681..7cfb1b87 100644 --- a/org/ystia/samples/topologies/elk_beats/types.yml +++ b/org/ystia/samples/topologies/elk_beats/types.yml @@ -127,8 +127,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/samples/topologies/elk_dummylogs/types.yml b/org/ystia/samples/topologies/elk_dummylogs/types.yml index 2e01482c..a021bcc9 100644 --- a/org/ystia/samples/topologies/elk_dummylogs/types.yml +++ b/org/ystia/samples/topologies/elk_dummylogs/types.yml @@ -104,8 +104,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/samples/topologies/elk_heartbeat/types.yml b/org/ystia/samples/topologies/elk_heartbeat/types.yml index 257982a2..670658d0 100644 --- a/org/ystia/samples/topologies/elk_heartbeat/types.yml +++ b/org/ystia/samples/topologies/elk_heartbeat/types.yml @@ -87,8 +87,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/samples/topologies/elk_nifi/types.yml b/org/ystia/samples/topologies/elk_nifi/types.yml index 185e2039..ac20a16b 100644 --- a/org/ystia/samples/topologies/elk_nifi/types.yml +++ b/org/ystia/samples/topologies/elk_nifi/types.yml @@ -83,8 +83,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/samples/topologies/elk_twitter/types.yml b/org/ystia/samples/topologies/elk_twitter/types.yml index 952c24c2..ed557df0 100644 --- a/org/ystia/samples/topologies/elk_twitter/types.yml +++ b/org/ystia/samples/topologies/elk_twitter/types.yml @@ -129,8 +129,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/tests/topologies/elk_elastic/types.yml b/org/ystia/tests/topologies/elk_elastic/types.yml index f07c95ed..749f36ca 100644 --- a/org/ystia/tests/topologies/elk_elastic/types.yml +++ b/org/ystia/tests/topologies/elk_elastic/types.yml @@ -42,8 +42,10 @@ topology_template: Compute: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/tests/topologies/elk_kafka/types.yml b/org/ystia/tests/topologies/elk_kafka/types.yml index 047aae87..0630445c 100644 --- a/org/ystia/tests/topologies/elk_kafka/types.yml +++ b/org/ystia/tests/topologies/elk_kafka/types.yml @@ -57,7 +57,7 @@ topology_template: node: Compute Kafka: type: org.ystia.kafka.linux.bash.nodes.Kafka - properties: + properties: {} # instead of null or remove this line, isn't it? requirements: - host: node: Java diff --git a/org/ystia/tests/topologies/elk_kibana/types.yml b/org/ystia/tests/topologies/elk_kibana/types.yml index 5b75265f..5e8e48b7 100644 --- a/org/ystia/tests/topologies/elk_kibana/types.yml +++ b/org/ystia/tests/topologies/elk_kibana/types.yml @@ -81,8 +81,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/tests/topologies/nifi/types.yml b/org/ystia/tests/topologies/nifi/types.yml index c2806972..8143ac2e 100644 --- a/org/ystia/tests/topologies/nifi/types.yml +++ b/org/ystia/tests/topologies/nifi/types.yml @@ -49,8 +49,10 @@ topology_template: Compute: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/topologies/a4c_yorc_basic_secured/types.yaml b/org/ystia/topologies/a4c_yorc_basic_secured/types.yaml index 1d1f3a47..1b3cae6b 100644 --- a/org/ystia/topologies/a4c_yorc_basic_secured/types.yaml +++ b/org/ystia/topologies/a4c_yorc_basic_secured/types.yaml @@ -327,7 +327,7 @@ topology_template: capability: org.ystia.yorc.pub.capabilities.YorcConfigContainer relationship: org.ystia.yorc.linux.ansible.relationships.YorcConfigOpenstackHostedOnYorc - openstackSecretsHostedOnVault: - type_requirement: host + type_requirement: vault node: VaultServer capability: org.alien4cloud.vault.pub.capabilities.VaultServer relationship: org.ystia.yorc.linux.ansible.relationships.OpenstackSecretsOnVault diff --git a/org/ystia/topologies/elk_basic/types.yml b/org/ystia/topologies/elk_basic/types.yml index 33b8fee2..d4df1b0a 100644 --- a/org/ystia/topologies/elk_basic/types.yml +++ b/org/ystia/topologies/elk_basic/types.yml @@ -84,8 +84,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/topologies/elk_broker/types.yml b/org/ystia/topologies/elk_broker/types.yml index d300b8b1..73d42371 100644 --- a/org/ystia/topologies/elk_broker/types.yml +++ b/org/ystia/topologies/elk_broker/types.yml @@ -91,8 +91,10 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network @@ -152,8 +154,8 @@ topology_template: node: Elasticsearch KibanaDashboard: type: org.ystia.kibana.linux.bash.nodes.KibanaDashboard - properties: - repository: { get_input: kbn_repository } +# properties: +# repository: { get_input: kbn_repository } # This property is undefined in the KibanaDashboard node type, isn't it? requirements: - host: node: Kibana diff --git a/org/ystia/topologies/elk_geonames/types.yml b/org/ystia/topologies/elk_geonames/types.yml index 14668ee8..e5029835 100644 --- a/org/ystia/topologies/elk_geonames/types.yml +++ b/org/ystia/topologies/elk_geonames/types.yml @@ -76,8 +76,10 @@ topology_template: ComputeES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12 GB # is a property of the hot capability, isn't it? requirements: - network: node: Network diff --git a/org/ystia/topologies/elk_ha/types.yml b/org/ystia/topologies/elk_ha/types.yml index 9d3cd2c8..d0ef7c2e 100644 --- a/org/ystia/topologies/elk_ha/types.yml +++ b/org/ystia/topologies/elk_ha/types.yml @@ -100,12 +100,15 @@ topology_template: Compute_ES: type: tosca.nodes.Compute - properties: - mem_size: 12GB + capabilities: + host: + properties: + mem_size: 12GB # is a property of the hot capability, isn't it? requirements: - network: node: Network relationship: tosca.relationships.Network + - local_storage: BlockStorage_ES # Replace requirements of BlockStorage_ES capabilities: os: properties: @@ -131,11 +134,13 @@ topology_template: type: tosca.nodes.BlockStorage properties: size: "10 GB" - requirements: - - attachment: - node: Compute_ES - capability: tosca.capabilities.Attachment - relationship: tosca.relationships.AttachTo +# +# attachment is not a requirement of BlocStorage +# requirements: +# - attachment: +# node: Compute_ES +# capability: tosca.capabilities.Attachment +# relationship: tosca.relationships.AttachTo LinuxFileSystem_ES: type: alien.nodes.LinuxFileSystem properties: @@ -244,6 +249,7 @@ topology_template: - network: node: Network relationship: tosca.relationships.Network + - local_storage: BlockStorage_KFK # Replace requirements of BlockStorage_KFK capabilities: os: properties: @@ -269,11 +275,12 @@ topology_template: type: tosca.nodes.BlockStorage properties: size: "10 GB" - requirements: - - attachment: - node: Compute_KFK - capability: tosca.capabilities.Attachment - relationship: tosca.relationships.AttachTo +# attachment is not a requirement of BlocStorage +# requirements: +# - attachment: +# node: Compute_KFK +# capability: tosca.capabilities.Attachment +# relationship: tosca.relationships.AttachTo LinuxFileSystem_KFK: type: alien.nodes.LinuxFileSystem properties: diff --git a/org/ystia/topologies/jupyter/types.yml b/org/ystia/topologies/jupyter/types.yml index e81e4c16..511173aa 100644 --- a/org/ystia/topologies/jupyter/types.yml +++ b/org/ystia/topologies/jupyter/types.yml @@ -40,6 +40,7 @@ topology_template: - network: node: Network relationship: tosca.relationships.Network + - local_storage: BlockStorage # Replace requirements of BlockStorage capabilities: os: properties: @@ -58,11 +59,12 @@ topology_template: type: tosca.nodes.BlockStorage properties: size: "10 GB" - requirements: - - attachment: - node: Compute - capability: tosca.capabilities.Attachment - relationship: tosca.relationships.AttachTo +# attachment is not a requirement of BlocStorage +# requirements: +# - attachment: +# node: Compute +# capability: tosca.capabilities.Attachment +# relationship: tosca.relationships.AttachTo LinuxFileSystem: type: alien.nodes.LinuxFileSystem properties: diff --git a/org/ystia/topologies/rstudio/types.yml b/org/ystia/topologies/rstudio/types.yml index b23f3c0e..ed1c1ff0 100644 --- a/org/ystia/topologies/rstudio/types.yml +++ b/org/ystia/topologies/rstudio/types.yml @@ -39,6 +39,7 @@ topology_template: - network: node: Network relationship: tosca.relationships.Network + - local_storage: BlockStorage # Replace requirements of Blockage. capabilities: os: properties: @@ -54,11 +55,12 @@ topology_template: type: tosca.nodes.BlockStorage properties: size: "10 GB" - requirements: - - attachment: - node: Compute - capability: tosca.capabilities.Attachment - relationship: tosca.relationships.AttachTo +# attachment is not a requirement of BlocStorage +# requirements: +# - attachment: +# node: Compute +# capability: tosca.capabilities.Attachment +# relationship: tosca.relationships.AttachTo LinuxFileSystem: type: alien.nodes.LinuxFileSystem properties: @@ -70,7 +72,7 @@ topology_template: node: BlockStorage RStudio: type: org.ystia.rstudio.linux.bash.nodes.RStudio - properties: + properties: {} # instead of null or remove this line, isn't it? requirements: - host: node: Java diff --git a/org/ystia/yorc/yorc/linux/ansible/types.yaml b/org/ystia/yorc/yorc/linux/ansible/types.yaml index 3f76cd0d..8a58ebb0 100644 --- a/org/ystia/yorc/yorc/linux/ansible/types.yaml +++ b/org/ystia/yorc/yorc/linux/ansible/types.yaml @@ -349,4 +349,5 @@ relationship_types: USE_OPENSSH: { get_property: [SOURCE, use_openssh] } INVENTORY: { get_property: [SOURCE, inventory] } implementation: playbooks/configure_ansible.yml - valid_source_types: ["org.ystia.yorc.pub.nodes.YorcServer"] +# valid_source_types is not a relationship definition keyword +# valid_source_types: ["org.ystia.yorc.pub.nodes.YorcServer"]