View | Details | Raw Unified | Return to ticket 12897 | Differences between
and this patch

Collapse All | Expand All

(-)a/NEWS (+1 lines)
Lines 100-105 documents those changes that are of interest to users and administrators. Link Here
100
 -- Handle scontrol setdebug[flags] and scontrol reconfigure in slurmscriptd.
100
 -- Handle scontrol setdebug[flags] and scontrol reconfigure in slurmscriptd.
101
 -- openapi/v0.0.38 - add /licenses endpoint.
101
 -- openapi/v0.0.38 - add /licenses endpoint.
102
 -- slurmrestd - only compile JWT authentication plugin if libjwt is present.
102
 -- slurmrestd - only compile JWT authentication plugin if libjwt is present.
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
103
104
104
* Changes in Slurm 21.08.7
105
* Changes in Slurm 21.08.7
105
==========================
106
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 109-114 Link Here
109
</tr>
109
</tr>
110
</table>
110
</table>
111
111
112
<h4>Split up token and user</h4>
113
<table class="tchange">
114
<tr class="trchange">
115
	<td class="tdfield">change array values</td>
116
	<td class="tdchange" colspan=2>
117
		<ul>
118
			<li>.security</li>
119
		</ul>
120
	</td>
121
</tr>
122
</table>
123
112
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
124
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
113
125
114
<h4>add plugin</h4>
126
<h4>add plugin</h4>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-3 / +3 lines)
Lines 32-38 Link Here
32
  ],
32
  ],
33
  "security": [
33
  "security": [
34
    {
34
    {
35
      "user": [],
35
      "user": []
36
    },
37
    {
36
      "token": []
38
      "token": []
37
    }
39
    }
38
  ],
40
  ],
39
- 
40
responses
41
responses
41
--
42
NEWS                                          |  1 +
42
NEWS                                          |  1 +
43
.../openapi_release_notes/slurm-22.05.0.html  | 18 +++++
43
.../openapi_release_notes/slurm-22.05.0.html  | 18 +++++
44
src/plugins/openapi/v0.0.38/openapi.json      | 66 +++++++++++++++++++
44
src/plugins/openapi/v0.0.38/openapi.json      | 66 +++++++++++++++++++
45
3 files changed, 85 insertions(+)
45
3 files changed, 85 insertions(+)
(-)a/NEWS (+1 lines)
Lines 101-106 documents those changes that are of interest to users and administrators. Link Here
101
 -- openapi/v0.0.38 - add /licenses endpoint.
101
 -- openapi/v0.0.38 - add /licenses endpoint.
102
 -- slurmrestd - only compile JWT authentication plugin if libjwt is present.
102
 -- slurmrestd - only compile JWT authentication plugin if libjwt is present.
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
104
 -- openapi/v0.0.38 - Add schema for Slurm meta in responses.
104
105
105
* Changes in Slurm 21.08.7
106
* Changes in Slurm 21.08.7
106
==========================
107
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+18 lines)
Lines 324-329 Link Here
324
</tr>
324
</tr>
325
</table>
325
</table>
326
326
327
<h4>Add meta entry</h4>
328
<table class="tchange">
329
<tr class="trchange">
330
	<td class="tdfield">field added</td>
331
	<td class="tdchange">
332
		<ul>
333
			<li>.components.schemas."v0.0.38_diag".properties.meta</li>
334
			<li>.components.schemas."v0.0.38_pings".properties.meta</li>
335
			<li>.components.schemas."v0.0.38_partitions_response".properties.meta</li>
336
			<li>.components.schemas."v0.0.38_reservations_response".properties.meta</li>
337
			<li>.components.schemas."v0.0.38_job_submission_response".properties.meta</li>
338
			<li>.components.schemas."v0.0.38_jobs_response".properties.meta</li>
339
			<li>.components.schemas."v0.0.38_nodes_response".properties.meta</li>
340
		</ul>
341
	</td>
