Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected syntaxic and typing errors #87

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

Conversation

philippemerle
Copy link

Pull Request description

This PR proposes corrections of some syntaxic and typing errors found in TOSCA templates.

Description of the change

corrections of some syntaxic and typing errors found in TOSCA templates.

What I did

corrections of some syntaxic and typing errors found in TOSCA templates.

How I did it

Using the TOSCAware parser.

How to verify it

Description for the changelog

Applicable Issues

@@ -119,12 +120,13 @@ topology_template:
default_instances: 1
BlockStorage:
type: tosca.nodes.BlockStorage
requirements:
Copy link
Member

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.

@@ -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

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)

@@ -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

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)

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

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)

@@ -154,13 +156,15 @@ topology_template:
type: tosca.nodes.BlockStorage
properties:
size: "1 GIB"
device: "/dev/vdb"
Copy link
Member

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...

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

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

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

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

@@ -104,8 +104,10 @@ topology_template:

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

Choose a reason for hiding this comment

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

I have to check

@@ -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

Choose a reason for hiding this comment

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

Not sure, will check

@@ -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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants