openstack/deb-python-tosca-parser
Code Issues Proposed changes

Merge "Update definition of tosca.nodes.WebServer"

Browse Source
This commit is contained in:
Jenkins
2015-04-23 02:29:56 +00:00
committed by Gerrit Code Review
parent fc0bc51a9a ce7cfb31de
commit ba4c9974c7
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
translator/toscalib/elements/TOSCA_definition.yaml
View File

@@ -125,10 +125,10 @@ tosca.nodes.Database:
tosca.nodes.WebServer:
derived_from: tosca.nodes.SoftwareComponent
capabilities:
http_endpoint:
type: tosca.capabilities.Endpoint
https_endpoint:
data_endpoint:
type: tosca.capabilities.Endpoint
admin_endpoint:
type: tosca.capabilities.Endpoint.Admin
host:
type: tosca.capabilities.Container
valid_source_types: [tosca.nodes.WebApplication]
@@ -372,6 +372,11 @@ tosca.capabilities.Endpoint:
ip_address:
type: string
tosca.capabilities.Endpoint.Admin:
derived_from: tosca.capabilities.Endpoint
properties:
secure: true
tosca.capabilities.Scalable:
derived_from: tosca.capabilities.Root
properties:

2
translator/toscalib/tests/test_toscatplvalidation.py
View File

@@ -464,7 +464,7 @@ class ToscaTemplateValidationTest(TestCase):
server:
type: tosca.nodes.WebServer
capabilities:
http_endpoint:
data_endpoint:
properties:
initiator: test
'''