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.

Sign up for GitHub

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 some syntaxic and typing errors #390

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Corrected some syntaxic and typing errors #390

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5ff436
Corrected some syntaxic and typing errors
philippemerle May 3, 2019
a3d6ef4
Take suggested changes of PR#390 into account
philippemerle May 7, 2019
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
4 changes: 2 additions & 2 deletions data/tosca/yorc-google-types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ node_types:
required: false
entry_schema:
type: yorc.datatypes.google.ScratchDisk
constraints:
- greater_or_equal: 0
constraints: # must be applied to the list type instead of list entries of ScratchDisk type, isn't it?
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
# - greater_or_equal: 0 # can't be applied to a list, isn't it?
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
- max_length: 8
requirements:
- assignment:
Expand Down
2 changes: 1 addition & 1 deletion deployments/testdata/test_client_service_generated_topology.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ topology_template:
appA_capA: [ AppAInstance, appA_capA ]
appA_capA: [ AppAInstance, appA_capA ]
requirements:
hosted: [ AppAInstance, hostedOnComputeHost ]
- hosted: [ AppAInstance, hostedOnComputeHost ]
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
node_templates:
Compute:
type: yorc.nodes.hostspool.Compute
Expand Down
2 changes: 1 addition & 1 deletion deployments/testdata/test_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ imports: []
description: |
Test Component definition. Contains types as well as a template definition
data_types:
yorc.test.ComplexDataType:
yorc.test.ComplexDataType:
derived_from: tosca.datatypes.Root
properties:
nested: {type: string}
Expand Down
2 changes: 1 addition & 1 deletion deployments/testdata/test_topology_client_service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ topology_template:
secure: false
network_name: PRIVATE
initiator: source
workflows:
workflows:
install:
steps:
AppBInstance_configured:
Expand Down
2 changes: 1 addition & 1 deletion deployments/testdata/test_topology_service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ topology_template:
properties:
network_name: PRIVATE
requirements:
hosted: [ AppAInstance, hostedOnComputeHost ]
- hosted: [ AppAInstance, hostedOnComputeHost ]
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
properties:
aProp: [ AppAInstance, appA_propBString ]
attributes:
Expand Down
2 changes: 1 addition & 1 deletion prov/ansible/testdata/execTemplate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ topology_template:
node: ComputeA
capability: tosca.capabilities.Container
relationship: tosca.relationships.HostedOn
- connect:
- connect: # This requirement is not defined in the A type, isn't it?
node: NodeB
capability: yorc.types.Cap
relationship: yorc.types.Rel
Expand Down
2 changes: 1 addition & 1 deletion prov/slurm/testdata/multipleSlurmNodeAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ topology_template:
type: yorc.nodes.slurm.Compute
properties:
partition: debug
user: root
# user: root # this property is undefined, 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.

Suggested change
# user: root # this property is undefined, isn't it?

Not defined anymore, now part of the credential of the compute endpoint capability.
Let remove it.

gres: gpu:1
constraint: "[rack1*2&rack2*4]"
job_name: xyz
Expand Down
2 changes: 1 addition & 1 deletion prov/slurm/testdata/simpleSlurmNodeAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ topology_template:
type: yorc.nodes.slurm.Compute
properties:
partition: debug
user: root
# user: root # this property is undefined, isn't it?
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
gres: gpu:1
constraint: "[rack1|rack2|rack3|rack4]"
job_name: xyz
Expand Down
8 changes: 4 additions & 4 deletions prov/terraform/google/testdata/simpleComputeInstanceWithPersistentDisk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ imports:
topology_template:
node_templates:
Compute:
metadata:
metadata: {} # or remove this line
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
metadata: {} # or remove this line

Lets remove it

type: yorc.nodes.google.Compute
properties:
image_project: "centos-cloud"
Expand All @@ -28,8 +28,8 @@ topology_template:
capability: tosca.capabilities.Attachment
relationship:
type: tosca.relationships.AttachesTo
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
properties:
mode: "READ_ONLY"
# properties:
# mode: "READ_ONLY" # undefined property
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
capabilities:
endpoint:
properties:
Expand All @@ -47,7 +47,7 @@ topology_template:
max_instances: 1
default_instances: 1
BS1:
metadata:
metadata: {} # or remove this line
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
type: yorc.nodes.google.PersistentDisk
properties:
zone: "europe-west1-b"
Expand Down
4 changes: 2 additions & 2 deletions prov/terraform/google/testdata/simplePersistentDisk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ topology_template:
sha256: 5678
requirements:
- attachToComputeAttach:
type_requirement: attachment
node: Comp
type_requirement: attachment # Where is defined this requirement type?
node: Comp # Where is defined this node template?
capability: tosca.capabilities.Attachment
relationship: tosca.relationships.AttachTo
2 changes: 1 addition & 1 deletion prov/terraform/google/testdata/simpleSubnet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ topology_template:
name: "custom-subnet"
ip_cidr_range: "10.10.0.0/24"
region: "europe-west1"
description: "mydesc"
# description: "mydesc" # this property is not defined in the type, isn't it?
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
project: "myproj"
enable_flow_logs: true
private_ip_google_access: false
Expand Down
12 changes: 6 additions & 6 deletions prov/terraform/openstack/testdata/OSInstanceWithServerGroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ topology_template:
properties:
policy: "anti-affinity"
name: "sg-SimpleApp-ServerGroupPolicy"
policies:
- ServerGroupPolicy:
type: yorc.openstack.policies.ServerGroupPolicy
targets: [ ComputeA ]
properties:
policy: "anti-affinity"
# policies:
# - ServerGroupPolicy:
# type: yorc.openstack.policies.ServerGroupPolicy # undefined type
philippemerle marked this conversation as resolved.
Show resolved Hide resolved
# targets: [ ComputeA ]
# properties:
# policy: "anti-affinity"
4 changes: 2 additions & 2 deletions tasks/workflow/testdata/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ description: ""
imports:
- normative-types: <yorc-types.yml>

artifacts_types:
artifact_types:
ystia.yorc.tests.artifacts.Implementation.Custom:
derived_from: tosca.artifact.Implementation
derived_from: tosca.artifacts.Implementation

node_types:
ystia.yorc.tests.nodes.WFCompute:
Expand Down