Merge hotfix changes

api/swagger.json

@@ -15,9 +15,8 @@
         "version": "1.0.0"
     },
     "host": "localhost:8080",
-    "basePath": "/api",
     "paths": {
-        "/clusters/": {
+        "/api/clusters/": {
             "get": {
                 "security": [
                     {
@@ -74,7 +73,7 @@
                 }
             }
         },
-        "/jobs/": {
+        "/api/jobs/": {
             "get": {
                 "security": [
                     {
@@ -169,7 +168,7 @@
                 }
             }
         },
-        "/jobs/delete_job/": {
+        "/api/jobs/delete_job/": {
             "delete": {
                 "security": [
                     {
@@ -244,7 +243,7 @@
                 }
             }
         },
-        "/jobs/delete_job/{id}": {
+        "/api/jobs/delete_job/{id}": {
             "delete": {
                 "security": [
                     {
@@ -314,7 +313,7 @@
                 }
             }
         },
-        "/jobs/delete_job_before/{ts}": {
+        "/api/jobs/delete_job_before/{ts}": {
             "delete": {
                 "security": [
                     {
@@ -384,7 +383,7 @@
                 }
             }
         },
-        "/jobs/edit_meta/{id}": {
+        "/api/jobs/edit_meta/{id}": {
             "post": {
                 "security": [
                     {
@@ -454,7 +453,7 @@
                 }
             }
         },
-        "/jobs/start_job/": {
+        "/api/jobs/start_job/": {
             "post": {
                 "security": [
                     {
@@ -523,7 +522,7 @@
                 }
             }
         },
-        "/jobs/stop_job/": {
+        "/api/jobs/stop_job/": {
             "post": {
                 "security": [
                     {
@@ -595,7 +594,7 @@
                 }
             }
         },
-        "/jobs/tag_job/{id}": {
+        "/api/jobs/tag_job/{id}": {
             "post": {
                 "security": [
                     {
@@ -668,7 +667,7 @@
                 }
             }
         },
-        "/jobs/{id}": {
+        "/api/jobs/{id}": {
             "get": {
                 "security": [
                     {
@@ -827,7 +826,7 @@
                 }
             }
         },
-        "/notice/": {
+        "/config/notice/": {
             "post": {
                 "security": [
                     {
@@ -893,7 +892,7 @@
                 }
             }
         },
-        "/user/{id}": {
+        "/config/user/{id}": {
             "post": {
                 "security": [
                     {
@@ -998,7 +997,7 @@
                 }
             }
         },
-        "/users/": {
+        "/config/users/": {
             "get": {
                 "security": [
                     {

api/swagger.yaml

@@ -1,4 +1,3 @@
-basePath: /api
 definitions:
   api.ApiReturnedUser:
     properties:
@@ -671,7 +670,7 @@ info:
   title: ClusterCockpit REST API
   version: 1.0.0
 paths:
-  /clusters/:
+  /api/clusters/:
     get:
       description: Get a list of all cluster configs. Specific cluster can be requested
         using query parameter.
@@ -708,7 +707,7 @@ paths:
       summary: Lists all cluster configs
       tags:
       - Cluster query
-  /jobs/:
+  /api/jobs/:
     get:
       description: |-
         Get a list of all jobs. Filters can be applied using query parameters.
@@ -773,7 +772,7 @@ paths:
       summary: Lists all jobs
       tags:
       - Job query
-  /jobs/{id}:
+  /api/jobs/{id}:
     get:
       description: |-
         Job to get is specified by database ID
@@ -882,7 +881,7 @@ paths:
       summary: Get job meta and configurable metric data
       tags:
       - Job query
-  /jobs/delete_job/:
+  /api/jobs/delete_job/:
     delete:
       consumes:
       - application/json
@@ -932,7 +931,7 @@ paths:
       summary: Remove a job from the sql database
       tags:
       - Job remove
-  /jobs/delete_job/{id}:
+  /api/jobs/delete_job/{id}:
     delete:
       description: Job to remove is specified by database ID. This will not remove
         the job from the job archive.
@@ -979,7 +978,7 @@ paths:
       summary: Remove a job from the sql database
       tags:
       - Job remove
-  /jobs/delete_job_before/{ts}:
+  /api/jobs/delete_job_before/{ts}:
     delete:
       description: Remove all jobs with start time before timestamp. The jobs will
         not be removed from the job archive.
@@ -1026,7 +1025,7 @@ paths:
       summary: Remove a job from the sql database
       tags:
       - Job remove
-  /jobs/edit_meta/{id}:
+  /api/jobs/edit_meta/{id}:
     post:
       consumes:
       - application/json
@@ -1073,7 +1072,7 @@ paths:
       summary: Edit meta-data json
       tags:
       - Job add and modify
-  /jobs/start_job/:
+  /api/jobs/start_job/:
     post:
       consumes:
       - application/json
@@ -1120,7 +1119,7 @@ paths:
       summary: Adds a new job as "running"
       tags:
       - Job add and modify
-  /jobs/stop_job/:
+  /api/jobs/stop_job/:
     post:
       description: |-
         Job to stop is specified by request body. All fields are required in this case.
@@ -1168,7 +1167,7 @@ paths:
       summary: Marks job as completed and triggers archiving
       tags:
       - Job add and modify
-  /jobs/tag_job/{id}:
+  /api/jobs/tag_job/{id}:
     post:
       consumes:
       - application/json
@@ -1218,7 +1217,7 @@ paths:
       summary: Adds one or more tags to a job
       tags:
       - Job add and modify
-  /notice/:
+  /config/notice/:
     post:
       consumes:
       - multipart/form-data
@@ -1263,7 +1262,7 @@ paths:
       summary: Updates or empties the notice box content
       tags:
       - User
-  /user/{id}:
+  /config/user/{id}:
     post:
       consumes:
       - multipart/form-data
@@ -1337,7 +1336,7 @@ paths:
       summary: Updates an existing user
       tags:
       - User
-  /users/:
+  /config/users/:
     delete:
       consumes:
       - multipart/form-data