Merge pull request #992 from mguidon/freeze_branch_isan_0

Freeze branch isan 0

Author: mguidon

api/specs/shared/schemas/running_service.yaml

@@ -20,6 +20,7 @@ components:
         - service_version
         - service_host
         - service_port
+        - service_state
       properties:
         published_port:
           description: The ports where the service provides its interface
@@ -65,3 +66,26 @@ components:
           type: string
           example: '/x/E1O2E-LAH'
           default: ''
+        service_state:
+          description: >
+            the service state
+            * 'pending' - The service is waiting for resources to start
+            * 'pulling' - The service is being pulled from the registry
+            * 'starting' - The service is starting
+            * 'running' - The service is running
+            * 'complete' - The service completed
+            * 'failed' - The service failed to start
+          type: string
+          enum:
+            - pending
+            - pulling
+            - starting
+            - running
+            - complete
+            - failed
+        service_message:
+          description: >-
+            the service message
+          type: string
+          example: no suitable node (insufficient resources on 1 node)
+

api/specs/webserver/v0/components/schemas/project-v0.0.1-converted.yaml

@@ -35,14 +35,14 @@ properties:
     type: string
     description: project creation date
     pattern: >-
-      \d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\d)T(2[0-3]|1\d|0?[1-9])(:(\d|[0-5]\d)){2}(\.\d{3})?Z
+      \d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\d)T(2[0-3]|1\d|0?[0-9])(:(\d|[0-5]\d)){2}(\.\d{3})?Z
     example:
       - '2018-07-01T11:13:43Z'
   lastChangeDate:
     type: string
     description: last save date
     pattern: >-
-      \d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\d)T(2[0-3]|1\d|0?[1-9])(:(\d|[0-5]\d)){2}(\.\d{3})?Z
+      \d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\d)T(2[0-3]|1\d|0?[0-9])(:(\d|[0-5]\d)){2}(\.\d{3})?Z
     example:
       - '2018-07-01T11:13:43Z'
   thumbnail:
@@ -114,7 +114,7 @@ properties:
                       output:
                         type: string
                   - type: object
-                    additionalProperties: true
+                    additionalProperties: false
                     required:
                       - store
                       - path
@@ -125,8 +125,6 @@ properties:
                           - integer
                       path:
                         type: string
-                      label:
-                        type: string
           inputAccess:
             description: map with key - access level pairs
             type: object
@@ -161,7 +159,7 @@ properties:
                       - number
                       - 'null'
                   - type: object
-                    additionalProperties: true
+                    additionalProperties: false
                     required:
                       - store
                       - path
@@ -172,8 +170,6 @@ properties:
                           - integer
                       path:
                         type: string
-                      label:
-                        type: string
           outputNode:
             type: boolean
           parent:

api/specs/webserver/v0/components/schemas/project-v0.0.1.json

@@ -45,15 +45,15 @@
     "creationDate": {
       "type": "string",
       "description": "project creation date",
-      "pattern": "\\d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\\d)T(2[0-3]|1\\d|0?[1-9])(:(\\d|[0-5]\\d)){2}(\\.\\d{3})?Z",
+      "pattern": "\\d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\\d)T(2[0-3]|1\\d|0?[0-9])(:(\\d|[0-5]\\d)){2}(\\.\\d{3})?Z",
       "examples": [
         "2018-07-01T11:13:43Z"
       ]
     },
     "lastChangeDate": {
       "type": "string",
       "description": "last save date",
-      "pattern": "\\d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\\d)T(2[0-3]|1\\d|0?[1-9])(:(\\d|[0-5]\\d)){2}(\\.\\d{3})?Z",
+      "pattern": "\\d{4}-(12|11|10|0?[1-9])-(31|30|[0-2]?\\d)T(2[0-3]|1\\d|0?[0-9])(:(\\d|[0-5]\\d)){2}(\\.\\d{3})?Z",
       "examples": [
         "2018-07-01T11:13:43Z"
       ]
@@ -146,7 +146,7 @@
                     },
                     {
                       "type": "object",
-                      "additionalProperties": true,
+                      "additionalProperties": false,
                       "required": [
                         "store",
                         "path"
@@ -157,9 +157,6 @@
                         },
                         "path": {
                           "type": "string"
-                        },
-                        "label": {
-                          "type": "string"
                         }
                       }
                     }
@@ -209,7 +206,7 @@
                     },
                     {
                       "type": "object",
-                      "additionalProperties": true,
+                      "additionalProperties": false,
                       "required": [
                         "store",
                         "path"
@@ -220,9 +217,6 @@
                         },
                         "path": {
                           "type": "string"
-                        },
-                        "label": {
-                          "type": "string"
                         }
                       }
                     }

api/specs/webserver/v0/openapi-projects.yaml

@@ -76,6 +76,11 @@ paths:
         required: true
         schema:
           type: string
+      - name: run
+        in: path
+        required: false
+        schema:
+          type: boolean
     get:
       summary: Gets given project
       operationId: get_project