updated swagger

TOSCA/types/nodes.yaml

@@ -4,9 +4,18 @@ node_types:
 
   tosca.nodes.ARTICONF.Root:
     description: root ARTICONF node
+    attributes:
+      current_state:
+        type: string
+        required: false
+        description: the current state of the node
+      desired_state:
+        type: string
+        required: false
+        description: the current state of the node
 
   tosca.nodes.ARTICONF.Container.Application.Docker:
-    derived_from:  tosca.nodes.ARTICONF.Root
+    derived_from:  tosca.nodes.ARTICONF.Application
     description: description of container
     properties:
       ports:
@@ -41,7 +50,7 @@ node_types:
         description: url of the service 
           
   tosca.nodes.ARTICONF.docker.Orchestrator:
-    derived_from: tosca.nodes.ARTICONF.Root
+    derived_from: tosca.nodes.ARTICONF.Application
     description: a container orchestrator
     requirements:
       - host:
@@ -239,3 +248,7 @@ node_types:
         type: tosca.capabilities.Compute
       node:
         type: tosca.capabilities.Node
+        
+  tosca.nodes.ARTICONF.Application:
+    derived_from:  tosca.nodes.ARTICONF.Root
+    description: Base application node    

docker-compose.yml

@@ -116,10 +116,10 @@ services:
     ports:
       - "30000:8080"       
             
-  sure-tosca:
-    image: sure-tosca:3.0.0
-    ports: 
-      - "8081:8081"
+  #sure-tosca:
+    #image: sure-tosca:3.0.0
+    #ports: 
+      #- "8081:8081"
     
   planner:
     depends_on:

openAPI/API/CONF-3.0.0-swagger.yaml

@@ -127,7 +127,7 @@ paths:
         - read:ToscaTemplate
     delete:
       summary: Deletes a tosca topology template
-      description: ""
+      description: If the topology is provisoned it will delete the provison (Infrastructure). If it is deployed it will delete the deploymet too (Application)
       operationId: deleteToscaTemplateByID
       parameters:
       - name: id
@@ -135,6 +135,14 @@ paths:
         description: ID of topology template to return
         required: true
         type: string
+      - name: node_names
+        in: query
+        description: The node(s) to delete
+        required: false
+        type: array
+        items:
+          type: string
+        collectionFormat: multi
       responses:
         "200":
           description: successful operation
@@ -179,7 +187,7 @@ paths:
   /provisioner/provision/{id}:
     get:
       summary: provision tosca template
-      description: 'provosions the operationId: Plan Tosca Template Returns the provision ID'
+      description: deletes the provisioned Infrastructure
       operationId: provisionPlanToscaTemplateByID
       produces:
       - text/plain
@@ -204,6 +212,43 @@ paths:
       - auth:
         - write:ToscaTemplate
         - read:ToscaTemplate
+  /scaler/{id}:
+    get:
+      summary: scale tosca template
+      operationId: scaleProvisionedToscaTemplateByID
+      produces:
+      - text/plain
+      parameters:
+      - name: id
+        in: path
+        description: ID of topolog template to scale
+        required: true
+        type: string
+      - name: node_name
+        in: query
+        description: The node to scale
+        required: true
+        type: string
+      - name: node_num
+        in: query
+        description: The number of nodes to scale
+        required: true
+        type: integer
+      responses:
+        "200":
+          description: successful operation
+          schema:
+            type: string
+        "400":
+          description: Invalid ID supplied
+        "404":
+          description: ToscaTemplate not found
+        "405":
+          description: Invalid input
+      security:
+      - auth:
+        - write:ToscaTemplate
+        - read:ToscaTemplate
   /deployer/deploy/{id}:
     get:
       summary: deploy the software tosca template