342
</tr>
343
</table>
344
327
<h3>openapi/v0.0.35 (src/plugins/openapi/v0.0.35/openapi.json)</h3>
345
<h3>openapi/v0.0.35 (src/plugins/openapi/v0.0.35/openapi.json)</h3>
328
346
329
<h4>Removal notice</h4>
347
<h4>Removal notice</h4>
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-2 / +66 lines)
Lines 708-713 Link Here
708
      "v0.0.38_diag": {
708
      "v0.0.38_diag": {
709
        "type": "object",
709
        "type": "object",
710
        "properties": {
710
        "properties": {
711
          "meta": {
712
            "$ref": "#/components/schemas/v0.0.38_meta"
713
          },
711
          "errors": {
714
          "errors": {
712
            "type": "array",
715
            "type": "array",
713
            "description": "slurm errors",
716
            "description": "slurm errors",
Lines 938-943 Link Here
938
      "v0.0.38_pings": {
941
      "v0.0.38_pings": {
939
        "type": "object",
942
        "type": "object",
940
        "properties": {
943
        "properties": {
944
          "meta": {
945
            "$ref": "#/components/schemas/v0.0.38_meta"
946
          },
941
          "errors": {
947
          "errors": {
942
            "type": "array",
948
            "type": "array",
943
            "description": "slurm errors",
949
            "description": "slurm errors",
Lines 1110-1115 Link Here
1110
      "v0.0.38_partitions_response": {
1116
      "v0.0.38_partitions_response": {
1111
        "type": "object",
1117
        "type": "object",
1112
        "properties": {
1118
        "properties": {
1119
          "meta": {
1120
            "$ref": "#/components/schemas/v0.0.38_meta"
1121
          },
1113
          "errors": {
1122
          "errors": {
1114
            "type": "array",
1123
            "type": "array",
1115
            "description": "slurm errors",
1124
            "description": "slurm errors",
Lines 1219-1224 Link Here
1219
      "v0.0.38_reservations_response": {
1228
      "v0.0.38_reservations_response": {
1220
        "type": "object",
1229
        "type": "object",
1221
        "properties": {
1230
        "properties": {
1231
          "meta": {
1232
            "$ref": "#/components/schemas/v0.0.38_meta"
1233
          },
1222
          "errors": {
1234
          "errors": {
1223
            "type": "array",
1235
            "type": "array",
1224
            "description": "slurm errors",
1236
            "description": "slurm errors",
Lines 1273-1278 Link Here
1273
      "v0.0.38_job_submission_response": {
1285
      "v0.0.38_job_submission_response": {
1274
        "type": "object",
1286
        "type": "object",
1275
        "properties": {
1287
        "properties": {
1288
          "meta": {
1289
            "$ref": "#/components/schemas/v0.0.38_meta"
1290
          },
1276
          "errors": {
1291
          "errors": {
1277
            "type": "array",
1292
            "type": "array",
1278
            "description": "slurm errors",
1293
            "description": "slurm errors",
Lines 1319-1324 Link Here
1319
      "v0.0.38_jobs_response": {
1334
      "v0.0.38_jobs_response": {
1320
        "type": "object",
1335
        "type": "object",
1321
        "properties": {
1336
        "properties": {
1337
          "meta": {
1338
            "$ref": "#/components/schemas/v0.0.38_meta"
1339
          },
1322
          "errors": {
1340
          "errors": {
1323
            "type": "array",
1341
            "type": "array",
1324
            "description": "slurm errors",
1342
            "description": "slurm errors",
Lines 2345-2350 Link Here
2345
      "v0.0.38_nodes_response": {
2363
      "v0.0.38_nodes_response": {
2346
        "type": "object",
2364
        "type": "object",
2347
        "properties": {
2365
        "properties": {
2366
          "meta": {
2367
            "$ref": "#/components/schemas/v0.0.38_meta"
2368
          },
2348
          "errors": {
2369
          "errors": {
2349
            "type": "array",
2370
            "type": "array",
2350
            "description": "slurm errors",
2371
            "description": "slurm errors",
Lines 2360-2365 Link Here
2360
            }
2381
            }
2361
          }
2382
          }
2362
        }
2383
        }
2384
      },
2385
      "v0.0.38_meta": {
2386
        "type": "object",
2387
        "properties": {
2388
          "plugin": {
2389
            "type": "object",
2390
            "properties": {
2391
              "type": {
2392
                "type": "string",
2393
                "description": ""
2394
              },
2395
              "name": {
2396
                "type": "string",
2397
                "description": ""
2398
              }
2399
            }
2400
          },
2401
          "Slurm": {
2402
            "type": "object",
2403
            "description": "Slurm information",
2404
            "properties": {
2405
              "version": {
2406
                "type": "object",
2407
                "properties": {
2408
                  "major": {
2409
                    "type": "string",
2410
                    "description": ""
2411
                  },
2412
                  "micro": {
2413
                    "type": "string",
2414
                    "description": ""
2415
                  },
2416
                  "minor": {
2417
                    "type": "string",
2418
                    "description": ""
2419
                  }
2420
                }
2421
              },
2422
              "release": {
2423
                "type": "string",
2424
                "description": "version specifier"
2425
              }
2426
            }
2427
          }
2428
        }
2363
      }
2429
      }
2364
    }
2430
    }
2365
  }
2431
  }
2366
- 
2367
responses
2432
responses
2368
--
2369
NEWS                                          |   1 +
2433
NEWS                                          |   1 +
2370
.../openapi_release_notes/slurm-22.05.0.html  |  33 ++++++
2434
.../openapi_release_notes/slurm-22.05.0.html  |  33 ++++++
2371
src/plugins/openapi/dbv0.0.38/openapi.json    | 111 ++++++++++++++++++
2435
src/plugins/openapi/dbv0.0.38/openapi.json    | 111 ++++++++++++++++++
2372
3 files changed, 145 insertions(+)
2436
3 files changed, 145 insertions(+)
(-)a/NEWS (+1 lines)
Lines 102-107 documents those changes that are of interest to users and administrators. Link Here
102
 -- slurmrestd - only compile JWT authentication plugin if libjwt is present.
102
 -- slurmrestd - only compile JWT authentication plugin if libjwt is present.
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
104
 -- openapi/v0.0.38 - Add schema for Slurm meta in responses.
104
 -- openapi/v0.0.38 - Add schema for Slurm meta in responses.
105
 -- openapi/dbv0.0.38 - Add schema for Slurm meta in responses.
105
106
106
* Changes in Slurm 21.08.7
107
* Changes in Slurm 21.08.7
107
==========================
108
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+33 lines)
Lines 121-126 Link Here
121
</tr>
121
</tr>
122
</table>
122
</table>
123
123
124
<h4>Add meta entry</h4>
125
<table class="tchange">
126
<tr class="trchange">
127
	<td class="tdfield">field added</td>
128
	<td class="tdchange">
129
		<ul>
130
			<li>.components.schemas."dbv0.0.38_diag".properties.meta</li>
131
			<li>.components.schemas."dbv0.0.38_account_info".properties.meta</li>
132
			<li>.components.schemas."dbv0.0.38_response_account_delete".properties.meta</li>
133
			<li>.components.schemas."dbv0.0.38_response_wckey_add".properties.meta</li>
134
			<li>.components.schemas."dbv0.0.38_wckey_info".properties.meta</li>
135
			<li>.components.schemas."dbv0.0.38_response_wckey_delete".properties.meta</li>
136
			<li>.components.schemas."dbv0.0.38_response_cluster_add".properties.meta</li>
137
			<li>.components.schemas."dbv0.0.38_response_cluster_delete".properties.meta</li>
138
			<li>.components.schemas."dbv0.0.38_response_user_update".properties.meta</li>
139
			<li>.components.schemas."dbv0.0.38_user_info".properties.meta</li>
140
			<li>.components.schemas."dbv0.0.38_response_user_delete".properties.meta</li>
141
			<li>.components.schemas."dbv0.0.38_response_association_delete".properties.meta</li>
142
			<li>.components.schemas."dbv0.0.38_associations_info".properties.meta</li>
143
			<li>.components.schemas."dbv0.0.38_qos_info".properties.meta</li>
144
			<li>.components.schemas."dbv0.0.38_response_qos_delete".properties.meta</li>
145
			<li>.components.schemas."dbv0.0.38_response_associations".properties.meta</li>
146
			<li>.components.schemas."dbv0.0.38_response_tres".properties.meta</li>
147
			<li>.components.schemas."dbv0.0.38_tres_info".properties.meta</li>
148
			<li>.components.schemas."dbv0.0.38_job_info".properties.meta</li>
149
			<li>.components.schemas."dbv0.0.38_config_info".properties.meta</li>
150
			<li>.components.schemas."dbv0.0.38_account_response".properties.meta</li>
151
			<li>.components.schemas."dbv0.0.38_config_response".properties.meta</li>
152
		</ul>
153
	</td>
154
</tr>
155
</table>
156
124
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
157
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
125
158
126
<h4>add plugin</h4>
159
<h4>add plugin</h4>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-2 / +111 lines)
Lines 1488-1493 Link Here
1488
    "schemas": {
1488
    "schemas": {
1489
      "dbv0.0.38_diag": {
1489
      "dbv0.0.38_diag": {
1490
        "properties": {
1490
        "properties": {
1491
          "meta": {
1492
            "$ref": "#/components/schemas/v0.0.38_meta"
1493
          },
1491
          "errors": {
1494
          "errors": {
1492
            "type": "array",
1495
            "type": "array",
1493
            "description": "Slurm errors",
1496
            "description": "Slurm errors",
Lines 1639-1644 Link Here
1639
      "dbv0.0.38_account_info": {
1642
      "dbv0.0.38_account_info": {
1640
        "type": "object",
1643
        "type": "object",
1641
        "properties": {
1644
        "properties": {
1645
          "meta": {
1646
            "$ref": "#/components/schemas/v0.0.38_meta"
1647
          },
1642
          "errors": {
1648
          "errors": {
1643
            "type": "array",
1649
            "type": "array",
1644
            "description": "Slurm errors",
1650
            "description": "Slurm errors",
Lines 1692-1697 Link Here
1692
      "dbv0.0.38_response_account_delete": {
1698
      "dbv0.0.38_response_account_delete": {
1693
        "type": "object",
1699
        "type": "object",
1694
        "properties": {
1700
        "properties": {
1701
          "meta": {
1702
            "$ref": "#/components/schemas/v0.0.38_meta"
1703
          },
1695
          "errors": {
1704
          "errors": {
1696
            "type": "array",
1705
            "type": "array",
1697
            "description": "Slurm errors",
1706
            "description": "Slurm errors",
Lines 1704-1709 Link Here
1704
      "dbv0.0.38_response_wckey_add": {
1713
      "dbv0.0.38_response_wckey_add": {
1705
        "type": "object",
1714
        "type": "object",
1706
        "properties": {
1715
        "properties": {
1716
          "meta": {
1717
            "$ref": "#/components/schemas/v0.0.38_meta"
1718
          },
1707
          "errors": {
1719
          "errors": {
1708
            "type": "array",
1720
            "type": "array",
1709
            "description": "Slurm errors",
1721
            "description": "Slurm errors",
Lines 1716-1721 Link Here
1716
      "dbv0.0.38_wckey_info": {
1728
      "dbv0.0.38_wckey_info": {
1717
        "type": "object",
1729
        "type": "object",
1718
        "properties": {
1730
        "properties": {
1731
          "meta": {
1732
            "$ref": "#/components/schemas/v0.0.38_meta"
1733
          },
1719
          "errors": {
1734
          "errors": {
1720
            "type": "array",
1735
            "type": "array",
1721
            "description": "Slurm errors",
1736
            "description": "Slurm errors",
Lines 1772-1777 Link Here
1772
      "dbv0.0.38_response_wckey_delete": {
1787
      "dbv0.0.38_response_wckey_delete": {
1773
        "type": "object",
1788
        "type": "object",
1774
        "properties": {
1789
        "properties": {
1790
          "meta": {
1791
            "$ref": "#/components/schemas/v0.0.38_meta"
1792
          },
1775
          "errors": {
1793
          "errors": {
1776
            "type": "array",
1794
            "type": "array",
1777
            "description": "Slurm errors",
1795
            "description": "Slurm errors",
Lines 1784-1789 Link Here
1784
      "dbv0.0.38_response_cluster_add": {
1802
      "dbv0.0.38_response_cluster_add": {
1785
        "type": "object",
1803
        "type": "object",
1786
        "properties": {
1804
        "properties": {
1805
          "meta": {
1806
            "$ref": "#/components/schemas/v0.0.38_meta"
1807
          },
1787
          "errors": {
1808
          "errors": {
1788
            "type": "array",
1809
            "type": "array",
1789
            "description": "Slurm errors",
1810
            "description": "Slurm errors",
Lines 1855-1860 Link Here
1855
      "dbv0.0.38_response_cluster_delete": {
1876
      "dbv0.0.38_response_cluster_delete": {
1856
        "type": "object",
1877
        "type": "object",
1857
        "properties": {
1878
        "properties": {
1879
          "meta": {
1880
            "$ref": "#/components/schemas/v0.0.38_meta"
1881
          },
1858
          "errors": {
1882
          "errors": {
1859
            "type": "array",
1883
            "type": "array",
1860
            "description": "Slurm errors",
1884
            "description": "Slurm errors",
Lines 1867-1872 Link Here
1867
      "dbv0.0.38_response_user_update": {
1891
      "dbv0.0.38_response_user_update": {
1868
        "type": "object",
1892
        "type": "object",
1869
        "properties": {
1893
        "properties": {
1894
          "meta": {
1895
            "$ref": "#/components/schemas/v0.0.38_meta"
1896
          },
1870
          "errors": {
1897
          "errors": {
1871
            "type": "array",
1898
            "type": "array",
1872
            "description": "Slurm errors",
1899
            "description": "Slurm errors",
Lines 1923-1928 Link Here
1923
      "dbv0.0.38_user_info": {
1950
      "dbv0.0.38_user_info": {
1924
        "type": "object",
1951
        "type": "object",
1925
        "properties": {
1952
        "properties": {
1953
          "meta": {
1954
            "$ref": "#/components/schemas/v0.0.38_meta"
1955
          },
1926
          "errors": {
1956
          "errors": {
1927
            "type": "array",
1957
            "type": "array",
1928
            "description": "Slurm errors",
1958
            "description": "Slurm errors",
Lines 1942-1947 Link Here
1942
      "dbv0.0.38_response_user_delete": {
1972
      "dbv0.0.38_response_user_delete": {
1943
        "type": "object",
1973
        "type": "object",
1944
        "properties": {
1974
        "properties": {
1975
          "meta": {
1976
            "$ref": "#/components/schemas/v0.0.38_meta"
1977
          },
1945
          "errors": {
1978
          "errors": {
1946
            "type": "array",
1979
            "type": "array",
1947
            "description": "Slurm errors",
1980
            "description": "Slurm errors",
Lines 1954-1959 Link Here
1954
      "dbv0.0.38_response_association_delete": {
1987
      "dbv0.0.38_response_association_delete": {
1955
        "type": "object",
1988
        "type": "object",
1956
        "properties": {
1989
        "properties": {
1990
          "meta": {
1991
            "$ref": "#/components/schemas/v0.0.38_meta"
1992
          },
1957
          "errors": {
1993
          "errors": {
1958
            "type": "array",
1994
            "type": "array",
1959
            "description": "Slurm errors",
1995
            "description": "Slurm errors",
Lines 2159-2164 Link Here
2159
      "dbv0.0.38_associations_info": {
2195
      "dbv0.0.38_associations_info": {
2160
        "type": "object",
2196
        "type": "object",
2161
        "properties": {
2197
        "properties": {
2198
          "meta": {
2199
            "$ref": "#/components/schemas/v0.0.38_meta"
2200
          },
2162
          "errors": {
2201
          "errors": {
2163
            "type": "array",
2202
            "type": "array",
2164
            "description": "Slurm errors",
2203
            "description": "Slurm errors",
Lines 2390-2395 Link Here
2390
      "dbv0.0.38_qos_info": {
2429
      "dbv0.0.38_qos_info": {
2391
        "type": "object",
2430
        "type": "object",
2392
        "properties": {
2431
        "properties": {
2432
          "meta": {
2433
            "$ref": "#/components/schemas/v0.0.38_meta"
2434
          },
2393
          "errors": {
2435
          "errors": {
2394
            "type": "array",
2436
            "type": "array",
2395
            "description": "Slurm errors",
2437
            "description": "Slurm errors",
Lines 2409-2414 Link Here
2409
      "dbv0.0.38_response_qos_delete": {
2451
      "dbv0.0.38_response_qos_delete": {
2410
        "type": "object",
2452
        "type": "object",
2411
        "properties": {
2453
        "properties": {
2454
          "meta": {
2455
            "$ref": "#/components/schemas/v0.0.38_meta"
2456
          },
2412
          "errors": {
2457
          "errors": {
2413
            "type": "array",
2458
            "type": "array",
2414
            "description": "Slurm errors",
2459
            "description": "Slurm errors",
Lines 2421-2426 Link Here
2421
      "dbv0.0.38_response_associations": {
2466
      "dbv0.0.38_response_associations": {
2422
        "type": "object",
2467
        "type": "object",
2423
        "properties": {
2468
        "properties": {
2469
          "meta": {
2470
            "$ref": "#/components/schemas/v0.0.38_meta"
2471
          },
2424
          "errors": {
2472
          "errors": {
2425
            "type": "array",
2473
            "type": "array",
2426
            "description": "Slurm errors",
2474
            "description": "Slurm errors",
Lines 2433-2438 Link Here
2433
      "dbv0.0.38_response_tres": {
2481
      "dbv0.0.38_response_tres": {
2434
        "type": "object",
2482
        "type": "object",
2435
        "properties": {
2483
        "properties": {
2484
          "meta": {
2485
            "$ref": "#/components/schemas/v0.0.38_meta"
2486
          },
2436
          "errors": {
2487
          "errors": {
2437
            "type": "array",
2488
            "type": "array",
2438
            "description": "Slurm errors",
2489
            "description": "Slurm errors",
Lines 2445-2450 Link Here
2445
      "dbv0.0.38_tres_info": {
2496
      "dbv0.0.38_tres_info": {
2446
        "type": "object",
2497
        "type": "object",
2447
        "properties": {
2498
        "properties": {
2499
          "meta": {
2500
            "$ref": "#/components/schemas/v0.0.38_meta"
2501
          },
2448
          "errors": {
2502
          "errors": {
2449
            "type": "array",
2503
            "type": "array",
2450
            "description": "Slurm errors",
2504
            "description": "Slurm errors",
Lines 2489-2494 Link Here
2489
      "dbv0.0.38_job_info": {
2543
      "dbv0.0.38_job_info": {
2490
        "type": "object",
2544
        "type": "object",
2491
        "properties": {
2545
        "properties": {
2546
          "meta": {
2547
            "$ref": "#/components/schemas/v0.0.38_meta"
2548
          },
2492
          "errors": {
2549
          "errors": {
2493
            "type": "array",
2550
            "type": "array",
2494
            "description": "Slurm errors",
2551
            "description": "Slurm errors",
Lines 3096-3101 Link Here
3096
      "dbv0.0.38_config_info": {
3153
      "dbv0.0.38_config_info": {
3097
        "type": "object",
3154
        "type": "object",
3098
        "properties": {
3155
        "properties": {
3156
          "meta": {
3157
            "$ref": "#/components/schemas/v0.0.38_meta"
3158
          },
3099
          "errors": {
3159
          "errors": {
3100
            "type": "array",
3160
            "type": "array",
3101
            "description": "Slurm errors",
3161
            "description": "Slurm errors",
Lines 3150-3155 Link Here
3150
      "dbv0.0.38_account_response": {
3210
      "dbv0.0.38_account_response": {
3151
        "type": "object",
3211
        "type": "object",
3152
        "properties": {
3212
        "properties": {
3213
          "meta": {
3214
            "$ref": "#/components/schemas/v0.0.38_meta"
3215
          },
3153
          "errors": {
3216
          "errors": {
3154
            "type": "array",
3217
            "type": "array",
3155
            "description": "Slurm errors",
3218
            "description": "Slurm errors",
Lines 3162-3167 Link Here
3162
      "dbv0.0.38_config_response": {
3225
      "dbv0.0.38_config_response": {
3163
        "type": "object",
3226
        "type": "object",
3164
        "properties": {
3227
        "properties": {
3228
          "meta": {
3229
            "$ref": "#/components/schemas/v0.0.38_meta"
3230
          },
3165
          "errors": {
3231
          "errors": {
3166
            "type": "array",
3232
            "type": "array",
3167
            "description": "Slurm errors",
3233
            "description": "Slurm errors",
Lines 3184-3189 Link Here
3184
        },
3250
        },
3185
        "type": "object"
3251
        "type": "object"
3186
      }
3252
      }
3253
    },
3254
    "dbv0.0.38_meta": {
3255
      "type": "object",
3256
      "properties": {
3257
        "plugin": {
3258
          "type": "object",
3259
          "properties": {
3260
            "type": {
3261
              "type": "string",
3262
              "description": ""
3263
            },
3264
            "name": {
3265
              "type": "string",
3266
              "description": ""
3267
            }
3268
          }
3269
        },
3270
        "Slurm": {
3271
          "type": "object",
3272
          "description": "Slurm information",
3273
          "properties": {
3274
            "version": {
3275
              "type": "object",
3276
              "properties": {
3277
                "major": {
3278
                  "type": "string",
3279
                  "description": ""
3280
                },
3281
                "micro": {
3282
                  "type": "string",
3283
                  "description": ""
3284
                },
3285
                "minor": {
3286
                  "type": "string",
3287
                  "description": ""
3288
                }
3289
              }
3290
            },
3291
            "release": {
3292
              "type": "string",
3293
              "description": "version specifier"
3294
            }
3295
          }
3296
        }
3297
      }
3187
    }
3298
    }
3188
  }
3299
  }
3189
}
3300
}
3190
- 
3191
--
3192
src/plugins/openapi/v0.0.38/openapi.json | 1 -
3301
src/plugins/openapi/v0.0.38/openapi.json | 1 -
3193
1 file changed, 1 deletion(-)
3302
1 file changed, 1 deletion(-)
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-3 lines)
Lines 1319-1325 Link Here
1319
            "description": "Executable script (full contents) to run in batch step"
1319
            "description": "Executable script (full contents) to run in batch step"
1320
          },
1320
          },
1321
          "job": {
1321
          "job": {
1322
            "description": "Properties of an array job or non-HetJob",
1323
            "$ref": "#/components/schemas/v0.0.38_job_properties"
1322
            "$ref": "#/components/schemas/v0.0.38_job_properties"
1324
          },
1323
          },
1325
          "jobs": {
1324
          "jobs": {
1326
- 
1327
openapi.json
1325
openapi.json
1328
--
1329
NEWS                                     | 2 ++
1326
NEWS                                     | 2 ++
1330
src/plugins/openapi/v0.0.38/openapi.json | 6 +++---
1327
src/plugins/openapi/v0.0.38/openapi.json | 6 +++---
1331
2 files changed, 5 insertions(+), 3 deletions(-)
1328
2 files changed, 5 insertions(+), 3 deletions(-)
(-)a/NEWS (+2 lines)
Lines 103-108 documents those changes that are of interest to users and administrators. Link Here
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
103
 -- openapi/dbv0.0.38 - split security entries in openapi.json.
104
 -- openapi/v0.0.38 - Add schema for Slurm meta in responses.
104
 -- openapi/v0.0.38 - Add schema for Slurm meta in responses.
105
 -- openapi/dbv0.0.38 - Add schema for Slurm meta in responses.
105
 -- openapi/dbv0.0.38 - Add schema for Slurm meta in responses.
106
 -- openapi/v0.0.38 - Correct field "errno" to "error_number" in schema for
107
    errors.
106
108
107
* Changes in Slurm 21.08.7
109
* Changes in Slurm 21.08.7
108
==========================
110
==========================
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-5 / +3 lines)
Lines 1254-1262 Link Here
1254
            "type": "string",
1254
            "type": "string",
1255
            "description": "error message"
1255
            "description": "error message"
1256
          },
1256
          },
1257
          "errno": {
1257
          "error_number": {
1258
            "type": "integer",
1258
            "description": "Slurm internal error number",
1259
            "description": "error number"
1259
            "type": "integer"
1260
          }
1260
          }
1261
        }
1261
        }
1262
      },
1262
      },
1263
- 
1264
openapi.json
1263
openapi.json
1265
--
1266
NEWS                                          |   1 +
1264
NEWS                                          |   1 +
1267
.../openapi_release_notes/slurm-22.05.0.html  |  30 ++
1265
.../openapi_release_notes/slurm-22.05.0.html  |  30 ++
1268
src/plugins/openapi/dbv0.0.38/openapi.json    | 491 +++++++++++++++---
1266
src/plugins/openapi/dbv0.0.38/openapi.json    | 491 +++++++++++++++---
1269
3 files changed, 454 insertions(+), 68 deletions(-)
1267
3 files changed, 454 insertions(+), 68 deletions(-)
(-)a/NEWS (+1 lines)
Lines 105-110 documents those changes that are of interest to users and administrators. Link Here
105
 -- openapi/dbv0.0.38 - Add schema for Slurm meta in responses.
105
 -- openapi/dbv0.0.38 - Add schema for Slurm meta in responses.
106
 -- openapi/v0.0.38 - Correct field "errno" to "error_number" in schema for
106
 -- openapi/v0.0.38 - Correct field "errno" to "error_number" in schema for
107
    errors.
107
    errors.
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
108
109
109
* Changes in Slurm 21.08.7
110
* Changes in Slurm 21.08.7
110
==========================
111
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+30 lines)
Lines 58-63 Link Here
58
</tr>
58
</tr>
59
</table>
59
</table>
60
60
61
<h4>Add error response contents</h4>
62
<table class="tchange">
63
<tr class="trchange">
64
	<td class="tdfield">new fields</td>
65
	<td class="tdchange" colspan=2>
66
		<ul>
67
			<li>.paths."/account/{account_name}"[].responses.default[]</li>
68
			<li>.paths."/accounts/"[].responses.default[]</li>
69
			<li>.paths."/association/"[].responses.default[]</li>
70
			<li>.paths."/associations/"[].responses.default[]</li>
71
			<li>.paths."/cluster/{cluster_name}"[].responses.default[]</li>
72
			<li>.paths."/clusters/"[].responses.default[]</li>
73
			<li>.paths."/config/"[].responses.default[]</li>
74
			<li>.paths."/diag/"[].responses.default[]</li>
75
			<li>.paths."/job/{job_id}"[].responses.default[]</li>
76
			<li>.paths."/jobs/"[].responses.default[]</li>
77
			<li>.paths."/qos/{qos_name}/"[].responses.default[]</li>
78
			<li>.paths."/qos/"[].responses.default[]</li>
79
			<li>.paths."/tres/"[].responses.default[]</li>
80
			<li>.paths."/users/"[].responses.default[]</li>
81
			<li>.paths."/user/{user_name}"[].responses.default[]</li>
82
			<li>.paths."/wckeys/"[].responses.default[]</li>
83
			<li>.paths."/wckey/{wckey}"[].responses.default[]</li>
84
			<li>.components.schemas."dbv0.0.38_meta"</li>
85
		</ul>
86
	</td>
87
</tr>
88
</table>
89
61
<h4>Move incorrectly named field</h4>
90
<h4>Move incorrectly named field</h4>
62
<table class="tchange">
91
<table class="tchange">
63
<tr class="trchange">
92
<tr class="trchange">
Lines 149-154 Link Here
149
			<li>.components.schemas."dbv0.0.38_config_info".properties.meta</li>
178
			<li>.components.schemas."dbv0.0.38_config_info".properties.meta</li>
150
			<li>.components.schemas."dbv0.0.38_account_response".properties.meta</li>
179
			<li>.components.schemas."dbv0.0.38_account_response".properties.meta</li>
151
			<li>.components.schemas."dbv0.0.38_config_response".properties.meta</li>
180
			<li>.components.schemas."dbv0.0.38_config_response".properties.meta</li>
181
			<li>.components.schemas."dbv0.0.38_errors"</li>
152
		</ul>
182
		</ul>
153
	</td>
183
	</td>
154
</tr>
184
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-70 / +423 lines)
Lines 78-84 Link Here
78
            "description": "Job description"
78
            "description": "Job description"
79
          },
79
          },
80
          "default": {
80
          "default": {
81
            "description": "Unable to find job"
81
            "description": "Unable to find job",
82
            "content": {
83
              "application/json": {
84
                "schema": {
85
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
86
                }
87
              },
88
              "application/x-yaml": {
89
                "schema": {
90
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
91
                }
92
              }
93
            }
82
          }
94
          }
83
        }
95
        }
84
      }
96
      }
Lines 107-113 Link Here
107
            "description": "slurmdbd configuration"
119
            "description": "slurmdbd configuration"
108
          },
120
          },
109
          "default": {
121
          "default": {
110
            "description": "Unable to dump config"
122
            "description": "Unable to dump config",
123
            "content": {
124
              "application/json": {
125
                "schema": {
126
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
127
                }
128
              },
129
              "application/x-yaml": {
130
                "schema": {
131
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
132
                }
133
              }
134
            }
111
          }
135
          }
112
        }
136
        }
113
      },
137
      },
Lines 134-140 Link Here
134
            }
158
            }
135
          },
159
          },
136
          "default": {
160
          "default": {
137
            "description": "Unable to set config"
161
            "description": "Unable to set config",
162
            "content": {
163
              "application/json": {
164
                "schema": {
165
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
166
                }
167
              },
168
              "application/x-yaml": {
169
                "schema": {
170
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
171
                }
172
              }
173
            }
138
          }
174
          }
139
        }
175
        }
140
      }
176
      }
Lines 162-168 Link Here
162
            "description": "List of TRES"
198
            "description": "List of TRES"
163
          },
199
          },
164
          "default": {
200
          "default": {
165
            "description": "Unable to update TRES"
201
            "description": "Unable to update TRES",
202
            "content": {
203
              "application/json": {
204
                "schema": {
205
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
206
                }
207
              },
208
              "application/x-yaml": {
209
                "schema": {
210
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
211
                }
212
              }
213
            }
166
          }
214
          }
167
        },
215
        },
168
        "summary": "Set TRES info"
216
        "summary": "Set TRES info"
Lines 219-225 Link Here
219
            "description": "Delete qos"
267
            "description": "Delete qos"
220
          },
268
          },
221
          "default": {
269
          "default": {
222
            "description": "Unable to delete QOS"
270
            "description": "Unable to delete QOS",
271
            "content": {
272
              "application/json": {
273
                "schema": {
274
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
275
                }
276
              },
277
              "application/x-yaml": {
278
                "schema": {
279
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
280
                }
281
              }
282
            }
223
          }
283
          }
224
        },
284
        },
225
        "parameters": [
285
        "parameters": [
Lines 259-265 Link Here
259
            "description": "QOS information"
319
            "description": "QOS information"
260
          },
320
          },
261
          "default": {
321
          "default": {
262
            "description": "QOS not found"
322
            "description": "QOS not found",
323
            "content": {
324
              "application/json": {
325
                "schema": {
326
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
327
                }
328
              },
329
              "application/x-yaml": {
330
                "schema": {
331
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
332
                }
333
              }
334
            }
263
          }
335
          }
264
        },
336
        },
265
        "parameters": [
337
        "parameters": [
Lines 300-306 Link Here
300
            "description": "List of QOS'"
372
            "description": "List of QOS'"
301
          },
373
          },
302
          "default": {
374
          "default": {
303
            "description": "QOS not found"
375
            "description": "QOS not found",
376
            "content": {
377
              "application/json": {
378
                "schema": {
379
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
380
                }
381
              },
382
              "application/x-yaml": {
383
                "schema": {
384
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
385
                }
386
              }
387
            }
304
          }
388
          }
305
        },
389
        },
306
        "summary": "Get QOS list"
390
        "summary": "Get QOS list"
Lines 329-335 Link Here
329
            "description": "status of associations update"
413
            "description": "status of associations update"
330
          },
414
          },
331
          "default": {
415
          "default": {
332
            "description": "Unable to update associations"
416
            "description": "Unable to update associations",
417
            "content": {
418
              "application/json": {
419
                "schema": {
420
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
421
                }
422
              },
423
              "application/x-yaml": {
424
                "schema": {
425
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
426
                }
427
              }
428
            }
333
          }
429
          }
334
        },
430
        },
335
        "summary": "Set associations info"
431
        "summary": "Set associations info"
Lines 356-362 Link Here
356
            "description": "List of associations"
452
            "description": "List of associations"
357
          },
453
          },
358
          "default": {
454
          "default": {
359
            "description": "Association not found"
455
            "description": "Association not found",
456
            "content": {
457
              "application/json": {
458
                "schema": {
459
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
460
                }
461
              },
462
              "application/x-yaml": {
463
                "schema": {
464
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
465
                }
466
              }
467
            }
360
          }
468
          }
361
        },
469
        },
362
        "summary": "Get association list"
470
        "summary": "Get association list"
Lines 431-437 Link Here
431
            "description": "List of associations"
539
            "description": "List of associations"
432
          },
540
          },
433
          "default": {
541
          "default": {
434
            "description": "Association not found"
542
            "description": "Association not found",
543
            "content": {
544
              "application/json": {
545
                "schema": {
546
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
547
                }
548
              },
549
              "application/x-yaml": {
550
                "schema": {
551
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
552
                }
553
              }
554
            }
435
          }
555
          }
436
        },
556
        },
437
        "summary": "Get association info"
557
        "summary": "Get association info"
Lines 504-510 Link Here
504
            "description": "Delete associations"
624
            "description": "Delete associations"
505
          },
625
          },
506
          "default": {
626
          "default": {
507
            "description": "Association not found or unable to delete association"
627
            "description": "Association not found or unable to delete association",
628
            "content": {
629
              "application/json": {
630
                "schema": {
631
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
632
                }
633
              },
634
              "application/x-yaml": {
635
                "schema": {
636
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
637
                }
638
              }
639
            }
508
          }
640
          }
509
        },
641
        },
510
        "summary": "Delete association"
642
        "summary": "Delete association"
Lines 534-540 Link Here
534
            "description": "Delete user"
666
            "description": "Delete user"
535
          },
667
          },
536
          "default": {
668
          "default": {
537
            "description": "User not found or unable to delete user"
669
            "description": "User not found or unable to delete user",
670
            "content": {
671
              "application/json": {
672
                "schema": {
673
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
674
                }
675
              },
676
              "application/x-yaml": {
677
                "schema": {
678
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
679
                }
680
              }
681
            }
538
          }
682
          }
539
        },
683
        },
540
        "parameters": [
684
        "parameters": [
Lines 574-580 Link Here
574
            "description": "List of users"
718
            "description": "List of users"
575
          },
719
          },
576
          "default": {
720
          "default": {
577
            "description": "User not found"
721
            "description": "User not found",
722
            "content": {
723
              "application/json": {
724
                "schema": {
725
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
726
                }
727
              },
728
              "application/x-yaml": {
729
                "schema": {
730
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
731
                }
732
              }
733
            }
578
          }
734
          }
579
        },
735
        },
580
        "parameters": [
736
        "parameters": [
Lines 616-622 Link Here
616
            "description": "Update users"
772
            "description": "Update users"
617
          },
773
          },
618
          "default": {
774
          "default": {
619
            "description": "User not found or not able to update user"
775
            "description": "User not found or not able to update user",
776
            "content": {
777
              "application/json": {
778
                "schema": {
779
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
780
                }
781
              },
782
              "application/x-yaml": {
783
                "schema": {
784
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
785
                }
786
              }
787
            }
620
          }
788
          }
621
        }
789
        }
622
      },
790
      },
Lines 643-649 Link Here
643
            "description": "List of users"
811
            "description": "List of users"
644
          },
812
          },
645
          "default": {
813
          "default": {
646
            "description": "User not found"
814
            "description": "User not found",
815
            "content": {
816
              "application/json": {
817
                "schema": {
818
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
819
                }
820
              },
821
              "application/x-yaml": {
822
                "schema": {
823
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
824
                }
825
              }
826
            }
647
          }
827
          }
648
        }
828
        }
649
      }
829
      }
Lines 672-678 Link Here
672
            "description": "Delete cluster"
852
            "description": "Delete cluster"
673
          },
853
          },
674
          "default": {
854
          "default": {
675
            "description": "Cluster not found or unable to delete cluster"
855
            "description": "Cluster not found or unable to delete cluster",
856
            "content": {
857
              "application/json": {
858
                "schema": {
859
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
860
                }
861
              },
862
              "application/x-yaml": {
863
                "schema": {
864
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
865
                }
866
              }
867
            }
676
          }
868
          }
677
        },
869
        },
678
        "parameters": [
870
        "parameters": [
Lines 712-718 Link Here
712
            "description": "Cluster information"
904
            "description": "Cluster information"
713
          },
905
          },
714
          "default": {
906
          "default": {
715
            "description": "Cluster not found"
907
            "description": "Cluster not found",
908
            "content": {
909
              "application/json": {
910
                "schema": {
911
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
912
                }
913
              },
914
              "application/x-yaml": {
915
                "schema": {
916
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
917
                }
918
              }
919
            }
716
          }
920
          }
717
        },
921
        },
718
        "parameters": [
922
        "parameters": [
Lines 753-759 Link Here
753
            "description": "List of clusters"
957
            "description": "List of clusters"
754
          },
958
          },
755
          "default": {
959
          "default": {
756
            "description": "Cluster not found"
960
            "description": "Cluster not found",
961
            "content": {
962
              "application/json": {
963
                "schema": {
964
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
965
                }
966
              },
967
              "application/x-yaml": {
968
                "schema": {
969
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
970
                }
971
              }
972
            }
757
          }
973
          }
758
        },
974
        },
759
        "summary": "Get cluster list"
975
        "summary": "Get cluster list"
Lines 780-786 Link Here
780
            "description": "List of clusters"
996
            "description": "List of clusters"
781
          },
997
          },
782
          "default": {
998
          "default": {
783
            "description": "Unable to add cluster"
999
            "description": "Unable to add cluster",
1000
            "content": {
1001
              "application/json": {
1002
                "schema": {
1003
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1004
                }
1005
              },
1006
              "application/x-yaml": {
1007
                "schema": {
1008
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1009
                }
1010
              }
1011
            }
784
          }
1012
          }
785
        },
1013
        },
786
        "summary": "Add clusters"
1014
        "summary": "Add clusters"
Lines 810-816 Link Here
810
            "description": "Delete wckey"
1038
            "description": "Delete wckey"
811
          },
1039
          },
812
          "default": {
1040
          "default": {
813
            "description": "wckey not found or unable to delete wckey"
1041
            "description": "wckey not found or unable to delete wckey",
1042
            "content": {
1043
              "application/json": {
1044
                "schema": {
1045
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1046
                }
1047
              },
1048
              "application/x-yaml": {
1049
                "schema": {
1050
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1051
                }
1052
              }
1053
            }
814
          }
1054
          }
815
        },
1055
        },
816
        "parameters": [
1056
        "parameters": [
Lines 850-856 Link Here
850
            "description": "List of wckey"
1090
            "description": "List of wckey"
851
          },
1091
          },
852
          "default": {
1092
          "default": {
853
            "description": "wckey not found"
1093
            "description": "wckey not found",
1094
            "content": {
1095
              "application/json": {
1096
                "schema": {
1097
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1098
                }
1099
              },
1100
              "application/x-yaml": {
1101
                "schema": {
1102
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1103
                }
1104
              }
1105
            }
854
          }
1106
          }
855
        },
1107
        },
856
        "parameters": [
1108
        "parameters": [
Lines 891-897 Link Here
891
            "description": "List of wckeys"
1143
            "description": "List of wckeys"
892
          },
1144
          },
893
          "default": {
1145
          "default": {
894
            "description": "wckey not found"
1146
            "description": "wckey not found",
1147
            "content": {
1148
              "application/json": {
1149
                "schema": {
1150
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1151
                }
1152
              },
1153
              "application/x-yaml": {
1154
                "schema": {
1155
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1156
                }
1157
              }
1158
            }
895
          }
1159
          }
896
        },
1160
        },
897
        "summary": "Get wckey list"
1161
        "summary": "Get wckey list"
Lines 918-924 Link Here
918
            "description": "List of wckeys"
1182
            "description": "List of wckeys"
919
          },
1183
          },
920
          "default": {
1184
          "default": {
921
            "description": "Unable to add wckey"
1185
            "description": "Unable to add wckey",
1186
            "content": {
1187
              "application/json": {
1188
                "schema": {
1189
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1190
                }
1191
              },
1192
              "application/x-yaml": {
1193
                "schema": {
1194
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1195
                }
1196
              }
1197
            }
922
          }
1198
          }
923
        },
1199
        },
924
        "summary": "Add wckeys"
1200
        "summary": "Add wckeys"
Lines 948-954 Link Here
948
            "description": "Delete account"
1224
            "description": "Delete account"
949
          },
1225
          },
950
          "default": {
1226
          "default": {
951
            "description": "Unable to delete account"
1227
            "description": "Unable to delete account",
1228
            "content": {
1229
              "application/json": {
1230
                "schema": {
1231
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1232
                }
1233
              },
1234
              "application/x-yaml": {
1235
                "schema": {
1236
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1237
                }
1238
              }
1239
            }
952
          }
1240
          }
953
        },
1241
        },
954
        "parameters": [
1242
        "parameters": [
Lines 988-994 Link Here
988
            "description": "List of accounts"
1276
            "description": "List of accounts"
989
          },
1277
          },
990
          "default": {
1278
          "default": {
991
            "description": "Account not found"
1279
            "description": "Account not found",
1280
            "content": {
1281
              "application/json": {
1282
                "schema": {
1283
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1284
                }
1285
              },
1286
              "application/x-yaml": {
1287
                "schema": {
1288
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1289
                }
1290
              }
1291
            }
992
          }
1292
          }
993
        },
1293
        },
994
        "parameters": [
1294
        "parameters": [
Lines 1029-1035 Link Here
1029
            "description": "List of accounts"
1329
            "description": "List of accounts"
1030
          },
1330
          },
1031
          "default": {
1331
          "default": {
1032
            "description": "Account not found"
1332
            "description": "Account not found",
1333
            "content": {
1334
              "application/json": {
1335
                "schema": {
1336
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1337
                }
1338
              },
1339
              "application/x-yaml": {
1340
                "schema": {
1341
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1342
                }
1343
              }
1344
            }
1033
          }
1345
          }
1034
        },
1346
        },
1035
        "summary": "Get account list"
1347
        "summary": "Get account list"
Lines 1056-1062 Link Here
1056
            "description": "Add/update list of accounts"
1368
            "description": "Add/update list of accounts"
1057
          },
1369
          },
1058
          "default": {
1370
          "default": {
1059
            "description": "Unable to add or update accounts"
1371
            "description": "Unable to add or update accounts",
1372
            "content": {
1373
              "application/json": {
1374
                "schema": {
1375
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1376
                }
1377
              },
1378
              "application/x-yaml": {
1379
                "schema": {
1380
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1381
                }
1382
              }
1383
            }
1060
          }
1384
          }
1061
        },
1385
        },
1062
        "summary": "Update accounts"
1386
        "summary": "Update accounts"
Lines 1362-1368 Link Here
1362
            "description": "List of jobs"
1686
            "description": "List of jobs"
1363
          },
1687
          },
1364
          "default": {
1688
          "default": {
1365
            "description": "Unable to query jobs"
1689
            "description": "Unable to query jobs",
1690
            "content": {
1691
              "application/json": {
1692
                "schema": {
1693
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1694
                }
1695
              },
1696
              "application/x-yaml": {
1697
                "schema": {
1698
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1699
                }
1700
              }
1701
            }
1366
          }
1702
          }
1367
        },
1703
        },
1368
        "summary": "Get job list"
1704
        "summary": "Get job list"
Lines 1391-1397 Link Here
1391
            "description": "Dictionary of statistics"
1727
            "description": "Dictionary of statistics"
1392
          },
1728
          },
1393
          "default": {
1729
          "default": {
1394
            "description": "Unable to query diagnostics"
1730
            "description": "Unable to query diagnostics",
1731
            "content": {
1732
              "application/json": {
1733
                "schema": {
1734
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1735
                }
1736
              },
1737
              "application/x-yaml": {
1738
                "schema": {
1739
                  "$ref": "#/components/schemas/dbv0.0.38_errors"
1740
                }
1741
              }
1742
            }
1395
          }
1743
          }
1396
        },
1744
        },
1397
        "summary": "Get slurmdb diagnostics"
1745
        "summary": "Get slurmdb diagnostics"
Lines 3237-3242 Link Here
3237
          }
3585
          }
3238
        }
3586
        }
3239
      },
3587
      },
3588
      "dbv0.0.38_errors": {
3589
        "type": "array",
3590
        "description": "Slurm errors",
3591
        "items": {
3592
          "$ref": "#/components/schemas/dbv0.0.38_error"
3593
        }
3594
      },
3240
      "dbv0.0.38_error": {
3595
      "dbv0.0.38_error": {
3241
        "properties": {
3596
        "properties": {
3242
          "errno": {
3597
          "errno": {
Lines 3249-3296 Link Here
3249
          }
3604
          }
3250
        },
3605
        },
3251
        "type": "object"
3606
        "type": "object"
3252
      }
3607
      },
3253
    },
3608
      "dbv0.0.38_meta": {
3254
    "dbv0.0.38_meta": {
3609
        "type": "object",
3255
      "type": "object",
3610
        "properties": {
3256
      "properties": {
3611
          "plugin": {
3257
        "plugin": {
3612
            "type": "object",
3258
          "type": "object",
3613
            "properties": {
3259
          "properties": {
3614
              "type": {
3260
            "type": {
3615
                "type": "string",
3261
              "type": "string",
3616
                "description": ""
3262
              "description": ""
3617
              },
3263
            },
3618
              "name": {
3264
            "name": {
3619
                "type": "string",
3265
              "type": "string",
3620
                "description": ""
3266
              "description": ""
3621
              }
3267
            }
3622
            }
3268
          }
3623
          },
3269
        },
3624
          "Slurm": {
3270
        "Slurm": {
3625
            "type": "object",
3271
          "type": "object",
3626
            "description": "Slurm information",
3272
          "description": "Slurm information",
3627
            "properties": {
3273
          "properties": {
3628
              "version": {
3274
            "version": {
3629
                "type": "object",
3275
              "type": "object",
3630
                "properties": {
3276
              "properties": {
3631
                  "major": {
3277
                "major": {
3632
                    "type": "string",
3278
                  "type": "string",
3633
                    "description": ""
3279
                  "description": ""
3634
                  },
3280
                },
3635
                  "micro": {
3281
                "micro": {
3636
                    "type": "string",
3282
                  "type": "string",
3637
                    "description": ""
3283
                  "description": ""
3638
                  },
3284
                },
3639
                  "minor": {
3285
                "minor": {
3640
                    "type": "string",
3286
                  "type": "string",
3641
                    "description": ""
3287
                  "description": ""
3642
                  }
3288
                }
3643
                }
3644
              },
3645
              "release": {
3646
                "type": "string",
3647
                "description": "version specifier"
3289
              }
3648
              }
3290
            },
3291
            "release": {
3292
              "type": "string",
3293
              "description": "version specifier"
3294
            }
3649
            }
3295
          }
3650
          }
3296
        }
3651
        }
3297
- 
3298
openapi.json
3652
openapi.json
3299
--
3300
NEWS                                          |   1 +
3653
NEWS                                          |   1 +
3301
.../openapi_release_notes/slurm-22.05.0.html  |  23 +++
3654
.../openapi_release_notes/slurm-22.05.0.html  |  23 +++
3302
src/plugins/openapi/v0.0.38/openapi.json      | 147 ++++++++++++++++--
3655
src/plugins/openapi/v0.0.38/openapi.json      | 147 ++++++++++++++++--
3303
3 files changed, 161 insertions(+), 10 deletions(-)
3656
3 files changed, 161 insertions(+), 10 deletions(-)
(-)a/NEWS (+1 lines)
Lines 106-111 documents those changes that are of interest to users and administrators. Link Here
106
 -- openapi/v0.0.38 - Correct field "errno" to "error_number" in schema for
106
 -- openapi/v0.0.38 - Correct field "errno" to "error_number" in schema for
107
    errors.
107
    errors.
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
109
110
110
* Changes in Slurm 21.08.7
111
* Changes in Slurm 21.08.7
111
==========================
112
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+23 lines)
Lines 400-405 Link Here
400
			<li>.components.schemas."v0.0.38_job_submission_response".properties.meta</li>
400
			<li>.components.schemas."v0.0.38_job_submission_response".properties.meta</li>
401
			<li>.components.schemas."v0.0.38_jobs_response".properties.meta</li>
401
			<li>.components.schemas."v0.0.38_jobs_response".properties.meta</li>
402
			<li>.components.schemas."v0.0.38_nodes_response".properties.meta</li>
402
			<li>.components.schemas."v0.0.38_nodes_response".properties.meta</li>
403
			<li>.components.schemas."v0.0.38_errors"</li>
404
		</ul>
405
	</td>
406
</tr>
407
</table>
408
409
<h4>Add error response contents</h4>
410
<table class="tchange">
411
<tr class="trchange">
412
	<td class="tdfield">new fields</td>
413
	<td class="tdchange" colspan=2>
414
		<ul>
415
			<li>.paths."/diag/"[].responses.default[]</li>
416
			<li>.paths."/ping/"[].responses.default[]</li>
417
			<li>.paths."/jobs/"[].responses.default[]</li>
418
			<li>.paths."/job/{job_id}"[].responses.default[]</li>
419
			<li>.paths."/job/submit"[].responses.default[]</li>
420
			<li>.paths."/nodes/"[].responses.default[]</li>
421
			<li>.paths."/node/{node_name}"[].responses.default[]</li>
422
			<li>.paths."/partitions/"[].responses.default[]</li>
423
			<li>.paths."/partition/{partition_name}"[].responses.default[]</li>
424
			<li>.paths."/reservations/"[].responses.default[]</li>
425
			<li>.paths."/reservation/{reservation_name}"[].responses.default[]</li>
403
		</ul>
426
		</ul>
404
	</td>
427
	</td>
405
</tr>
428
</tr>
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-12 / +137 lines)
Lines 61-67 Link Here
61
            }
61
            }
62
          },
62
          },
63
          "default": {
63
          "default": {
64
            "description": "unable to request ping test"
64
            "description": "unable to request ping test",
65
            "content": {
66
              "application/json": {
67
                "schema": {
68
                  "$ref": "#/components/schemas/v0.0.38_errors"
69
                }
70
              },
71
              "application/x-yaml": {
72
                "schema": {
73
                  "$ref": "#/components/schemas/v0.0.38_errors"
74
                }
75
              }
76
            }
65
          }
77
          }
66
        }
78
        }
67
      }
79
      }
Lines 119-125 Link Here
119
            }
131
            }
120
          },
132
          },
121
          "default": {
133
          "default": {
122
            "description": "unable to request ping test"
134
            "description": "unable to request ping test",
135
            "content": {
136
              "application/json": {
137
                "schema": {
138
                  "$ref": "#/components/schemas/v0.0.38_errors"
139
                }
140
              },
141
              "application/x-yaml": {
142
                "schema": {
143
                  "$ref": "#/components/schemas/v0.0.38_errors"
144
                }
145
              }
146
            }
123
          }
147
          }
124
        }
148
        }
125
      }
149
      }
Lines 162-168 Link Here
162
            }
186
            }
163
          },
187
          },
164
          "default": {
188
          "default": {
165
            "description": "job not found"
189
            "description": "job not found",
190
            "content": {
191
              "application/json": {
192
                "schema": {
193
                  "$ref": "#/components/schemas/v0.0.38_errors"
194
                }
195
              },
196
              "application/x-yaml": {
197
                "schema": {
198
                  "$ref": "#/components/schemas/v0.0.38_errors"
199
                }
200
              }
201
            }
166
          }
202
          }
167
        }
203
        }
168
      }
204
      }
Lines 332-338 Link Here
332
            }
368
            }
333
          },
369
          },
