diff --git a/translator/toscalib/elements/TOSCA_definition.yaml b/translator/toscalib/elements/TOSCA_definition.yaml index fbfd684..e840ec1 100644 --- a/translator/toscalib/elements/TOSCA_definition.yaml +++ b/translator/toscalib/elements/TOSCA_definition.yaml @@ -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: diff --git a/translator/toscalib/tests/test_toscatplvalidation.py b/translator/toscalib/tests/test_toscatplvalidation.py index eb5197e..1549696 100644 --- a/translator/toscalib/tests/test_toscatplvalidation.py +++ b/translator/toscalib/tests/test_toscatplvalidation.py @@ -464,7 +464,7 @@ class ToscaTemplateValidationTest(TestCase): server: type: tosca.nodes.WebServer capabilities: - http_endpoint: + data_endpoint: properties: initiator: test '''