Merge "Release D doc update"

[parser.git] / tosca2heat / tosca-parser / toscaparser / elements / TOSCA_definition_1_0.yaml

diff --git a/tosca2heat/tosca-parser/toscaparser/elements/TOSCA_definition_1_0.yaml b/tosca2heat/tosca-parser/toscaparser/elements/TOSCA_definition_1_0.yaml
index 6f3b331..9f3369e 100644 (file)
--- a/tosca2heat/tosca-parser/toscaparser/elements/TOSCA_definition_1_0.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/elements/TOSCA_definition_1_0.yaml
@@ -70,6 +70,8 @@ node_types:
            type: tosca.capabilities.OperatingSystem
         scalable:
            type: tosca.capabilities.Scalable
+        endpoint:
+           type: tosca.capabilities.Endpoint.Admin
     requirements:
       - local_storage:
           capability: tosca.capabilities.Attachment
@@ -527,6 +529,7 @@ capability_types:
       network_name:
         type: string
         required: false
+        default: PRIVATE
       initiator:
         type: string
         required: false
@@ -671,7 +674,7 @@ capability_types:
       publish_ports:
         type: list
         entry_schema:
-          type: PortSpec
+          type: tosca.datatypes.network.PortSpec
         required: false
         description: >
           List of ports mappings from source (Docker container)
@@ -679,7 +682,7 @@ capability_types:
       expose_ports:
         type: list
         entry_schema:
-          type: PortSpec
+          type: tosca.datatypes.network.PortSpec
         required: false
         description: >
           List of ports mappings from source (Docker container) to expose
@@ -799,7 +802,7 @@ data_types:
         constraints:
           - valid_values: [ udp, tcp, igmp ]
       target:
-        type: PortDef
+        type: tosca.datatypes.network.PortDef
         required: false
       target_range:
         type: range
@@ -807,7 +810,7 @@ data_types:
         constraints:
           - in_range: [ 1, 65535 ]
       source:
-        type: PortDef
+        type: tosca.datatypes.network.PortDef
         required: false
       source_range:
         type: range