334
          "default": {
370
          "default": {
335
            "description": "job rejected"
371
            "description": "job rejected",
372
            "content": {
373
              "application/json": {
374
                "schema": {
375
                  "$ref": "#/components/schemas/v0.0.38_errors"
376
                }
377
              },
378
              "application/x-yaml": {
379
                "schema": {
380
                  "$ref": "#/components/schemas/v0.0.38_errors"
381
                }
382
              }
383
            }
336
          }
384
          }
337
        }
385
        }
338
      }
386
      }
Lines 375-381 Link Here
375
            }
423
            }
376
          },
424
          },
377
          "default": {
425
          "default": {
378
            "description": "no nodes in cluster"
426
            "description": "no nodes in cluster",
427
            "content": {
428
              "application/json": {
429
                "schema": {
430
                  "$ref": "#/components/schemas/v0.0.38_errors"
431
                }
432
              },
433
              "application/x-yaml": {
434
                "schema": {
435
                  "$ref": "#/components/schemas/v0.0.38_errors"
436
                }
437
              }
438
            }
379
          }
439
          }
380
        }
440
        }
381
      }
441
      }
Lines 417-423 Link Here
417
            }
477
            }
418
          },
478
          },
419
          "default": {
479
          "default": {
420
            "description": "node not found"
480
            "description": "node not found",
481
            "content": {
482
              "application/json": {
483
                "schema": {
484
                  "$ref": "#/components/schemas/v0.0.38_errors"
485
                }
486
              },
487
              "application/x-yaml": {
488
                "schema": {
489
                  "$ref": "#/components/schemas/v0.0.38_errors"
490
                }
491
              }
492
            }
421
          }
493
          }
