Update definition of tosca.nodes.WebServer

In the latest spec, node WebServer no longer provides 'http_endpoint'
and 'https_endpoint'. Instead 'data_endpoint', 'admin_endpoint' and
its type definition is added.

partially implements: bp tosca-capabilities-endpoint
Change-Id: Ia21883d00935677a286aadcfa6ec9fbb4402b7c8

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:

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
         '''