Skip to content
This repository was archived by the owner on Nov 6, 2025. It is now read-only.

Corrected syntaxic and typing errors #87

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Corrected syntaxic and typing errors #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions org/ystia/docker/topologies/secured-docker-registry/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ topology_template:
node: Network
capability: tosca.capabilities.Connectivity
relationship: tosca.relationships.Network
- local_storage: BlockStorage # Replace requirements of BlockStorage
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

capabilities:
os:
properties:
Expand Down Expand Up @@ -119,12 +120,13 @@ topology_template:
default_instances: 1
BlockStorage:
type: tosca.nodes.BlockStorage
requirements:
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well you are hitting one of the major differences between Alien and TOSCA see known differences here the attachment relation between Computes and BlockStorage are reversed.

Note that in Yorc we do follow the specification and we automatically reverse those relationships.
But to be imported into Alien we have to define those relationships as expected by Alien.
So please revert your modifications on attachements.

- 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:
Expand Down
18 changes: 11 additions & 7 deletions org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ topology_template:
node: PublicNetwork
capability: tosca.capabilities.Connectivity
relationship: tosca.relationships.Network
- local_storage: BlockStorage # Replace requirements of BlockStorage
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

capabilities:
os:
properties:
Expand All @@ -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:
Expand Down Expand Up @@ -154,13 +156,15 @@ topology_template:
type: tosca.nodes.BlockStorage
properties:
size: "1 GIB"
device: "/dev/vdb"
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another difference between Alien and the spec... Device is a property of the BlockStorage.
Please revert...

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?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

#
# 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:
Expand Down
4 changes: 2 additions & 2 deletions org/ystia/flink/linux/bash/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove comment

repository:
type: string
default: http://archive.apache.org/dist/flink
Expand Down Expand Up @@ -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?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove comment

taskmanager_numberOfTaskSlots:
type: integer
description: >
Expand Down
2 changes: 1 addition & 1 deletion org/ystia/kibana/linux/bash/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
template_version: 2.2.0-SNAPSHOT
template_author: Ystia

description:
description: '' # instead of null, isn't it?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove the line


imports:
- tosca-normative-types:1.0.0-ALIEN20
Expand Down
2 changes: 1 addition & 1 deletion org/ystia/kubernetes/linux/ansible/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove the line

interfaces:
Standard:
inputs:
Expand Down
2 changes: 1 addition & 1 deletion org/ystia/logstash/linux/bash/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
template_version: 2.2.0-SNAPSHOT
template_author: Ystia

description:
description: '' # instead of null, isn't it?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove the line


imports:
- tosca-normative-types:1.0.0-ALIEN20
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/samples/topologies/elk_apache_log_generator/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,10 @@ topology_template:

Compute_ES:
type: tosca.nodes.Compute
properties:
mem_size: 12GB
capabilities:
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to check

host:
properties:
mem_size: 12 GB # is a property of the hot capability, isn't it?
requirements:
- network:
node: Network
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/samples/topologies/elk_beats/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/samples/topologies/elk_dummylogs/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/samples/topologies/elk_heartbeat/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/samples/topologies/elk_nifi/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/samples/topologies/elk_twitter/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/tests/topologies/elk_elastic/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org/ystia/tests/topologies/elk_kafka/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove the line

requirements:
- host:
node: Java
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/tests/topologies/elk_kibana/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/tests/topologies/nifi/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org/ystia/topologies/a4c_yorc_basic_secured/types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, will check

node: VaultServer
capability: org.alien4cloud.vault.pub.capabilities.VaultServer
relationship: org.ystia.yorc.linux.ansible.relationships.OpenstackSecretsOnVault
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/topologies/elk_basic/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions org/ystia/topologies/elk_broker/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -152,8 +154,8 @@ topology_template:
node: Elasticsearch
KibanaDashboard:
type: org.ystia.kibana.linux.bash.nodes.KibanaDashboard
properties:
repository: { get_input: kbn_repository }
# properties:
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, please remove the line

# repository: { get_input: kbn_repository } # This property is undefined in the KibanaDashboard node type, isn't it?
requirements:
- host:
node: Kibana
Expand Down
6 changes: 4 additions & 2 deletions org/ystia/topologies/elk_geonames/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 19 additions & 12 deletions org/ystia/topologies/elk_ha/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

capabilities:
os:
properties:
Expand All @@ -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
#
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

# 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:
Expand Down Expand Up @@ -244,6 +249,7 @@ topology_template:
- network:
node: Network
relationship: tosca.relationships.Network
- local_storage: BlockStorage_KFK # Replace requirements of BlockStorage_KFK
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

capabilities:
os:
properties:
Expand All @@ -269,11 +275,12 @@ topology_template:
type: tosca.nodes.BlockStorage
properties:
size: "10 GB"
requirements:
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

- 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:
Expand Down
12 changes: 7 additions & 5 deletions org/ystia/topologies/jupyter/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ topology_template:
- network:
node: Network
relationship: tosca.relationships.Network
- local_storage: BlockStorage # Replace requirements of BlockStorage
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

capabilities:
os:
properties:
Expand All @@ -58,11 +59,12 @@ topology_template:
type: tosca.nodes.BlockStorage
properties:
size: "10 GB"
requirements:
Copy link
Member

@loicalbertin loicalbertin May 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (see comment on attachements)

- 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:
Expand Down
Loading