422
        }
494
        }
423
      }
495
      }
Lines 460-466 Link Here
460
            }
532
            }
461
          },
533
          },
462
          "default": {
534
          "default": {
463
            "description": "no partitions found"
535
            "description": "no partitions found",
536
            "content": {
537
              "application/json": {
538
                "schema": {
539
                  "$ref": "#/components/schemas/v0.0.38_errors"
540
                }
541
              },
542
              "application/x-yaml": {
543
                "schema": {
544
                  "$ref": "#/components/schemas/v0.0.38_errors"
545
                }
546
              }
547
            }
464
          }
548
          }
465
        }
549
        }
466
      }
550
      }
Lines 514-520 Link Here
514
            }
598
            }
515
          },
599
          },
516
          "default": {
600
          "default": {
517
            "description": "no partitions found"
601
            "description": "no partitions found",
602
            "content": {
603
              "application/json": {
604
                "schema": {
605
                  "$ref": "#/components/schemas/v0.0.38_errors"
606
                }
607
              },
608
              "application/x-yaml": {
609
                "schema": {
610
                  "$ref": "#/components/schemas/v0.0.38_errors"
611
                }
612
              }
613
            }
518
          }
614
          }
519
        }
615
        }
520
      }
616
      }
Lines 557-563 Link Here
557
            }
653
            }
558
          },
654
          },
559
          "default": {
655
          "default": {
560
            "description": "no reservations found"
656
            "description": "no reservations found",
657
            "content": {
658
              "application/json": {
659
                "schema": {
660
                  "$ref": "#/components/schemas/v0.0.38_errors"
661
                }
662
              },
663
              "application/x-yaml": {
664
                "schema": {
665
                  "$ref": "#/components/schemas/v0.0.38_errors"
666
                }
667
              }
668
            }
561
          }
669
          }
562
        }
670
        }
563
      }
671
      }
Lines 611-617 Link Here
611
            }
719
            }
612
          },
720
          },
613
          "default": {
721
          "default": {
614
            "description": "no reservations found"
722
            "description": "no reservations found",
723
            "content": {
724
              "application/json": {
725
                "schema": {
726
                  "$ref": "#/components/schemas/v0.0.38_errors"
727
                }
728
              },
729
              "application/x-yaml": {
730
                "schema": {
731
                  "$ref": "#/components/schemas/v0.0.38_errors"
732
                }
733
              }
734
            }
615
          }
735
          }
616
        }
736
        }
617
      }
737
      }
Lines 1247-1252 Link Here
1247
          }
1367
          }
1248
        }
1368
        }
1249
      },
1369
      },
1370
      "v0.0.38_errors": {
1371
        "type": "array",
1372
        "description": "Slurm errors",
1373
        "items": {
1374
          "$ref": "#/components/schemas/v0.0.38_error"
1375
        }
1376
      },
1250
      "v0.0.38_error": {
1377
      "v0.0.38_error": {
1251
        "type": "object",
1378
        "type": "object",
1252
        "properties": {
1379
        "properties": {
1253
- 
1254
openapi.json
1380
openapi.json
1255
--
1256
NEWS                                          |  1 +
1381
NEWS                                          |  1 +
1257
.../openapi_release_notes/slurm-22.05.0.html  | 13 ++++++++++
1382
.../openapi_release_notes/slurm-22.05.0.html  | 13 ++++++++++
1258
src/plugins/openapi/dbv0.0.38/openapi.json    | 26 +++++++++++++++++++
1383
src/plugins/openapi/dbv0.0.38/openapi.json    | 26 +++++++++++++++++++
1259
3 files changed, 40 insertions(+)
1384
3 files changed, 40 insertions(+)
(-)a/NEWS (+1 lines)
Lines 107-112 documents those changes that are of interest to users and administrators. Link Here
107
    errors.
107
    errors.
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
110
 -- openapi/dbv0.0.38 - add requestBody for /users/ in openapi.json.
110
111
111
* Changes in Slurm 21.08.7
112
* Changes in Slurm 21.08.7
112
==========================
113
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+13 lines)
Lines 184-189 Link Here
184
</tr>
184
</tr>
185
</table>
185
</table>
186
186
187
<h4>Add requestBody field and associated schema</h4>
188
<table class="tchange">
189
<tr class="trchange">
190
	<td class="tdfield">new fields</td>
191
	<td class="tdchange" colspan=2>
192
		<ul>
193
			<li>.components.schemas."dbv0.0.38_update_users"</li>
194
			<li>.paths."/users/".post.requestBody'</li>
195
		</ul>
196
	</td>
197
</tr>
198
</table>
199
187
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
200
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
188
201
189
<h4>add plugin</h4>
202
<h4>add plugin</h4>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-2 / +26 lines)
Lines 755-760 Link Here
755
        ],
755
        ],
756
        "summary": "Update user",
756
        "summary": "Update user",
757
        "operationId": "slurmdbd_update_users",
757
        "operationId": "slurmdbd_update_users",
758
        "requestBody": {
759
          "description": "add or update user",
760
          "content": {
761
            "application/json": {
762
              "schema": {
763
                "$ref": "#/components/schemas/dbv0.0.38_update_users"
764
              }
765
            },
766
            "application/x-yaml": {
767
              "schema": {
768
                "$ref": "#/components/schemas/dbv0.0.38_update_users"
769
              }
770
            }
771
          },
772
          "required": true
773
        },
758
        "responses": {
774
        "responses": {
759
          "200": {
775
          "200": {
760
            "content": {
776
            "content": {
Lines 3649-3654 Link Here
3649
            }
3665
            }
3650
          }
3666
          }
3651
        }
3667
        }
3668
      },
3669
      "dbv0.0.38_update_users": {
3670
        "properties": {
3671
          "users": {
3672
            "type": "array",
3673
            "items": {
3674
              "$ref": "#/components/schemas/dbv0.0.38_user"
3675
            }
3676
          }
3677
        }
3652
      }
3678
      }
3653
    }
3679
    }
3654
  }
3680
  }
3655
- 
3656
openapi.json
3681
openapi.json
3657
--
3658
NEWS                                          |  1 +
3682
NEWS                                          |  1 +
3659
.../openapi_release_notes/slurm-22.05.0.html  |  2 ++
3683
.../openapi_release_notes/slurm-22.05.0.html  |  2 ++
3660
src/plugins/openapi/dbv0.0.38/openapi.json    | 27 ++++++++++++++++++-
3684
src/plugins/openapi/dbv0.0.38/openapi.json    | 27 ++++++++++++++++++-
3661
3 files changed, 29 insertions(+), 1 deletion(-)
3685
3 files changed, 29 insertions(+), 1 deletion(-)
(-)a/NEWS (+1 lines)
Lines 108-113 documents those changes that are of interest to users and administrators. Link Here
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
108
 -- openapi/dbv0.0.38 - add failure response contents in openapi.json.
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
110
 -- openapi/dbv0.0.38 - add requestBody for /users/ in openapi.json.
110
 -- openapi/dbv0.0.38 - add requestBody for /users/ in openapi.json.
111
 -- openapi/dbv0.0.38 - add requestBody for /accounts/ in openapi.json.
111
112
112
* Changes in Slurm 21.08.7
113
* Changes in Slurm 21.08.7
113
==========================
114
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+2 lines)
Lines 192-197 Link Here
192
		<ul>
192
		<ul>
193
			<li>.components.schemas."dbv0.0.38_update_users"</li>
193
			<li>.components.schemas."dbv0.0.38_update_users"</li>
194
			<li>.paths."/users/".post.requestBody'</li>
194
			<li>.paths."/users/".post.requestBody'</li>
195
			<li>.components.schemas."dbv0.0.38_update_accounts"</li>
196
			<li>.paths."/accounts/".post.requestBody'</li>
195
		</ul>
197
		</ul>
196
	</td>
198
	</td>
197
</tr>
199
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-3 / +26 lines)
Lines 1400-1405 Link Here
1400
          }
1400
          }
1401
        },
1401
        },
1402
        "summary": "Update accounts"
1402
        "summary": "Update accounts"
1403
	"requestBody": {
1404
	  "description": "update/create accounts",
1405
	  "content": {
1406
	    "application/json": {
1407
	      "schema": {
1408
		"$ref": "#/components/schemas/dbv0.0.38_update_account"
1409
	      }
1410
	    },
1411
	    "application/x-yaml": {
1412
	      "schema": {
1413
		"$ref": "#/components/schemas/dbv0.0.38_update_account"
1414
	      }
1415
	    }
1416
	  },
1417
	  "required": true
1418
	}
1403
      }
1419
      }
1404
    },
1420
    },
1405
    "/jobs/": {
1421
    "/jobs/": {
Lines 3674-3680 Link Here
3674
              "$ref": "#/components/schemas/dbv0.0.38_user"
3690
              "$ref": "#/components/schemas/dbv0.0.38_user"
3675
            }
3691
            }
3676
          }
3692
          }
3677
        }
3693
      },
3694
      "dbv0.0.38_update_account": {
3695
	"properties": {
3696
	  "accounts": {
3697
	    "type": "array",
3698
	    "items": {
3699
	      "$ref": "#/components/schemas/dbv0.0.38_account"
3700
	    }
3701
	  }
3702
	}
3678
      }
3703
      }
3679
    }
3704
    }
3680
  }
3705
  }
3681
- 
3682
"removed_associations" in openapi.json
3706
"removed_associations" in openapi.json
3683
--
3684
NEWS                                          |  2 +
3707
NEWS                                          |  2 +
3685
.../openapi_release_notes/slurm-22.05.0.html  | 12 ++++
3708
.../openapi_release_notes/slurm-22.05.0.html  | 12 ++++
3686
src/plugins/openapi/dbv0.0.38/openapi.json    | 58 +++++++++++--------
3709
src/plugins/openapi/dbv0.0.38/openapi.json    | 58 +++++++++++--------
3687
3 files changed, 47 insertions(+), 25 deletions(-)
3710
3 files changed, 47 insertions(+), 25 deletions(-)
(-)a/NEWS (+2 lines)
Lines 109-114 documents those changes that are of interest to users and administrators. Link Here
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
109
 -- openapi/v0.0.38 - add failure response contents in openapi.json.
110
 -- openapi/dbv0.0.38 - add requestBody for /users/ in openapi.json.
110
 -- openapi/dbv0.0.38 - add requestBody for /users/ in openapi.json.
111
 -- openapi/dbv0.0.38 - add requestBody for /accounts/ in openapi.json.
111
 -- openapi/dbv0.0.38 - add requestBody for /accounts/ in openapi.json.
112
 -- openapi/dbv0.0.38 - add missing response field "removed_associations"
113
    in openapi.json
112
114
113
* Changes in Slurm 21.08.7
115
* Changes in Slurm 21.08.7
114
==========================
116
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 184-189 Link Here
184
</tr>
184
</tr>
185
</table>
185
</table>
186
186
187
<h4>Add missing response field</h4>
188
<table class="tchange">
189
<tr class="trchange">
190
	<td class="tdfield">new fields</td>
191
	<td class="tdchange" colspan=2>
192
		<ul>
193
			<li>.components.schemas."dbv0.0.38_response_association_delete".properties.removed_associations</li>
194
		</ul>
195
	</td>
196
</tr>
197
</table>
198
187
<h4>Add requestBody field and associated schema</h4>
199
<h4>Add requestBody field and associated schema</h4>
188
<table class="tchange">
200
<table class="tchange">
189
<tr class="trchange">
201
<tr class="trchange">
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-27 / +33 lines)
Lines 1399-1421 Link Here
1399
            }
1399
            }
1400
          }
1400
          }
1401
        },
1401
        },
1402
        "summary": "Update accounts"
1402
        "summary": "Update accounts",
1403
	"requestBody": {
1403
        "requestBody": {
1404
	  "description": "update/create accounts",
1404
          "description": "update/create accounts",
1405
	  "content": {
1405
          "content": {
1406
	    "application/json": {
1406
            "application/json": {
1407
	      "schema": {
1407
              "schema": {
1408
		"$ref": "#/components/schemas/dbv0.0.38_update_account"
1408
                "$ref": "#/components/schemas/dbv0.0.38_update_account"
1409
	      }
1409
              }
1410
	    },
1410
            },
1411
	    "application/x-yaml": {
1411
            "application/x-yaml": {
1412
	      "schema": {
1412
              "schema": {
1413
		"$ref": "#/components/schemas/dbv0.0.38_update_account"
1413
                "$ref": "#/components/schemas/dbv0.0.38_update_account"
1414
	      }
1414
              }
1415
	    }
1415
            }
1416
	  },
1416
          },
1417
	  "required": true
1417
          "required": true
1418
	}
1418
        }
1419
      }
1419
      }
1420
    },
1420
    },
1421
    "/jobs/": {
1421
    "/jobs/": {
Lines 2376-2381 Link Here
2376
            "items": {
2376
            "items": {
2377
              "$ref": "#/components/schemas/dbv0.0.38_error"
2377
              "$ref": "#/components/schemas/dbv0.0.38_error"
2378
            }
2378
            }
2379
          },
2380
          "removed_associations": {
2381
            "type": "array",
2382
            "description": "the associations",
2383
            "items": {
2384
              "type": "string"
2385
            }
2379
          }
2386
          }
2380
        }
2387
        }
2381
      },
2388
      },
Lines 3690-3705 Link Here
3690
              "$ref": "#/components/schemas/dbv0.0.38_user"
3697
              "$ref": "#/components/schemas/dbv0.0.38_user"
3691
            }
3698
            }
3692
          }
3699
          }
3700
        }
3693
      },
3701
      },
3694
      "dbv0.0.38_update_account": {
3702
      "dbv0.0.38_update_account": {
3695
	"properties": {
3703
        "properties": {
3696
	  "accounts": {
3704
          "accounts": {
3697
	    "type": "array",
3705
            "type": "array",
3698
	    "items": {
3706
            "items": {
3699
	      "$ref": "#/components/schemas/dbv0.0.38_account"
3707
              "$ref": "#/components/schemas/dbv0.0.38_account"
3700
	    }
3708
            }
3701
	  }
3709
          }
3702
	}
3710
        }
3703
      }
3711
      }
3704
    }
3712
    }
3705
  }
3713
  }
3706
- 
3707
for user assocations list in openapi.json.
3714
for user assocations list in openapi.json.
3708
--
3709
NEWS                                              |  2 ++
3715
NEWS                                              |  2 ++
3710
doc/html/openapi_release_notes/slurm-22.05.0.html | 12 ++++++++++++
3716
doc/html/openapi_release_notes/slurm-22.05.0.html | 12 ++++++++++++
3711
src/plugins/openapi/dbv0.0.38/openapi.json        |  8 +++-----
3717
src/plugins/openapi/dbv0.0.38/openapi.json        |  8 +++-----
3712
3 files changed, 17 insertions(+), 5 deletions(-)
3718
3 files changed, 17 insertions(+), 5 deletions(-)
(-)a/NEWS (+2 lines)
Lines 111-116 documents those changes that are of interest to users and administrators. Link Here
111
 -- openapi/dbv0.0.38 - add requestBody for /accounts/ in openapi.json.
111
 -- openapi/dbv0.0.38 - add requestBody for /accounts/ in openapi.json.
112
 -- openapi/dbv0.0.38 - add missing response field "removed_associations"
112
 -- openapi/dbv0.0.38 - add missing response field "removed_associations"
113
    in openapi.json
113
    in openapi.json
114
 -- openapi/dbv0.0.38 - Correct type from object to array for user assocations
115
    list in openapi.json.
114
116
115
* Changes in Slurm 21.08.7
117
* Changes in Slurm 21.08.7
116
==========================
118
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 196-201 Link Here
196
</tr>
196
</tr>
197
</table>
197
</table>
198
198
199
<h4>Switch field from object to array</h4>
200
<table class="tchange">
201
<tr class="trchange">
202
	<td class="tdfield">modified field</td>
203
	<td class="tdchange" colspan=2>
204
		<ul>
205
			<li>.components.schemas."dbv0.0.38_user".properties.associations</li>
206
		</ul>
207
	</td>
208
</tr>
209
</table>
210
199
<h4>Add requestBody field and associated schema</h4>
211
<h4>Add requestBody field and associated schema</h4>
200
<table class="tchange">
212
<table class="tchange">
201
<tr class="trchange">
213
<tr class="trchange">
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-7 / +3 lines)
Lines 2292-2303 Link Here
2292
            "description": "Description of administrator level"
2292
            "description": "Description of administrator level"
2293
          },
2293
          },
2294
          "associations": {
2294
          "associations": {
2295
            "type": "object",
2295
            "type": "array",
2296
            "description": "Assigned associations",
2296
            "description": "Assigned associations",
2297
            "properties": {
2297
            "items": {
2298
              "root": {
2298
              "$ref": "#/components/schemas/dbv0.0.38_association_short_info"
2299
                "$ref": "#/components/schemas/dbv0.0.38_association_short_info"
2300
              }
2301
            }
2299
            }
2302
          },
2300
          },
