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

Add tosca.capabilities.Compute as in profile v1.3 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions normative-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ capability_types:
description: >
The Container capability, when included on a Node Type or Template definition, indicates that the node can act as a container for (or a host for)
one or more other declared Node Types.
tosca.capabilities.Compute:
derived_from: tosca.capabilities.Container
description: >
The Compute capability, when included on a Node Type or Template definition, indicates that the node can provide hosting on a named compute resource.
properties:
num_cpus:
type: integer
Expand Down Expand Up @@ -485,7 +489,7 @@ node_types:
# occurrences: [0, UNBOUNDED]
capabilities:
host:
type: tosca.capabilities.Container
type: tosca.capabilities.Compute
#valid_source_types: [ tosca.nodes.SoftwareComponent ]
os:
type: tosca.capabilities.OperatingSystem
Expand Down Expand Up @@ -514,7 +518,7 @@ node_types:
# required: false
requirements:
- host:
capability: tosca.capabilities.Container
capability: tosca.capabilities.Compute
node: tosca.nodes.Compute
relationship: tosca.relationships.HostedOn
tosca.nodes.WebServer:
Expand All @@ -528,7 +532,7 @@ node_types:
data_endpoint: tosca.capabilities.Endpoint
admin_endpoint: tosca.capabilities.Endpoint.Admin
host:
type: tosca.capabilities.Container
type: tosca.capabilities.Compute
valid_source_types: [ tosca.nodes.WebApplication ]
tosca.nodes.WebApplication:
abstract: true
Expand All @@ -547,7 +551,7 @@ node_types:
type: tosca.capabilities.Endpoint
requirements:
- host:
capability: tosca.capabilities.Container
capability: tosca.capabilities.Compute
node: tosca.nodes.WebServer
relationship: tosca.relationships.HostedOn
tosca.nodes.DBMS:
Expand All @@ -567,7 +571,7 @@ node_types:
description: the port the DBMS service will listen to for data and requests
capabilities:
host:
type: tosca.capabilities.Container
type: tosca.capabilities.Compute
valid_source_types: [ tosca.nodes.Database ]
tosca.nodes.Database:
abstract: true
Expand All @@ -593,7 +597,7 @@ node_types:
required: false
requirements:
- host:
capability: tosca.capabilities.Container
capability: tosca.capabilities.Compute
node: tosca.nodes.DBMS
relationship: tosca.relationships.HostedOn
capabilities:
Expand Down Expand Up @@ -669,7 +673,7 @@ node_types:
single Compute host.
capabilities:
host:
type: tosca.capabilities.Container
type: tosca.capabilities.Compute
scalable:
type: tosca.capabilities.Scalable
tosca.nodes.Container.Application:
Expand All @@ -679,7 +683,7 @@ node_types:
The TOSCA Container Application node represents an application that requires Container-level virtualization technology.
requirements:
- host:
capability: tosca.capabilities.Container
capability: tosca.capabilities.Compute
node: tosca.nodes.Container.Runtime
relationship: tosca.relationships.HostedOn
tosca.nodes.LoadBalancer:
Expand Down