2303
          "coordinators": {
2301
          "coordinators": {
2304
- 
2305
per qos in qos list in openapi.json.
2302
per qos in qos list in openapi.json.
2306
--
2307
NEWS                                              |  2 ++
2303
NEWS                                              |  2 ++
2308
doc/html/openapi_release_notes/slurm-22.05.0.html | 12 ++++++++++++
2304
doc/html/openapi_release_notes/slurm-22.05.0.html | 12 ++++++++++++
2309
src/plugins/openapi/dbv0.0.38/openapi.json        |  3 +++
2305
src/plugins/openapi/dbv0.0.38/openapi.json        |  3 +++
2310
3 files changed, 17 insertions(+)
2306
3 files changed, 17 insertions(+)
(-)a/NEWS (+2 lines)
Lines 113-118 documents those changes that are of interest to users and administrators. Link Here
113
    in openapi.json
113
    in openapi.json
114
 -- openapi/dbv0.0.38 - Correct type from object to array for user assocations
114
 -- openapi/dbv0.0.38 - Correct type from object to array for user assocations
115
    list in openapi.json.
115
    list in openapi.json.
116
 -- openapi/dbv0.0.38 - Add missing field for tres minutes per qos in qos list
117
    in openapi.json.
116
118
117
* Changes in Slurm 21.08.7
119
* Changes in Slurm 21.08.7
118
==========================
120
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 208-213 Link Here
208
</tr>
208
</tr>
209
</table>
209
</table>
210
210
211
<h4>Add missing field</h4>
212
<table class="tchange">
213
<tr class="trchange">
214
	<td class="tdfield">new field</td>
215
	<td class="tdchange" colspan=2>
216
		<ul>
217
			<li>.components.schemas."dbv0.0.38_qos".properties.limits.properties.max.properties.tres.properties.minutes.properties.per.properties.qos</li>
218
		</ul>
219
	</td>
220
</tr>
221
</table>
222
211
<h4>Add requestBody field and associated schema</h4>
223
<h4>Add requestBody field and associated schema</h4>
212
<table class="tchange">
224
<table class="tchange">
213
<tr class="trchange">
225
<tr class="trchange">
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-2 / +3 lines)
Lines 2717-2722 Link Here
2717
                              },
2717
                              },
2718
                              "user": {
2718
                              "user": {
2719
                                "$ref": "#/components/schemas/dbv0.0.38_tres_list"
2719
                                "$ref": "#/components/schemas/dbv0.0.38_tres_list"
2720
                              },
2721
                              "qos": {
2722
                                "$ref": "#/components/schemas/dbv0.0.38_tres_list"
2720
                              }
2723
                              }
2721
                            }
2724
                            }
2722
                          }
2725
                          }
2723
- 
2724
list in openapi.json
2726
list in openapi.json
2725
--
2726
NEWS                                              | 1 +
2727
NEWS                                              | 1 +
2727
doc/html/openapi_release_notes/slurm-22.05.0.html | 1 +
2728
doc/html/openapi_release_notes/slurm-22.05.0.html | 1 +
2728
src/plugins/openapi/dbv0.0.38/openapi.json        | 4 ++++
2729
src/plugins/openapi/dbv0.0.38/openapi.json        | 4 ++++
2729
3 files changed, 6 insertions(+)
2730
3 files changed, 6 insertions(+)
(-)a/NEWS (+1 lines)
Lines 115-120 documents those changes that are of interest to users and administrators. Link Here
115
    list in openapi.json.
115
    list in openapi.json.
116
 -- openapi/dbv0.0.38 - Add missing field for tres minutes per qos in qos list
116
 -- openapi/dbv0.0.38 - Add missing field for tres minutes per qos in qos list
117
    in openapi.json.
117
    in openapi.json.
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
118
119
119
* Changes in Slurm 21.08.7
120
* Changes in Slurm 21.08.7
120
==========================
121
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+1 lines)
Lines 215-220 Link Here
215
	<td class="tdchange" colspan=2>
215
	<td class="tdchange" colspan=2>
216
		<ul>
216
		<ul>
217
			<li>.components.schemas."dbv0.0.38_qos".properties.limits.properties.max.properties.tres.properties.minutes.properties.per.properties.qos</li>
217
			<li>.components.schemas."dbv0.0.38_qos".properties.limits.properties.max.properties.tres.properties.minutes.properties.per.properties.qos</li>
218
			<li>.components.schemas."dbv0.0.38_qos".properties.name</li>
218
		</ul>
219
		</ul>
219
	</td>
220
	</td>
220
</tr>
221
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-2 / +4 lines)
Lines 2811-2816 Link Here
2811
          "usage_threshold": {
2811
          "usage_threshold": {
2812
            "type": "number",
2812
            "type": "number",
2813
            "description": "Usage threshold"
2813
            "description": "Usage threshold"
2814
          },
2815
          "name": {
2816
            "description": "Assigned name of QOS",
2817
            "type": "string"
2814
          }
2818
          }
2815
        }
2819
        }
2816
      },
2820
      },
2817
- 
2818
openapi.json
2821
openapi.json
2819
--
2820
NEWS                                              |  1 +
2822
NEWS                                              |  1 +
2821
doc/html/openapi_release_notes/slurm-22.05.0.html | 12 ++++++++++++
2823
doc/html/openapi_release_notes/slurm-22.05.0.html | 12 ++++++++++++
2822
src/plugins/openapi/dbv0.0.38/openapi.json        |  6 +-----
2824
src/plugins/openapi/dbv0.0.38/openapi.json        |  6 +-----
2823
3 files changed, 14 insertions(+), 5 deletions(-)
2825
3 files changed, 14 insertions(+), 5 deletions(-)
(-)a/NEWS (+1 lines)
Lines 116-121 documents those changes that are of interest to users and administrators. Link Here
116
 -- openapi/dbv0.0.38 - Add missing field for tres minutes per qos in qos list
116
 -- openapi/dbv0.0.38 - Add missing field for tres minutes per qos in qos list
117
    in openapi.json.
117
    in openapi.json.
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
119
120
120
* Changes in Slurm 21.08.7
121
* Changes in Slurm 21.08.7
121
==========================
122
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 221-226 Link Here
221
</tr>
221
</tr>
222
</table>
222
</table>
223
223
224
<h4>Correct field type to reference</h4>
225
<table class="tchange">
226
<tr class="trchange">
227
	<td class="tdfield">modified field</td>
228
	<td class="tdchange" colspan=2>
229
		<ul>
230
			<li>.components.schemas."dbv0.0.38_config_info".properties.tres</li>
231
		</ul>
232
	</td>
233
</tr>
234
</table>
235
224
<h4>Add requestBody field and associated schema</h4>
236
<h4>Add requestBody field and associated schema</h4>
225
<table class="tchange">
237
<table class="tchange">
226
<tr class="trchange">
238
<tr class="trchange">
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-7 / +1 lines)
Lines 2899-2909 Link Here
2899
            }
2899
            }
2900
          },
2900
          },
2901
          "tres": {
2901
          "tres": {
2902
            "type": "array",
2902
            "$ref": "#/components/schemas/dbv0.0.36_tres_list"
2903
            "description": "Array of tres",
2904
            "items": {
2905
              "$ref": "#/components/schemas/dbv0.0.38_tres_list"
2906
            }
2907
          }
2903
          }
2908
        }
2904
        }
2909
      },
2905
      },
2910
- 
2911
jobs in openapi.json
2906
jobs in openapi.json
2912
--
2913
NEWS                                              | 1 +
2907
NEWS                                              | 1 +
2914
doc/html/openapi_release_notes/slurm-22.05.0.html | 2 ++
2908
doc/html/openapi_release_notes/slurm-22.05.0.html | 2 ++
2915
src/plugins/openapi/dbv0.0.38/openapi.json        | 4 ++--
2909
src/plugins/openapi/dbv0.0.38/openapi.json        | 4 ++--
2916
3 files changed, 5 insertions(+), 2 deletions(-)
2910
3 files changed, 5 insertions(+), 2 deletions(-)
(-)a/NEWS (+1 lines)
Lines 117-122 documents those changes that are of interest to users and administrators. Link Here
117
    in openapi.json.
117
    in openapi.json.
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
120
121
121
* Changes in Slurm 21.08.7
122
* Changes in Slurm 21.08.7
122
==========================
123
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+2 lines)
Lines 228-233 Link Here
228
	<td class="tdchange" colspan=2>
228
	<td class="tdchange" colspan=2>
229
		<ul>
229
		<ul>
230
			<li>.components.schemas."dbv0.0.38_config_info".properties.tres</li>
230
			<li>.components.schemas."dbv0.0.38_config_info".properties.tres</li>
231
			<li>.components.schemas."dbv0.0.38".properties.het.properties.job_id</li>
232
			<li>.components.schemas."dbv0.0.38".properties.het.properties.job_offset</li>
231
		</ul>
233
		</ul>
232
	</td>
234
	</td>
233
</tr>
235
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-4 / +2 lines)
Lines 3130-3140 Link Here
3130
            "description": "Heterogeneous Job details (optional)",
3130
            "description": "Heterogeneous Job details (optional)",
3131
            "properties": {
3131
            "properties": {
3132
              "job_id": {
3132
              "job_id": {
3133
                "type": "object",
3133
                "type": "integer",
3134
                "description": "Parent HetJob id"
3134
                "description": "Parent HetJob id"
3135
              },
3135
              },
3136
              "job_offset": {
3136
              "job_offset": {
3137
                "type": "object",
3137
                "type": "integer",
3138
                "description": "Offset of this job to parent"
3138
                "description": "Offset of this job to parent"
3139
              }
3139
              }
3140
            }
3140
            }
3141
- 
3142
openapi.json
3141
openapi.json
3143
--
3144
NEWS                                              |  1 +
3142
NEWS                                              |  1 +
3145
doc/html/openapi_release_notes/slurm-22.05.0.html |  1 +
3143
doc/html/openapi_release_notes/slurm-22.05.0.html |  1 +
3146
src/plugins/openapi/dbv0.0.38/openapi.json        | 10 ++--------
3144
src/plugins/openapi/dbv0.0.38/openapi.json        | 10 ++--------
3147
3 files changed, 4 insertions(+), 8 deletions(-)
3145
3 files changed, 4 insertions(+), 8 deletions(-)
(-)a/NEWS (+1 lines)
Lines 118-123 documents those changes that are of interest to users and administrators. Link Here
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
118
 -- openapi/dbv0.0.38 - Add missing field for name in qos list in openapi.json.
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
121
 -- openapi/dbv0.0.38 - Correct task type for job steps in openapi.json.
121
122
122
* Changes in Slurm 21.08.7
123
* Changes in Slurm 21.08.7
123
==========================
124
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+1 lines)
Lines 230-235 Link Here
230
			<li>.components.schemas."dbv0.0.38_config_info".properties.tres</li>
230
			<li>.components.schemas."dbv0.0.38_config_info".properties.tres</li>
231
			<li>.components.schemas."dbv0.0.38".properties.het.properties.job_id</li>
231
			<li>.components.schemas."dbv0.0.38".properties.het.properties.job_id</li>
232
			<li>.components.schemas."dbv0.0.38".properties.het.properties.job_offset</li>
232
			<li>.components.schemas."dbv0.0.38".properties.het.properties.job_offset</li>
233
			<li>.components.schemas."dbv0.0.38_job_step".properties.task</li>
233
		</ul>
234
		</ul>
234
	</td>
235
	</td>
235
</tr>
236
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-10 / +2 lines)
Lines 3482-3495 Link Here
3482
            }
3482
            }
3483
          },
3483
          },
3484
          "task": {
3484
          "task": {
3485
            "type": "object",
3485
            "description": "Task distribution properties",
3486
            "description": "Task properties",
3486
            "type": "string"
3487
            "properties": {
3488
              "distribution": {
3489
                "type": "string",
3490
                "description": "Task distribution type"
3491
              }
3492
            }
3493
          },
3487
          },
3494
          "tres": {
3488
          "tres": {
3495
            "type": "object",
3489
            "type": "object",
3496
- 
3497
openapi.json
3490
openapi.json
3498
--
3499
NEWS                                              |  1 +
3491
NEWS                                              |  1 +
3500
doc/html/openapi_release_notes/slurm-22.05.0.html |  3 +++
3492
doc/html/openapi_release_notes/slurm-22.05.0.html |  3 +++
3501
src/plugins/openapi/dbv0.0.38/openapi.json        | 12 ++++++++++--
3493
src/plugins/openapi/dbv0.0.38/openapi.json        | 12 ++++++++++--
3502
3 files changed, 14 insertions(+), 2 deletions(-)
3494
3 files changed, 14 insertions(+), 2 deletions(-)
(-)a/NEWS (+1 lines)
Lines 119-124 documents those changes that are of interest to users and administrators. Link Here
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
119
 -- openapi/dbv0.0.38 - Correct tres field in qos list in openapi.json.
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
121
 -- openapi/dbv0.0.38 - Correct task type for job steps in openapi.json.
121
 -- openapi/dbv0.0.38 - Correct task type for job steps in openapi.json.
122
 -- openapi/dbv0.0.38 - Sync fields for errors to source in openapi.json.
122
123
123
* Changes in Slurm 21.08.7
124
* Changes in Slurm 21.08.7
124
==========================
125
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+3 lines)
Lines 191-196 Link Here
191
	<td class="tdchange" colspan=2>
191
	<td class="tdchange" colspan=2>
192
		<ul>
192
		<ul>
193
			<li>.components.schemas."dbv0.0.38_response_association_delete".properties.removed_associations</li>
193
			<li>.components.schemas."dbv0.0.38_response_association_delete".properties.removed_associations</li>
194
			<li>.components.schemas."dbv0.0.38_error".properties.error_number</li>
195
			<li>.components.schemas."dbv0.0.38_error".properties.source</li>
196
			<li>.components.schemas."dbv0.0.38_error".properties.description</li>
194
		</ul>
197
		</ul>
195
	</td>
198
	</td>
196
</tr>
199
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-4 / +10 lines)
Lines 3628-3640 Link Here
3628
      },
3628
      },
3629
      "dbv0.0.38_error": {
3629
      "dbv0.0.38_error": {
3630
        "properties": {
3630
        "properties": {
3631
          "errno": {
3631
          "error_number": {
3632
            "description": "Error number",
3632
            "description": "Slurm internal error number",
3633
            "type": "integer"
3633
            "type": "integer"
3634
          },
3634
          },
3635
          "error": {
3635
          "error": {
3636
            "description": "Error message",
3636
            "description": "Error message",
3637
            "type": "string"
3637
            "type": "string"
3638
          },
3639
          "source": {
3640
            "description": "Where error occured in the source",
3641
            "type": "string"
3642
          },
3643
          "description": {
3644
            "description": "Explaination of cause of error",
3645
            "type": "string"
3638
          }
3646
          }
3639
        },
3647
        },
3640
        "type": "object"
3648
        "type": "object"
3641
- 
3642
clusters in clusters list in openapi.json
3649
clusters in clusters list in openapi.json
3643
--
3644
NEWS                                          |  2 +
3650
NEWS                                          |  2 +
3645
.../openapi_release_notes/slurm-22.05.0.html  |  2 +
3651
.../openapi_release_notes/slurm-22.05.0.html  |  2 +
3646
src/plugins/openapi/dbv0.0.38/openapi.json    | 40 +++++++++++++++++++
3652
src/plugins/openapi/dbv0.0.38/openapi.json    | 40 +++++++++++++++++++
3647
src/plugins/openapi/v0.0.38/openapi.json      |  6 +--
3653
src/plugins/openapi/v0.0.38/openapi.json      |  6 +--
3648
4 files changed, 45 insertions(+), 5 deletions(-)
3654
4 files changed, 45 insertions(+), 5 deletions(-)
(-)a/NEWS (+2 lines)
Lines 120-125 documents those changes that are of interest to users and administrators. Link Here
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
120
 -- openapi/dbv0.0.38 - Correct het job details types in jobs in openapi.json
121
 -- openapi/dbv0.0.38 - Correct task type for job steps in openapi.json.
121
 -- openapi/dbv0.0.38 - Correct task type for job steps in openapi.json.
122
 -- openapi/dbv0.0.38 - Sync fields for errors to source in openapi.json.
122
 -- openapi/dbv0.0.38 - Sync fields for errors to source in openapi.json.
123
 -- openapi/dbv0.0.38 - Add missing field for adding clusters in clusters list
124
    in openapi.json.
123
125
124
* Changes in Slurm 21.08.7
126
* Changes in Slurm 21.08.7
125
==========================
127
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+2 lines)
Lines 194-199 Link Here
194
			<li>.components.schemas."dbv0.0.38_error".properties.error_number</li>
194
			<li>.components.schemas."dbv0.0.38_error".properties.error_number</li>
195
			<li>.components.schemas."dbv0.0.38_error".properties.source</li>
195
			<li>.components.schemas."dbv0.0.38_error".properties.source</li>
196
			<li>.components.schemas."dbv0.0.38_error".properties.description</li>
196
			<li>.components.schemas."dbv0.0.38_error".properties.description</li>
197
			<li>.components.schemas."/clusters/".properties.post.properties.requestBody</li>
198
			<li>.components.schemas."dbv0.0.38_clusters_properties"</li>
197
		</ul>
199
		</ul>
198
	</td>
200
	</td>
199
</tr>
201
</tr>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (+40 lines)
Lines 1028-1033 Link Here
1028
          }
1028
          }
1029
        },
1029
        },
1030
        "summary": "Add clusters"
1030
        "summary": "Add clusters"
1031
	    "description": "Unable to add cluster",
1032
	    "content": {
1033
	      "application/json": {
1034
		"schema": {
1035
		  "$ref": "#/components/schemas/dbv0.0.38_errors"
1036
		}
1037
	      },
1038
	      "application/x-yaml": {
1039
		"schema": {
1040
		  "$ref": "#/components/schemas/dbv0.0.38_errors"
1041
		}
1042
	      }
1043
	    }
1044
	  }
1045
	},
1046
	"summary": "Add clusters",
1047
	"requestBody": {
1048
	  "description": "Add or update clusters",
1049
	  "content": {
1050
	    "application/json": {
1051
	      "schema": {
1052
		"$ref": "#/components/schemas/dbv0.0.38_clusters_properties"
1053
	      }
1054
	    },
1055
	    "application/x-yaml": {
1056
	      "schema": {
1057
		"$ref": "#/components/schemas/dbv0.0.38_clusters_properties"
1058
	      }
1059
	    }
1060
	  },
1061
	  "required": true
1062
	}
1031
      }
1063
      }
1032
    },
1064
    },
1033
    "/wckey/{wckey}": {
1065
    "/wckey/{wckey}": {
Lines 3711-3716 Link Here
3711
            }
3743
            }
3712
          }
3744
          }
3713
        }
3745
        }
3746
      },
3747
      "dbv0.0.38_clusters_properties": {
3748
	"type": "object",
3749
	"properties": {
3750
	  "clusters": {
3751
	    "$ref": "#/components/schemas/dbv0.0.38_cluster_info"
3752
	  }
3753
	}
3714
      }
3754
      }
3715
    }
3755
    }
3716
  }
3756
  }
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-7 / +1 lines)
Lines 1951-1961 Link Here
1951
            "description": "number of assigned job hosts"
1951
            "description": "number of assigned job hosts"
1952
          },
1952
          },
1953
          "allocated_nodes": {
1953
          "allocated_nodes": {
1954
            "type": "object",
1954
            "$ref": "#/components/schemas/v0.0.38_node_allocation"
1955
            "description": "node allocations",
1956
            "properties": {
1957
              "$ref": "#/components/schemas/v0.0.38_node_allocation"
1958
            }
1959
          }
1955
          }
1960
        }
1956
        }
1961
      },
1957
      },
1962
- 
1963
--
1964
NEWS                                          |  1 +
1958
NEWS                                          |  1 +
1965
.../openapi_release_notes/slurm-22.05.0.html  | 22 +++++++++++++++++++
1959
.../openapi_release_notes/slurm-22.05.0.html  | 22 +++++++++++++++++++
1966
src/plugins/openapi/v0.0.38/openapi.json      | 12 +++++-----
1960
src/plugins/openapi/v0.0.38/openapi.json      | 12 +++++-----
1967
3 files changed, 29 insertions(+), 6 deletions(-)
1961
3 files changed, 29 insertions(+), 6 deletions(-)
(-)a/NEWS (+1 lines)
Lines 122-127 documents those changes that are of interest to users and administrators. Link Here
122
 -- openapi/dbv0.0.38 - Sync fields for errors to source in openapi.json.
122
 -- openapi/dbv0.0.38 - Sync fields for errors to source in openapi.json.
123
 -- openapi/dbv0.0.38 - Add missing field for adding clusters in clusters list
123
 -- openapi/dbv0.0.38 - Add missing field for adding clusters in clusters list
124
    in openapi.json.
124
    in openapi.json.
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
125
126
126
* Changes in Slurm 21.08.7
127
* Changes in Slurm 21.08.7
127
==========================
128
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+22 lines)
Lines 500-505 Link Here
500
</tr>
500
</tr>
501
</table>
501
</table>
502
502
503
<h4>Correct parameter styles to "form"</h4>
504
<table class="tchange">
505
<tr class="trchange">
506
	<td class="tdfield">modified fields</td>
507
	<td class="tdchange" colspan=2>
508
		<ul>
509
			<li>.paths."/jobs/"[].parameters[]|select(.name="update_type)"</li>
510
			<li>.paths."/job/{job_id}"[].get.parameters[]|select(.name="job_id)"</li>
511
			<li>.paths."/job/{job_id}"[].post.parameters[]|select(.name="job_id)"</li>
512
			<li>.paths."/nodes/"[].get.parameters[]|select(.name="update_time)"</li>
513
			<li>.paths."/node/{node_name}"[].get.parameters[]|select(.name="node_name)"</li>
514
			<li>.paths."/partitions/"[].get.parameters[]|select(.name="update_time)"</li>
515
			<li>.paths."/partition/{partition_name}"[].get.parameters[]|select(.name="partition_name)"</li>
516
			<li>.paths."/partition/{partition_name}"[].get.parameters[]|select(.name="update_time)"</li>
517
			<li>.paths."/reservations/"[].get.parameters[]|select(.name="reservation_name)"</li>
518
			<li>.paths."/reservations/"[].get.parameters[]|select(.name="update_time)"</li>
519
		</ul>
520
	</td>
521
</tr>
522
</table>
523
524
503
<h3>openapi/v0.0.35 (src/plugins/openapi/v0.0.35/openapi.json)</h3>
525
<h3>openapi/v0.0.35 (src/plugins/openapi/v0.0.35/openapi.json)</h3>
504
526
505
<h4>Removal notice</h4>
527
<h4>Removal notice</h4>
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-8 / +6 lines)
Lines 161-167 Link Here
161
            "in": "query",
161
            "in": "query",
162
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
162
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
163
            "required": false,
163
            "required": false,
164
            "style": "simple",
164
            "style": "form",
165
            "explode": false,
165
            "explode": false,
166
            "schema": {
166
            "schema": {
167
              "type": "integer",
167
              "type": "integer",
Lines 398-404 Link Here
398
            "in": "query",
398
            "in": "query",
399
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
399
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
400
            "required": false,
400
            "required": false,
401
            "style": "simple",
401
            "style": "form",
402
            "explode": false,
402
            "explode": false,
403
            "schema": {
403
            "schema": {
404
              "type": "integer",
404
              "type": "integer",
Lines 507-513 Link Here
507
            "in": "query",
507
            "in": "query",
508
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
508
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
509
            "required": false,
509
            "required": false,
510
            "style": "simple",
510
            "style": "form",
511
            "explode": false,
511
            "explode": false,
512
            "schema": {
512
            "schema": {
513
              "type": "integer",
513
              "type": "integer",
Lines 573-579 Link Here
573
            "in": "query",
573
            "in": "query",
574
            "description": "Filter if there were no partition changes (not limited to partition in URL endpoint) since update_time.",
574
            "description": "Filter if there were no partition changes (not limited to partition in URL endpoint) since update_time.",
575
            "required": false,
575
            "required": false,
576
            "style": "simple",
576
            "style": "form",
577
            "explode": false,
577
            "explode": false,
578
            "schema": {
578
            "schema": {
579
              "type": "integer",
579
              "type": "integer",
Lines 628-634 Link Here
628
            "in": "query",
628
            "in": "query",
629
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
629
            "description": "Filter if changed since update_time. Use of this parameter can result in faster replies.",
630
            "required": false,
630
            "required": false,
631
            "style": "simple",
631
            "style": "form",
632
            "explode": false,
632
            "explode": false,
633
            "schema": {
633
            "schema": {
634
              "type": "integer",
634
              "type": "integer",
Lines 694-700 Link Here
694
            "in": "query",
694
            "in": "query",
695
            "description": "Filter if no reservation (not limited to reservation in URL) changed since update_time.",
695
            "description": "Filter if no reservation (not limited to reservation in URL) changed since update_time.",
696
            "required": false,
696
            "required": false,
697
            "style": "simple",
697
            "style": "form",
698
            "explode": false,
698
            "explode": false,
699
            "schema": {
699
            "schema": {
700
              "type": "integer",
700
              "type": "integer",
701
- 
702
--
703
NEWS                                          |  1 +
701
NEWS                                          |  1 +
704
.../openapi_release_notes/slurm-22.05.0.html  | 12 ++++
702
.../openapi_release_notes/slurm-22.05.0.html  | 12 ++++
705
src/plugins/openapi/dbv0.0.38/openapi.json    | 64 +++++++------------
703
src/plugins/openapi/dbv0.0.38/openapi.json    | 64 +++++++------------
706
3 files changed, 37 insertions(+), 40 deletions(-)
704
3 files changed, 37 insertions(+), 40 deletions(-)
(-)a/NEWS (+1 lines)
Lines 123-128 documents those changes that are of interest to users and administrators. Link Here
123
 -- openapi/dbv0.0.38 - Add missing field for adding clusters in clusters list
123
 -- openapi/dbv0.0.38 - Add missing field for adding clusters in clusters list
124
    in openapi.json.
124
    in openapi.json.
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
126
127
127
* Changes in Slurm 21.08.7
128
* Changes in Slurm 21.08.7
128
==========================
129
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 256-261 Link Here
256
</tr>
256
</tr>
257
</table>
257
</table>
258
258
259
<h4>Correct parameter styles to "form"</h4>
260
<table class="tchange">
261
<tr class="trchange">
262
	<td class="tdfield">modified fields</td>
263
	<td class="tdchange" colspan=2>
264
		<ul>
265
			<li>.paths."/job/{job_id}"[].get.parameters[]|select(.name="job_id)"</li>
266
		</ul>
267
	</td>
268
</tr>
269
</table>
270
259
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
271
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
260
272
261
<h4>add plugin</h4>
273
<h4>add plugin</h4>
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-42 / +24 lines)
Lines 53-59 Link Here
53
            "in": "path",
53
            "in": "path",
54
            "description": "Slurm Job ID",
54
            "description": "Slurm Job ID",
55
            "required": true,
55
            "required": true,
56
            "style": "label",
56
            "style": "simple",
57
            "explode": false,
57
            "explode": false,
58
            "schema": {
58
            "schema": {
59
              "type": "integer",
59
              "type": "integer",
Lines 1027-1065 Link Here
1027
            }
1027
            }
1028
          }
1028
          }
1029
        },
1029
        },
1030
        "summary": "Add clusters"
1030
        "summary": "Add clusters",
1031
	    "description": "Unable to add cluster",
1031
        "requestBody": {
1032
	    "content": {
1032
          "description": "Add or update clusters",
1033
	      "application/json": {
1033
          "content": {
1034
		"schema": {
1034
            "application/json": {
1035
		  "$ref": "#/components/schemas/dbv0.0.38_errors"
1035
              "schema": {
1036
		}
1036
                "$ref": "#/components/schemas/dbv0.0.38_clusters_properties"
1037
	      },
1037
              }
1038
	      "application/x-yaml": {
1038
            },
1039
		"schema": {
1039
            "application/x-yaml": {
1040
		  "$ref": "#/components/schemas/dbv0.0.38_errors"
1040
              "schema": {
1041
		}
1041
                "$ref": "#/components/schemas/dbv0.0.38_clusters_properties"
1042
	      }
1042
              }
1043
	    }
1043
            }
1044
	  }
1044
          },
1045
	},
1045
          "required": true
1046
	"summary": "Add clusters",
1046
        }
1047
	"requestBody": {
1048
	  "description": "Add or update clusters",
1049
	  "content": {
1050
	    "application/json": {
1051
	      "schema": {
1052
		"$ref": "#/components/schemas/dbv0.0.38_clusters_properties"
1053
	      }
1054
	    },
1055
	    "application/x-yaml": {
1056
	      "schema": {
1057
		"$ref": "#/components/schemas/dbv0.0.38_clusters_properties"
1058
	      }
1059
	    }
1060
	  },
1061
	  "required": true
1062
	}
1063
      }
1047
      }
1064
    },
1048
    },
1065
    "/wckey/{wckey}": {
1049
    "/wckey/{wckey}": {
Lines 3745-3756 Link Here
3745
        }
3729
        }
3746
      },
3730
      },
3747
      "dbv0.0.38_clusters_properties": {
3731
      "dbv0.0.38_clusters_properties": {
3748
	"type": "object",
3732
        "type": "object",
3749
	"properties": {
3733
        "properties": {
3750
	  "clusters": {
3734
          "clusters": {
3751
	    "$ref": "#/components/schemas/dbv0.0.38_cluster_info"
3735
            "$ref": "#/components/schemas/dbv0.0.38_cluster_info"
3752
	  }
3736
          }
3753
	}
3737
        }
3754
      }
3738
      }
3755
    }
3739
    }
3756
  }
3740
  }
3757
- 
3758
slurm_openapi_p_get_specification()
3741
slurm_openapi_p_get_specification()
3759
--
3760
NEWS                                |  1 +
3742
NEWS                                |  1 +
3761
RELEASE_NOTES                       |  3 +++
3743
RELEASE_NOTES                       |  3 +++
3762
src/common/openapi.c                | 14 ++++++++++++--
3744
src/common/openapi.c                | 14 ++++++++++++--
3763
src/common/openapi.h                |  5 +++++
3745
src/common/openapi.h                |  5 +++++
3764
src/plugins/openapi/dbv0.0.36/api.c |  2 +-
3746
src/plugins/openapi/dbv0.0.36/api.c |  2 +-
3765
src/plugins/openapi/dbv0.0.37/api.c |  2 +-
3747
src/plugins/openapi/dbv0.0.37/api.c |  2 +-
3766
src/plugins/openapi/dbv0.0.38/api.c |  2 +-
3748
src/plugins/openapi/dbv0.0.38/api.c |  2 +-
3767
src/plugins/openapi/v0.0.36/api.c   |  2 +-
3749
src/plugins/openapi/v0.0.36/api.c   |  2 +-
3768
src/plugins/openapi/v0.0.37/api.c   |  2 +-
3750
src/plugins/openapi/v0.0.37/api.c   |  2 +-
3769
src/plugins/openapi/v0.0.38/api.c   |  2 +-
3751
src/plugins/openapi/v0.0.38/api.c   |  2 +-
3770
10 files changed, 27 insertions(+), 8 deletions(-)
3752
10 files changed, 27 insertions(+), 8 deletions(-)
(-)a/NEWS (+1 lines)
Lines 124-129 documents those changes that are of interest to users and administrators. Link Here
124
    in openapi.json.
124
    in openapi.json.
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
127
 -- openapi - add flags to slurm_openapi_p_get_specification().
127
128
128
* Changes in Slurm 21.08.7
129
* Changes in Slurm 21.08.7
129
==========================
130
==========================
(-)a/RELEASE_NOTES (+3 lines)
Lines 72-74 API CHANGES Link Here
72
===========
72
===========
73
 -- openapi/v0.0.35 - Plugin has been removed.
73
 -- openapi/v0.0.35 - Plugin has been removed.
74
 -- burst_buffer plugins - err_msg added to bb_p_job_validate().
74
 -- burst_buffer plugins - err_msg added to bb_p_job_validate().
75
 -- openapi - added flags to slurm_openapi_p_get_specification(). Existing
76
    plugins only need to update their prototype for the function as
77
    maniuplating the flags pointer is optional.
(-)a/src/common/openapi.c (-2 / +12 lines)
Lines 62-68 typedef enum { Link Here
62
typedef struct {
62
typedef struct {
63
	int (*init)(void);
63
	int (*init)(void);
64
	int (*fini)(void);
64
	int (*fini)(void);
65
	data_t *(*get_oas)(void);
65
	data_t *(*get_oas)(openapi_spec_flags_t *flags);
66
} slurm_openapi_ops_t;
66
} slurm_openapi_ops_t;
67
67
68
/*
68
/*
Lines 150-155 struct openapi_s { Link Here
150
	List paths;
150
	List paths;
151
	int path_tag_counter;
151
	int path_tag_counter;
152
	data_t **spec;
152
	data_t **spec;
153
	openapi_spec_flags_t *spec_flags;
153
154
154
	slurm_openapi_ops_t *ops;
155
	slurm_openapi_ops_t *ops;
155
	int context_cnt;
156
	int context_cnt;
Lines 902-909 extern int init_openapi(openapi_t **oas, const char *plugins, Link Here
902
	t->ops = xcalloc((t->plugin_count + 1), sizeof(*t->ops));
903
	t->ops = xcalloc((t->plugin_count + 1), sizeof(*t->ops));
903
	t->context = xcalloc((t->plugin_count + 1), sizeof(*t->context));
904
	t->context = xcalloc((t->plugin_count + 1), sizeof(*t->context));
904
	t->spec = xcalloc((t->plugin_count + 1), sizeof(*t->spec));
905
	t->spec = xcalloc((t->plugin_count + 1), sizeof(*t->spec));
906
	t->spec_flags = xcalloc((t->plugin_count + 1), sizeof(*t->spec_flags));
905
907
906
	for (size_t i = 0; (i < t->plugin_count); i++) {
908
	for (size_t i = 0; (i < t->plugin_count); i++) {
909
		openapi_spec_flags_t flags = OAS_FLAG_NONE;
910
907
		if (t->plugin_handles[i] == PLUGIN_INVALID_HANDLE) {
911
		if (t->plugin_handles[i] == PLUGIN_INVALID_HANDLE) {
908
			error("Invalid plugin to load?");
912
			error("Invalid plugin to load?");
909
			rc = ESLURM_PLUGIN_INVALID;
913
			rc = ESLURM_PLUGIN_INVALID;
Lines 918-930 extern int init_openapi(openapi_t **oas, const char *plugins, Link Here
918
			break;
922
			break;
919
		}
923
		}
920
924
921
		t->spec[t->context_cnt] = (*(t->ops[t->context_cnt].get_oas))();
925
		t->spec[t->context_cnt] =
926
			(*(t->ops[t->context_cnt].get_oas))(&flags);
927
		t->spec_flags[t->context_cnt] = flags;
922
		if (!t->spec[t->context_cnt]) {
928
		if (!t->spec[t->context_cnt]) {
923
			error("unable to load OpenAPI spec");
929
			error("unable to load OpenAPI spec");
924
			rc = ESLURM_PLUGIN_INCOMPLETE;
930
			rc = ESLURM_PLUGIN_INCOMPLETE;
925
			break;
931
			break;
926
		}
932
		}
927
933
934
		debug2("%s: loaded plugin %s with flags 0x%"PRIx64,
935
		       __func__, t->plugin_types[i], flags);
936
928
		t->context_cnt++;
937
		t->context_cnt++;
929
	}
938
	}
930
939
Lines 958-963 extern void destroy_openapi(openapi_t *oas) Link Here
958
	for (size_t i = 0; oas->spec[i]; i++)
967
	for (size_t i = 0; oas->spec[i]; i++)
959
		FREE_NULL_DATA(oas->spec[i]);
968
		FREE_NULL_DATA(oas->spec[i]);
960
	xfree(oas->spec);
969
	xfree(oas->spec);
970
	xfree(oas->spec_flags);
961
	xfree(oas->ops);
971
	xfree(oas->ops);
962
972
963
	for (size_t i = 0; i < oas->plugin_count; i++) {
973
	for (size_t i = 0; i < oas->plugin_count; i++) {
(-)a/src/common/openapi.h (+5 lines)
Lines 68-73 typedef int (*openapi_handler_t)( Link Here
68
	void *auth /* authentication context */
68
	void *auth /* authentication context */
69
);
69
);
70
70
71
typedef enum {
72
	OAS_FLAG_NONE = 0,
73
	OAS_FLAG_MAX = SLURM_BIT(63) /* place holder */
74
} openapi_spec_flags_t;
75
71
/*
76
/*
72
 * Register a given unique tag against a path.
77
 * Register a given unique tag against a path.
73
 *
78
 *
(-)a/src/plugins/openapi/dbv0.0.36/api.c (-1 / +1 lines)
Lines 255-261 extern data_t * get_query_key_list(const char *path, data_t *errors, Link Here
255
	return dst;
255
	return dst;
256
}
256
}
257
257
258
const data_t *slurm_openapi_p_get_specification(void)
258
const data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags)
259
{
259
{
260
	data_t *spec = NULL;
260
	data_t *spec = NULL;
261
261
(-)a/src/plugins/openapi/dbv0.0.37/api.c (-1 / +1 lines)
Lines 258-264 extern data_t * get_query_key_list(const char *path, data_t *errors, Link Here
258
	return dst;
258
	return dst;
259
}
259
}
260
260
261
const data_t *slurm_openapi_p_get_specification(void)
261
const data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags)
262
{
262
{
263
	data_t *spec = NULL;
263
	data_t *spec = NULL;
264
264
(-)a/src/plugins/openapi/dbv0.0.38/api.c (-1 / +1 lines)
Lines 258-264 extern data_t * get_query_key_list(const char *path, data_t *errors, Link Here
258
	return dst;
258
	return dst;
259
}
259
}
260
260
261
const data_t *slurm_openapi_p_get_specification(void)
261
const data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags)
262
{
262
{
263
	data_t *spec = NULL;
263
	data_t *spec = NULL;
264
264
(-)a/src/plugins/openapi/v0.0.36/api.c (-1 / +1 lines)
Lines 117-123 extern data_t *populate_response_format(data_t *resp) Link Here
117
	return data_set_list(data_key_set(resp, "errors"));
117
	return data_set_list(data_key_set(resp, "errors"));
118
}
118
}
119
119
120
extern data_t *slurm_openapi_p_get_specification(void)
120
extern data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags)
121
{
121
{
122
	data_t *spec = NULL;
122
	data_t *spec = NULL;
123
123
(-)a/src/plugins/openapi/v0.0.37/api.c (-1 / +1 lines)
Lines 160-166 extern int resp_error(data_t *errors, int error_code, const char *source, Link Here
160
	return error_code;
160
	return error_code;
161
}
161
}
162
162
163
extern data_t *slurm_openapi_p_get_specification(void)
163
extern data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags)
164
{
164
{
165
	data_t *spec = NULL;
165
	data_t *spec = NULL;
166
166
(-)a/src/plugins/openapi/v0.0.38/api.c (-3 / +1 lines)
Lines 160-166 extern int resp_error(data_t *errors, int error_code, const char *source, Link Here
160
	return error_code;
160
	return error_code;
161
}
161
}
162
162
163
extern data_t *slurm_openapi_p_get_specification(void)
163
extern data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags)
164
{
164
{
165
	data_t *spec = NULL;
165
	data_t *spec = NULL;
166
166
167
- 
168
--
169
RELEASE_NOTES        |   3 +
167
RELEASE_NOTES        |   3 +
170
src/common/openapi.c | 133 +++++++++++++++++++++++++++++++++++++++----
168
src/common/openapi.c | 133 +++++++++++++++++++++++++++++++++++++++----
171
src/common/openapi.h |   1 +
169
src/common/openapi.h |   1 +
172
3 files changed, 126 insertions(+), 11 deletions(-)
170
3 files changed, 126 insertions(+), 11 deletions(-)
(-)a/RELEASE_NOTES (+3 lines)
Lines 75-77 API CHANGES Link Here
75
 -- openapi - added flags to slurm_openapi_p_get_specification(). Existing
75
 -- openapi - added flags to slurm_openapi_p_get_specification(). Existing
76
    plugins only need to update their prototype for the function as
76
    plugins only need to update their prototype for the function as
77
    maniuplating the flags pointer is optional.
77
    maniuplating the flags pointer is optional.
78
 -- openapi - Added OAS_FLAG_MANGLE_OPID to allow plugins to request that the
79
    operationId of path methods be mangled with the full path to ensure
80
    uniqueness.
(-)a/src/common/openapi.c (-11 / +122 lines)
Lines 128-133 typedef struct { Link Here
128
typedef struct {
128
typedef struct {
129
	data_t *src_paths;
129
	data_t *src_paths;
130
	data_t *dst_paths;
130
	data_t *dst_paths;
131
	openapi_spec_flags_t flags;
131
} merge_path_server_t;
132
} merge_path_server_t;
132
133
133
typedef struct {
134
typedef struct {
Lines 137-145 typedef struct { Link Here
137
138
138
typedef struct {
139
typedef struct {
139
	data_t *paths;
140
	data_t *paths;
140
	const char *server_path;
141
	data_t *server_path;
142
	openapi_spec_flags_t flags;
141
} merge_path_t;
143
} merge_path_t;
142
144
145
typedef struct {
146
	data_t *server_path;
147
	char *operation;
148
	char *at;
149
} id_merge_path_t;
150
143
typedef struct {
151
typedef struct {
144
	char *path;
152
	char *path;
145
	char *at;
153
	char *at;
Lines 1072-1084 data_for_each_cmd_t _merge_path_strings(data_t *data, void *arg) Link Here
1072
	return DATA_FOR_EACH_CONT;
1080
	return DATA_FOR_EACH_CONT;
1073
}
1081
}
1074
1082
1083
data_for_each_cmd_t _merge_operationId_strings(data_t *data, void *arg)
1084
{
1085
	id_merge_path_t *args = arg;
1086
	char *p;
1087
1088
	if (data_convert_type(data, DATA_TYPE_STRING) != DATA_TYPE_STRING)
1089
		return DATA_FOR_EACH_FAIL;
1090
1091
	p = data_get_string(data);
1092
1093
	/* sub out '.' for '_' to avoid breaking compilers */
1094
	for (int s = strlen(p), i = 0; i < s; i++)
1095
		if (p[i] == '.')
1096
			p[i] = '_';
1097
1098
	xstrfmtcatat(args->operation, &args->at, "%s%s",
1099
		     (args->at ? "_" : ""),
1100
		     data_get_string(data));
1101
1102
	return DATA_FOR_EACH_CONT;
1103
}
1104
1105
/*
1106
 * Merge plugin id with operationIds in paths.
1107
 * All operationIds must be globaly unique.
1108
 */
1109
data_for_each_cmd_t _differentiate_path_operationId(const char *key,
1110
						    data_t *data, void *arg)
1111
{
1112
	data_t *merge[3] = { 0 }, *merged = NULL;
1113
	id_merge_path_t *args = arg;
1114
	data_t *op;
1115
1116
	if (data_get_type(data) != DATA_TYPE_DICT)
1117
		return DATA_FOR_EACH_CONT;
1118
1119
	if (!(op = data_key_get(data, "operationId"))) {
1120
		debug2("%s: unexpected missing operationId",
1121
		      __func__);
1122
		return DATA_FOR_EACH_CONT;
1123
	}
1124
1125
	/* force operationId to be a string */
1126
	if (data_convert_type(op, DATA_TYPE_STRING) != DATA_TYPE_STRING) {
1127
		error("%s: unexpected type for operationId: %s",
1128
		      __func__, data_type_to_string(data_get_type(op)));
1129
		return DATA_FOR_EACH_FAIL;
1130
	}
1131
1132
	merge[0] = args->server_path;
1133
	merge[1] = parse_url_path(data_get_string_const(op), false, true);
1134
	merged = data_list_join((const data_t **)merge, true);
1135
	FREE_NULL_DATA(merge[1]);
1136
	if (data_list_for_each(merged, _merge_operationId_strings, args) < 0)
1137
		return DATA_FOR_EACH_FAIL;
1138
1139
	data_set_string_own(op, args->operation);
1140
	args->operation = NULL;
1141
1142
	return DATA_FOR_EACH_CONT;
1143
}
1144
1145
data_for_each_cmd_t _find_first_server(data_t *data, void *arg)
1146
{
1147
	data_t **srv = arg;
1148
	data_t *url;
1149
1150
	if (data_get_type(data) != DATA_TYPE_DICT)
1151
		return DATA_FOR_EACH_FAIL;
1152
1153
	url = data_key_get(data, "url");
1154
1155
	if (data_convert_type(url, DATA_TYPE_STRING) == DATA_TYPE_STRING) {
1156
		*srv = parse_url_path(data_get_string(url), false, false);
1157
		return DATA_FOR_EACH_STOP;
1158
	}
1159
1160
	return DATA_FOR_EACH_FAIL;
1161
}
1162
1075
data_for_each_cmd_t _merge_path(const char *key, data_t *data, void *arg)
1163
data_for_each_cmd_t _merge_path(const char *key, data_t *data, void *arg)
1076
{
1164
{
1077
	merge_path_t *args = arg;
1165
	merge_path_t *args = arg;
1078
	data_t *e;
1166
	data_t *e, *servers;
1079
	data_t *merge[3] = { 0 }, *merged = NULL;
1167
	data_t *merge[3] = { 0 }, *merged = NULL;
1080
	merge_path_strings_t mp_args = { 0 };
1168
	merge_path_strings_t mp_args = { 0 };
1081
	data_for_each_cmd_t rc = DATA_FOR_EACH_CONT;
1169
	data_for_each_cmd_t rc = DATA_FOR_EACH_CONT;
1170
	id_merge_path_t id_merge = { 0 };
1171
	bool free_0; /* free merge[0] ? */
1082
1172
1083
	if (data_get_type(data) != DATA_TYPE_DICT) {
1173
	if (data_get_type(data) != DATA_TYPE_DICT) {
1084
		rc = DATA_FOR_EACH_FAIL;
1174
		rc = DATA_FOR_EACH_FAIL;
Lines 1086-1100 data_for_each_cmd_t _merge_path(const char *key, data_t *data, void *arg) Link Here
1086
	}
1176
	}
1087
1177
1088
	/* merge the paths together cleanly */
1178
	/* merge the paths together cleanly */
1089
	if (!data_key_get(data, "servers")) {
1179
	if (!(servers = data_key_get(data, "servers"))) {
1090
		merge[0] = parse_url_path(args->server_path, false, true);
1180
		merge[0] = id_merge.server_path = args->server_path;
1091
		merge[1] = parse_url_path(key, false, true);
1181
		merge[1] = parse_url_path(key, false, true);
1182
		free_0 = false;
1092
	} else {
1183
	} else {
1093
		/* servers is specified: only cleanup the path */
1184
		/* servers is specified: only cleanup the path */
1094
		merge[0] = parse_url_path(key, false, true);
1185
		/* only handling 1 server for now */
1186
		xassert(data_get_list_length(servers) == 1);
1187
1188
		(void) data_list_for_each(servers, _find_first_server,
1189
					  &merge[0]);
1190
		id_merge.server_path = merge[0];
1191
		free_0 = true;
1192
		xassert(merge[0]);
1193
1194
		merge[1] = parse_url_path(key, false, true);
1095
	}
1195
	}
1096
	merged = data_list_join((const data_t **)merge, true);
1097
1196
1197
	merged = data_list_join((const data_t **)merge, true);
1098
	if (data_list_for_each(merged, _merge_path_strings, &mp_args) < 0) {
1198
	if (data_list_for_each(merged, _merge_path_strings, &mp_args) < 0) {
1099
		rc = DATA_FOR_EACH_FAIL;
1199
		rc = DATA_FOR_EACH_FAIL;
1100
		goto cleanup;
1200
		goto cleanup;
Lines 1112-1122 data_for_each_cmd_t _merge_path(const char *key, data_t *data, void *arg) Link Here
1112
	data_set_dict(e);
1212
	data_set_dict(e);
1113
	data_copy(e, data);
1213
	data_copy(e, data);
1114
1214
1115
cleanup:
1215
	if ((args->flags & OAS_FLAG_MANGLE_OPID) &&
1216
	    data_dict_for_each(e, _differentiate_path_operationId,
1217
			       &id_merge) < 0) {
1218
		rc = DATA_FOR_EACH_FAIL;
1219
		goto cleanup;
1220
	}
1116
1221
1117
	FREE_NULL_DATA(merged);
1222
cleanup:
1118
	FREE_NULL_DATA(merge[0]);
1223
	if (free_0)
1224
		FREE_NULL_DATA(merge[0]);
1119
	FREE_NULL_DATA(merge[1]);
1225
	FREE_NULL_DATA(merge[1]);
1226
	FREE_NULL_DATA(merged);
1120
	xfree(mp_args.path);
1227
	xfree(mp_args.path);
1121
1228
1122
	return rc;
1229
	return rc;
Lines 1127-1132 data_for_each_cmd_t _merge_path_server(data_t *data, void *arg) Link Here
1127
	merge_path_server_t *args = arg;
1234
	merge_path_server_t *args = arg;
1128
	merge_path_t p_args = {
1235
	merge_path_t p_args = {
1129
		.paths = args->dst_paths,
1236
		.paths = args->dst_paths,
1237
		.flags = args->flags,
1130
	};
1238
	};
1131
	data_t *url;
1239
	data_t *url;
1132
1240
Lines 1139-1145 data_for_each_cmd_t _merge_path_server(data_t *data, void *arg) Link Here
1139
	if (data_convert_type(url, DATA_TYPE_STRING) != DATA_TYPE_STRING)
1247
	if (data_convert_type(url, DATA_TYPE_STRING) != DATA_TYPE_STRING)
1140
		return DATA_FOR_EACH_FAIL;
1248
		return DATA_FOR_EACH_FAIL;
1141
1249
1142
	p_args.server_path = data_get_string(url);
1250
	p_args.server_path = parse_url_path(data_get_string_const(url),
1251
					    false, false);
1143
1252
1144
	if (args->src_paths &&
1253
	if (args->src_paths &&
1145
	    (data_dict_for_each(args->src_paths, _merge_path, &p_args) < 0))
1254
	    (data_dict_for_each(args->src_paths, _merge_path, &p_args) < 0))
Lines 1222-1227 extern int get_openapi_specification(openapi_t *oas, data_t *resp) Link Here
1222
				.dst_paths = paths,
1331
				.dst_paths = paths,
1223
				.src_paths = data_key_get(oas->spec[i],
1332
				.src_paths = data_key_get(oas->spec[i],
1224
							  "paths"),
1333
							  "paths"),
1334
				.flags = oas->spec_flags[i],
1225
			};
1335
			};
1226
1336
1227
			if (data_list_for_each(src_srvs, _merge_path_server,
1337
			if (data_list_for_each(src_srvs, _merge_path_server,
Lines 1231-1238 extern int get_openapi_specification(openapi_t *oas, data_t *resp) Link Here
1231
		} else {
1341
		} else {
1232
			/* servers is not populated, default to '/' */
1342
			/* servers is not populated, default to '/' */
1233
			merge_path_t p_args = {
1343
			merge_path_t p_args = {
1234
				.server_path = "/",
1344
				.server_path = NULL,
1235
				.paths = paths,
1345
				.paths = paths,
1346
				.flags = oas->spec_flags[i],
1236
			};
1347
			};
1237
			data_t *src_paths = data_key_get(oas->spec[i], "paths");
1348
			data_t *src_paths = data_key_get(oas->spec[i], "paths");
1238
1349
(-)a/src/common/openapi.h (-2 / +1 lines)
Lines 70-75 typedef int (*openapi_handler_t)( Link Here
70
70
71
typedef enum {
71
typedef enum {
72
	OAS_FLAG_NONE = 0,
72
	OAS_FLAG_NONE = 0,
73
	OAS_FLAG_MANGLE_OPID = SLURM_BIT(0), /* mangle operationid */
73
	OAS_FLAG_MAX = SLURM_BIT(63) /* place holder */
74
	OAS_FLAG_MAX = SLURM_BIT(63) /* place holder */
74
} openapi_spec_flags_t;
75
} openapi_spec_flags_t;
75
76
76
- 
77
ensure uniqueness.
77
ensure uniqueness.
78
--
79
NEWS                                          |  1 +
78
NEWS                                          |  1 +
80
.../openapi_release_notes/slurm-22.05.0.html  | 12 +++++++++
79
.../openapi_release_notes/slurm-22.05.0.html  | 12 +++++++++
81
src/plugins/openapi/v0.0.38/api.c             |  2 ++
80
src/plugins/openapi/v0.0.38/api.c             |  2 ++
82
src/plugins/openapi/v0.0.38/openapi.json      | 26 +++++++++----------
81
src/plugins/openapi/v0.0.38/openapi.json      | 26 +++++++++----------
83
4 files changed, 28 insertions(+), 13 deletions(-)
82
4 files changed, 28 insertions(+), 13 deletions(-)
(-)a/NEWS (+1 lines)
Lines 125-130 documents those changes that are of interest to users and administrators. Link Here
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
125
 -- openapi/v0.0.38 - correct parameter styles from "simple" to "form".
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
127
 -- openapi - add flags to slurm_openapi_p_get_specification().
127
 -- openapi - add flags to slurm_openapi_p_get_specification().
128
 -- openapi/v0.0.38 - use new operationId generation to ensure uniqueness.
128
129
129
* Changes in Slurm 21.08.7
130
* Changes in Slurm 21.08.7
130
==========================
131
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 533-538 Link Here
533
</tr>
533
</tr>
534
</table>
534
</table>
535
535
536
<h4>Change operationId naming schema to include url path</h4>
537
<table class="tchange">
538
<tr class="trchange">
539
	<td class="tdfield">modified fields</td>
540
	<td class="tdchange" colspan=2>
541
		<ul>
542
			<li>.paths[][].operationId</li>
543
		</ul>
544
	</td>
545
</tr>
546
</table>
547
536
548
537
<h3>openapi/v0.0.35 (src/plugins/openapi/v0.0.35/openapi.json)</h3>
549
<h3>openapi/v0.0.35 (src/plugins/openapi/v0.0.35/openapi.json)</h3>
538
550
(-)a/src/plugins/openapi/v0.0.38/api.c (+2 lines)
Lines 164-169 extern data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags) Link Here
164
{
164
{
165
	data_t *spec = NULL;
165
	data_t *spec = NULL;
166
166
167
	*flags |= OAS_FLAG_MANGLE_OPID;
168
167
	static_ref_json_to_data_t(spec, openapi_json);
169
	static_ref_json_to_data_t(spec, openapi_json);
168
170
169
	return spec;
171
	return spec;
(-)a/src/plugins/openapi/v0.0.38/openapi.json (-15 / +13 lines)
Lines 42-48 Link Here
42
        "tags": [
42
        "tags": [
43
          "slurm"
43
          "slurm"
44
        ],
44
        ],
45
        "operationId": "slurmctld_diag",
45
        "operationId": "diag",
46
        "summary": "get diagnostics",
46
        "summary": "get diagnostics",
47
        "responses": {
47
        "responses": {
48
          "200": {
48
          "200": {
Lines 112-118 Link Here
112
        "tags": [
112
        "tags": [
113
          "slurm"
113
          "slurm"
114
        ],
114
        ],
115
        "operationId": "slurmctld_ping",
115
        "operationId": "ping",
116
        "summary": "ping test",
116
        "summary": "ping test",
117
        "responses": {
117
        "responses": {
118
          "200": {
118
          "200": {
Lines 153-159 Link Here
153
        "tags": [
153
        "tags": [
154
          "slurm"
154
          "slurm"
155
        ],
155
        ],
156
        "operationId": "slurmctld_get_jobs",
156
        "operationId": "get_jobs",
157
        "summary": "get list of jobs",
157
        "summary": "get list of jobs",
158
        "parameters": [
158
        "parameters": [
159
          {
159
          {
Lines 208-214 Link Here
208
        "tags": [
208
        "tags": [
209
          "slurm"
209
          "slurm"
210
        ],
210
        ],
211
        "operationId": "slurmctld_get_job",
211
        "operationId": "get_job",
212
        "summary": "get job info",
212
        "summary": "get job info",
213
        "parameters": [
213
        "parameters": [
214
          {
214
          {
Lines 248-254 Link Here
248
        "tags": [
248
        "tags": [
249
          "slurm"
249
          "slurm"
250
        ],
250
        ],
251
        "operationId": "slurmctld_update_job",
251
        "operationId": "update_job",
252
        "summary": "update job",
252
        "summary": "update job",
253
        "parameters": [
253
        "parameters": [
254
          {
254
          {
Lines 292-298 Link Here
292
        "tags": [
292
        "tags": [
293
          "slurm"
293
          "slurm"
294
        ],
294
        ],
295
        "operationId": "slurmctld_cancel_job",
295
        "operationId": "cancel_job",
296
        "summary": "cancel or signal job",
296
        "summary": "cancel or signal job",
297
        "parameters": [
297
        "parameters": [
298
          {
298
          {
Lines 333-339 Link Here
333
        "tags": [
333
        "tags": [
334
          "slurm"
334
          "slurm"
335
        ],
335
        ],
336
        "operationId": "slurmctld_submit_job",
336
        "operationId": "submit_job",
337
        "summary": "submit new job",
337
        "summary": "submit new job",
338
        "requestBody": {
338
        "requestBody": {
339
          "description": "submit new job",
339
          "description": "submit new job",
Lines 390-396 Link Here
390
        "tags": [
390
        "tags": [
391
          "slurm"
391
          "slurm"
392
        ],
392
        ],
393
        "operationId": "slurmctld_get_nodes",
393
        "operationId": "get_nodes",
394
        "summary": "get all node info",
394
        "summary": "get all node info",
395
        "parameters": [
395
        "parameters": [
396
          {
396
          {
Lines 445-451 Link Here
445
        "tags": [
445
        "tags": [
446
          "slurm"
446
          "slurm"
447
        ],
447
        ],
448
        "operationId": "slurmctld_get_node",
448
        "operationId": "get_node",
449
        "summary": "get node info",
449
        "summary": "get node info",
450
        "parameters": [
450
        "parameters": [
451
          {
451
          {
Lines 499-505 Link Here
499
        "tags": [
499
        "tags": [
500
          "slurm"
500
          "slurm"
501
        ],
501
        ],
502
        "operationId": "slurmctld_get_partitions",
502
        "operationId": "get_partitions",
503
        "summary": "get all partition info",
503
        "summary": "get all partition info",
504
        "parameters": [
504
        "parameters": [
505
          {
505
          {
Lines 554-560 Link Here
554
        "tags": [
554
        "tags": [
555
          "slurm"
555
          "slurm"
556
        ],
556
        ],
557
        "operationId": "slurmctld_get_partition",
557
        "operationId": "get_partition",
558
        "summary": "get partition info",
558
        "summary": "get partition info",
559
        "parameters": [
559
        "parameters": [
560
          {
560
          {
Lines 620-626 Link Here
620
        "tags": [
620
        "tags": [
621
          "slurm"
621
          "slurm"
622
        ],
622
        ],
623
        "operationId": "slurmctld_get_reservations",
623
        "operationId": "get_reservations",
624
        "summary": "get all reservation info",
624
        "summary": "get all reservation info",
625
        "parameters": [
625
        "parameters": [
626
          {
626
          {
Lines 675-681 Link Here
675
        "tags": [
675
        "tags": [
676
          "slurm"
676
          "slurm"
677
        ],
677
        ],
678
        "operationId": "slurmctld_get_reservation",
678
        "operationId": "get_reservation",
679
        "summary": "get reservation info",
679
        "summary": "get reservation info",
680
        "parameters": [
680
        "parameters": [
681
          {
681
          {
682
- 
683
ensure uniqueness.
682
ensure uniqueness.
684
--
685
NEWS                                          |  1 +
683
NEWS                                          |  1 +
686
.../openapi_release_notes/slurm-22.05.0.html  | 12 ++++
684
.../openapi_release_notes/slurm-22.05.0.html  | 12 ++++
687
src/plugins/openapi/dbv0.0.38/api.c           |  2 +
685
src/plugins/openapi/dbv0.0.38/api.c           |  2 +
688
src/plugins/openapi/dbv0.0.38/openapi.json    | 60 +++++++++----------
686
src/plugins/openapi/dbv0.0.38/openapi.json    | 60 +++++++++----------
689
4 files changed, 45 insertions(+), 30 deletions(-)
687
4 files changed, 45 insertions(+), 30 deletions(-)
(-)a/NEWS (+1 lines)
Lines 126-131 documents those changes that are of interest to users and administrators. Link Here
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
126
 -- openapi/dbv0.0.38 - correct parameter styles from "simple" to "form".
127
 -- openapi - add flags to slurm_openapi_p_get_specification().
127
 -- openapi - add flags to slurm_openapi_p_get_specification().
128
 -- openapi/v0.0.38 - use new operationId generation to ensure uniqueness.
128
 -- openapi/v0.0.38 - use new operationId generation to ensure uniqueness.
129
 -- openapi/dbv0.0.38 - use new operationId generation to ensure uniqueness.
129
130
130
* Changes in Slurm 21.08.7
131
* Changes in Slurm 21.08.7
131
==========================
132
==========================
(-)a/doc/html/openapi_release_notes/slurm-22.05.0.html (+12 lines)
Lines 268-273 Link Here
268
</tr>
268
</tr>
269
</table>
269
</table>
270
270
271
<h4>Change operationId naming schema to include url path</h4>
272
<table class="tchange">
273
<tr class="trchange">
274
	<td class="tdfield">modified fields</td>
275
	<td class="tdchange" colspan=2>
276
		<ul>
277
			<li>.paths[][].operationId</li>
278
		</ul>
279
	</td>
280
</tr>
281
</table>
282
271
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
283
<h3>openapi/v0.0.38 (src/plugins/openapi/v0.0.38/openapi.json)</h3>
272
284
273
<h4>add plugin</h4>
285
<h4>add plugin</h4>
(-)a/src/plugins/openapi/dbv0.0.38/api.c (+2 lines)
Lines 262-267 const data_t *slurm_openapi_p_get_specification(openapi_spec_flags_t *flags) Link Here
262
{
262
{
263
	data_t *spec = NULL;
263
	data_t *spec = NULL;
264
264
265
	*flags |= OAS_FLAG_MANGLE_OPID;
266
265
	static_ref_json_to_data_t(spec, openapi_json);
267
	static_ref_json_to_data_t(spec, openapi_json);
266
268
267
	return spec;
269
	return spec;
(-)a/src/plugins/openapi/dbv0.0.38/openapi.json (-31 / +30 lines)
Lines 44-50 Link Here
44
        "tags": [
44
        "tags": [
45
          "slurm"
45
          "slurm"
46
        ],
46
        ],
47
        "operationId": "slurmdbd_get_job",
47
        "operationId": "get_job",
48
        "summary": "Get job info",
48
        "summary": "Get job info",
49
        "description": "This endpoint may return multiple job entries since job_id is not a unique key - only the tuple (cluster, job_id, start_time) is unique. If the requested job_id is a component of a heterogeneous job all components are returned.",
49
        "description": "This endpoint may return multiple job entries since job_id is not a unique key - only the tuple (cluster, job_id, start_time) is unique. If the requested job_id is a component of a heterogeneous job all components are returned.",
50
        "parameters": [
50
        "parameters": [
Lines 100-106 Link Here
100
        "tags": [
100
        "tags": [
101
          "slurm"
101
          "slurm"
102
        ],
102
        ],
103
        "operationId": "slurmdbd_get_db_config",
103
        "operationId": "get_config",
104
        "summary": "Dump all configuration information",
104
        "summary": "Dump all configuration information",
105
        "responses": {
105
        "responses": {
106
          "200": {
106
          "200": {
Lines 139-145 Link Here
139
        "tags": [
139
        "tags": [
140
          "slurm"
140
          "slurm"
141
        ],
141
        ],
142
        "operationId": "slurmdbd_set_db_config",
142
        "operationId": "set_config",
143
        "summary": "Load all configuration information",
143
        "summary": "Load all configuration information",
144
        "responses": {
144
        "responses": {
145
          "200": {
145
          "200": {
Lines 180-186 Link Here
180
        "tags": [
180
        "tags": [
181
          "slurm"
181
          "slurm"
182
        ],
182
        ],
183
        "operationId": "slurmdbd_update_tres",
183
        "operationId": "update_tres",
184
        "responses": {
184
        "responses": {
185
          "200": {
185
          "200": {
186
            "content": {
186
            "content": {
Lines 219-225 Link Here
219
        "tags": [
219
        "tags": [
220
          "slurm"
220
          "slurm"
221
        ],
221
        ],
222
        "operationId": "slurmdbd_get_tres",
222
        "operationId": "get_tres",
223
        "responses": {
223
        "responses": {
224
          "200": {
224
          "200": {
225
            "content": {
225
            "content": {
Lines 249-255 Link Here
249
          "slurm"
249
          "slurm"
250
        ],
250
        ],
251
        "summary": "Delete QOS",
251
        "summary": "Delete QOS",
252
        "operationId": "slurmdbd_delete_qos",
252
        "operationId": "delete_qos",
253
        "responses": {
253
        "responses": {
254
          "200": {
254
          "200": {
255
            "content": {
255
            "content": {
Lines 301-307 Link Here
301
          "slurm"
301
          "slurm"
302
        ],
302
        ],
303
        "summary": "Get QOS info",
303
        "summary": "Get QOS info",
304
        "operationId": "slurmdbd_get_single_qos",
304
        "operationId": "get_single_qos",
305
        "responses": {
305
        "responses": {
306
          "200": {
306
          "200": {
307
            "content": {
307
            "content": {
Lines 354-360 Link Here
354
        "tags": [
354
        "tags": [
355
          "slurm"
355
          "slurm"
356
        ],
356
        ],
357
        "operationId": "slurmdbd_get_qos",
357
        "operationId": "get_qos",
358
        "responses": {
358
        "responses": {
359
          "200": {
359
          "200": {
360
            "content": {
360
            "content": {
Lines 395-401 Link Here
395
        "tags": [
395
        "tags": [
396
          "slurm"
396
          "slurm"
397
        ],
397
        ],
398
        "operationId": "slurmdbd_update_associations",
398
        "operationId": "update_associations",
399
        "responses": {
399
        "responses": {
400
          "200": {
400
          "200": {
401
            "content": {
401
            "content": {
Lines 434-440 Link Here
434
        "tags": [
434
        "tags": [
435
          "slurm"
435
          "slurm"
436
        ],
436
        ],
437
        "operationId": "slurmdbd_get_associations",
437
        "operationId": "get_associations",
438
        "responses": {
438
        "responses": {
439
          "200": {
439
          "200": {
440
            "content": {
440
            "content": {
Lines 475-481 Link Here
475
        "tags": [
475
        "tags": [
476
          "slurm"
476
          "slurm"
477
        ],
477
        ],
478
        "operationId": "slurmdbd_get_association",
478
        "operationId": "get_association",
479
        "parameters": [
479
        "parameters": [
480
          {
480
          {
481
            "name": "cluster",
481
            "name": "cluster",
Lines 560-566 Link Here
560
        "tags": [
560
        "tags": [
561
          "slurm"
561
          "slurm"
562
        ],
562
        ],
563
        "operationId": "slurmdbd_delete_association",
563
        "operationId": "delete_association",
564
        "parameters": [
564
        "parameters": [
565
          {
565
          {
566
            "name": "cluster",
566
            "name": "cluster",
Lines 648-654 Link Here
648
          "slurm"
648
          "slurm"
649
        ],
649
        ],
650
        "summary": "Delete user",
650
        "summary": "Delete user",
651
        "operationId": "slurmdbd_delete_user",
651
        "operationId": "delete_user",
652
        "responses": {
652
        "responses": {
653
          "200": {
653
          "200": {
654
            "content": {
654
            "content": {
Lines 700-706 Link Here
700
          "slurm"
700
          "slurm"
701
        ],
701
        ],
702
        "summary": "Get user info",
702
        "summary": "Get user info",
703
        "operationId": "slurmdbd_get_user",
703
        "operationId": "get_user",
704
        "responses": {
704
        "responses": {
705
          "200": {
705
          "200": {
706
            "content": {
706
            "content": {
Lines 754-760 Link Here
754
          "slurm"
754
          "slurm"
755
        ],
755
        ],
756
        "summary": "Update user",
756
        "summary": "Update user",
757
        "operationId": "slurmdbd_update_users",
757
        "operationId": "update_users",
758
        "requestBody": {
758
        "requestBody": {
759
          "description": "add or update user",
759
          "description": "add or update user",
760
          "content": {
760
          "content": {
Lines 809-815 Link Here
809
          "slurm"
809
          "slurm"
810
        ],
810
        ],
811
        "summary": "Get user list",
811
        "summary": "Get user list",
812
        "operationId": "slurmdbd_get_users",
812
        "operationId": "get_users",
813
        "responses": {
813
        "responses": {
814
          "200": {
814
          "200": {
815
            "content": {
815
            "content": {
Lines 850-856 Link Here
850
          "slurm"
850
          "slurm"
851
        ],
851
        ],
852
        "summary": "Delete cluster",
852
        "summary": "Delete cluster",
853
        "operationId": "slurmdbd_delete_cluster",
853
        "operationId": "delete_cluster",
854
        "responses": {
854
        "responses": {
855
          "200": {
855
          "200": {
856
            "content": {
856
            "content": {
Lines 902-908 Link Here
902
          "slurm"
902
          "slurm"
903
        ],
903
        ],
904
        "summary": "Get cluster info",
904
        "summary": "Get cluster info",
905
        "operationId": "slurmdbd_get_cluster",
905
        "operationId": "get_cluster",
906
        "responses": {
906
        "responses": {
907
          "200": {
907
          "200": {
908
            "content": {
908
            "content": {
Lines 955-961 Link Here
955
        "tags": [
955
        "tags": [
956
          "slurm"
956
          "slurm"
957
        ],
957
        ],
958
        "operationId": "slurmdbd_get_clusters",
958
        "operationId": "get_clusters",
959
        "responses": {
959
        "responses": {
960
          "200": {
960
          "200": {
961
            "content": {
961
            "content": {
Lines 994-1000 Link Here
994
        "tags": [
994
        "tags": [
995
          "slurm"
995
          "slurm"
996
        ],
996
        ],
997
        "operationId": "slurmdbd_add_clusters",
997
        "operationId": "add_clusters",
998
        "responses": {
998
        "responses": {
999
          "200": {
999
          "200": {
1000
            "content": {
1000
            "content": {
Lines 1052-1058 Link Here
1052
          "slurm"
1052
          "slurm"
1053
        ],
1053
        ],
1054
        "summary": "Delete wckey",
1054
        "summary": "Delete wckey",
1055
        "operationId": "slurmdbd_delete_wckey",
1055
        "operationId": "delete_wckey",
1056
        "responses": {
1056
        "responses": {
1057
          "200": {
1057
          "200": {
1058
            "content": {
1058
            "content": {
Lines 1104-1110 Link Here
1104
          "slurm"
1104
          "slurm"
1105
        ],
1105
        ],
1106
        "summary": "Get wckey info",
1106
        "summary": "Get wckey info",
1107
        "operationId": "slurmdbd_get_wckey",
1107
        "operationId": "get_wckey",
1108
        "responses": {
1108
        "responses": {
1109
          "200": {
1109
          "200": {
1110
            "content": {
1110
            "content": {
Lines 1157-1163 Link Here
1157
        "tags": [
1157
        "tags": [
1158
          "slurm"
1158
          "slurm"
1159
        ],
1159
        ],
1160
        "operationId": "slurmdbd_get_wckeys",
1160
        "operationId": "get_wckeys",
1161
        "responses": {
1161
        "responses": {
1162
          "200": {
1162
          "200": {
1163
            "content": {
1163
            "content": {
Lines 1196-1202 Link Here
1196
        "tags": [
1196
        "tags": [
1197
          "slurm"
1197
          "slurm"
1198
        ],
1198
        ],
1199
        "operationId": "slurmdbd_add_wckeys",
1199
        "operationId": "add_wckeys",
1200
        "responses": {
1200
        "responses": {
1201
          "200": {
1201
          "200": {
1202
            "content": {
1202
            "content": {
Lines 1238-1244 Link Here
1238
          "slurm"
1238
          "slurm"
1239
        ],
1239
        ],
1240
        "summary": "Delete account",
1240
        "summary": "Delete account",
1241
        "operationId": "slurmdbd_delete_account",
1241
        "operationId": "delete_account",
1242
        "responses": {
1242
        "responses": {
1243
          "200": {
1243
          "200": {
1244
            "content": {
1244
            "content": {
Lines 1290-1296 Link Here
1290
          "slurm"
1290
          "slurm"
1291
        ],
1291
        ],
1292
        "summary": "Get account info",
1292
        "summary": "Get account info",
1293
        "operationId": "slurmdbd_get_account",
1293
        "operationId": "get_account",
1294
        "responses": {
1294
        "responses": {
1295
          "200": {
1295
          "200": {
1296
            "content": {
1296
            "content": {
Lines 1343-1349 Link Here
1343
        "tags": [
1343
        "tags": [
1344
          "slurm"
1344
          "slurm"
1345
        ],
1345
        ],
1346
        "operationId": "slurmdbd_get_accounts",
1346
        "operationId": "get_accounts",
1347
        "responses": {
1347
        "responses": {
1348
          "200": {
1348
          "200": {
1349
            "content": {
1349
            "content": {
Lines 1382-1388 Link Here
1382
        "tags": [
1382
        "tags": [
1383
          "slurm"
1383
          "slurm"
1384
        ],
1384
        ],
1385
        "operationId": "slurmdbd_update_account",
1385
        "operationId": "update_account",
1386
        "responses": {
1386
        "responses": {
1387
          "200": {
1387
          "200": {
1388
            "content": {
1388
            "content": {
Lines 1439-1445 Link Here
1439
        "tags": [
1439
        "tags": [
1440
          "slurm"
1440
          "slurm"
1441
        ],
1441
        ],
1442
        "operationId": "slurmdbd_get_jobs",
1442
        "operationId": "get_jobs",
1443
        "parameters": [
1443
        "parameters": [
1444
          {
1444
          {
1445
            "in": "query",
1445
            "in": "query",
Lines 1757-1763 Link Here
1757
        "tags": [
1757
        "tags": [
1758
          "slurm"
1758
          "slurm"
1759
        ],
1759
        ],
1760
        "operationId": "slurmdbd_diag",
1760
        "operationId": "diag",
1761
        "responses": {
1761
        "responses": {
1762
          "200": {
1762
          "200": {
1763
            "content": {
1763
            "content": {
1764
- 

Return to ticket 12897