Browse Source

Updated from OpenStack Service Type Authority

Change-Id: I5728349874b3b85d52532da8403e0f873ac470e2
OpenStack Proposal Bot 1 year ago
parent
commit
7b28fd3c26
2 changed files with 102 additions and 30 deletions
  1. 95
    26
      os_service_types/data/service-types.json
  2. 7
    4
      os_service_types/tests/base.py

+ 95
- 26
os_service_types/data/service-types.json View File

@@ -19,7 +19,8 @@
19 19
       "backup"
20 20
     ],
21 21
     "baremetal": [
22
-      "baremetal"
22
+      "baremetal",
23
+      "bare-metal"
23 24
     ],
24 25
     "baremetal-introspection": [
25 26
       "baremetal-introspection"
@@ -28,11 +29,13 @@
28 29
       "block-storage",
29 30
       "volumev3",
30 31
       "volumev2",
31
-      "volume"
32
+      "volume",
33
+      "block-store"
32 34
     ],
33 35
     "clustering": [
34 36
       "clustering",
35
-      "resource-cluster"
37
+      "resource-cluster",
38
+      "cluster"
36 39
     ],
37 40
     "compute": [
38 41
       "compute"
@@ -66,6 +69,10 @@
66 69
     "image": [
67 70
       "image"
68 71
     ],
72
+    "instance-ha": [
73
+      "instance-ha",
74
+      "ha"
75
+    ],
69 76
     "key-manager": [
70 77
       "key-manager"
71 78
     ],
@@ -78,7 +85,8 @@
78 85
     ],
79 86
     "meter": [
80 87
       "meter",
81
-      "metering"
88
+      "metering",
89
+      "telemetry"
82 90
     ],
83 91
     "monitoring": [
84 92
       "monitoring"
@@ -116,6 +124,9 @@
116 124
     "rating": [
117 125
       "rating"
118 126
     ],
127
+    "reservation": [
128
+      "reservation"
129
+    ],
119 130
     "resource-optimization": [
120 131
       "resource-optimization",
121 132
       "infra-optim"
@@ -147,13 +158,18 @@
147 158
     "application-deployment": [
148 159
       "application_deployment"
149 160
     ],
161
+    "baremetal": [
162
+      "bare-metal"
163
+    ],
150 164
     "block-storage": [
151 165
       "volumev3",
152 166
       "volumev2",
153
-      "volume"
167
+      "volume",
168
+      "block-store"
154 169
     ],
155 170
     "clustering": [
156
-      "resource-cluster"
171
+      "resource-cluster",
172
+      "cluster"
157 173
     ],
158 174
     "container-infrastructure-management": [
159 175
       "container-infrastructure"
@@ -161,11 +177,15 @@
161 177
     "event": [
162 178
       "events"
163 179
     ],
180
+    "instance-ha": [
181
+      "ha"
182
+    ],
164 183
     "message": [
165 184
       "messaging"
166 185
     ],
167 186
     "meter": [
168
-      "metering"
187
+      "metering",
188
+      "telemetry"
169 189
     ],
170 190
     "monitoring-logging": [
171 191
       "monitoring-log-api"
@@ -204,9 +224,15 @@
204 224
       "project": "barbican",
205 225
       "service_type": "key-manager"
206 226
     },
227
+    "blazar": {
228
+      "api_reference": "https://developer.openstack.org/api-ref/reservation/",
229
+      "project": "blazar",
230
+      "service_type": "reservation"
231
+    },
207 232
     "ceilometer": {
208 233
       "aliases": [
209
-        "metering"
234
+        "metering",
235
+        "telemetry"
210 236
       ],
211 237
       "api_reference": "https://docs.openstack.org/developer/ceilometer/webapi/index.html",
212 238
       "project": "ceilometer",
@@ -216,7 +242,8 @@
216 242
       "aliases": [
217 243
         "volumev3",
218 244
         "volumev2",
219
-        "volume"
245
+        "volume",
246
+        "block-store"
220 247
       ],
221 248
       "api_reference": "https://developer.openstack.org/api-ref/block-storage/",
222 249
       "project": "cinder",
@@ -261,6 +288,9 @@
261 288
       "service_type": "orchestration"
262 289
     },
263 290
     "ironic": {
291
+      "aliases": [
292
+        "bare-metal"
293
+      ],
264 294
       "api_reference": "https://developer.openstack.org/api-ref/baremetal/",
265 295
       "project": "ironic",
266 296
       "service_type": "baremetal"
@@ -293,10 +323,18 @@
293 323
         "sharev2",
294 324
         "share"
295 325
       ],
296
-      "api_reference": "https://developer.openstack.org/api-ref/shared-file-systems/",
326
+      "api_reference": "https://developer.openstack.org/api-ref/shared-file-system/",
297 327
       "project": "manila",
298 328
       "service_type": "shared-file-system"
299 329
     },
330
+    "masakari": {
331
+      "aliases": [
332
+        "ha"
333
+      ],
334
+      "api_reference": "https://developer.openstack.org/api-ref/instance-ha/",
335
+      "project": "masakari",
336
+      "service_type": "instance-ha"
337
+    },
300 338
     "mistral": {
301 339
       "aliases": [
302 340
         "workflowv2"
@@ -311,7 +349,7 @@
311 349
       "service_type": "monitoring"
312 350
     },
313 351
     "monasca-events-api": {
314
-      "api_reference": "https://developer.openstack.org/api-ref/monitoring-events-api/",
352
+      "api_reference": "https://developer.openstack.org/api-ref/monitoring-events/",
315 353
       "project": "monasca-events-api",
316 354
       "service_type": "monitoring-events"
317 355
     },
@@ -319,7 +357,7 @@
319 357
       "aliases": [
320 358
         "monitoring-log-api"
321 359
       ],
322
-      "api_reference": "https://developer.openstack.org/api-ref/monitoring-log-api/",
360
+      "api_reference": "https://developer.openstack.org/api-ref/monitoring-logging/",
323 361
       "project": "monasca-log-api",
324 362
       "service_type": "monitoring-logging"
325 363
     },
@@ -370,7 +408,8 @@
370 408
     },
371 409
     "senlin": {
372 410
       "aliases": [
373
-        "resource-cluster"
411
+        "resource-cluster",
412
+        "cluster"
374 413
       ],
375 414
       "api_reference": "https://developer.openstack.org/api-ref/clustering/",
376 415
       "project": "senlin",
@@ -435,7 +474,7 @@
435 474
       "aliases": [
436 475
         "container"
437 476
       ],
438
-      "api_reference": "https://git.openstack.org/cgit/openstack/zun/tree/api-ref/source",
477
+      "api_reference": "https://developer.openstack.org/api-ref/application-container/",
439 478
       "project": "zun",
440 479
       "service_type": "application-container"
441 480
     }
@@ -443,9 +482,13 @@
443 482
   "reverse": {
444 483
     "alarming": "alarm",
445 484
     "application_deployment": "application-deployment",
485
+    "bare-metal": "baremetal",
486
+    "block-store": "block-storage",
487
+    "cluster": "clustering",
446 488
     "container": "application-container",
447 489
     "container-infrastructure": "container-infrastructure-management",
448 490
     "events": "event",
491
+    "ha": "instance-ha",
449 492
     "infra-optim": "resource-optimization",
450 493
     "messaging": "message",
451 494
     "metering": "meter",
@@ -455,6 +498,7 @@
455 498
     "resource-cluster": "clustering",
456 499
     "share": "shared-file-system",
457 500
     "sharev2": "shared-file-system",
501
+    "telemetry": "meter",
458 502
     "tricircle": "multi-region-network-automation",
459 503
     "volume": "block-storage",
460 504
     "volumev2": "block-storage",
@@ -468,6 +512,9 @@
468 512
     "barbican": [
469 513
       "key-manager"
470 514
     ],
515
+    "blazar": [
516
+      "reservation"
517
+    ],
471 518
     "ceilometer": [
472 519
       "meter"
473 520
     ],
@@ -513,6 +560,9 @@
513 560
     "manila": [
514 561
       "shared-file-system"
515 562
     ],
563
+    "masakari": [
564
+      "instance-ha"
565
+    ],
516 566
     "mistral": [
517 567
       "workflow"
518 568
     ],
@@ -603,13 +653,14 @@
603 653
       "service_type": "load-balancer"
604 654
     },
605 655
     {
606
-      "api_reference": "https://developer.openstack.org/api-ref/object-storage/",
656
+      "api_reference": "https://developer.openstack.org/api-ref/object-store/",
607 657
       "project": "swift",
608 658
       "service_type": "object-store"
609 659
     },
610 660
     {
611 661
       "aliases": [
612
-        "resource-cluster"
662
+        "resource-cluster",
663
+        "cluster"
613 664
       ],
614 665
       "api_reference": "https://developer.openstack.org/api-ref/clustering/",
615 666
       "project": "senlin",
@@ -621,6 +672,9 @@
621 672
       "service_type": "data-processing"
622 673
     },
623 674
     {
675
+      "aliases": [
676
+        "bare-metal"
677
+      ],
624 678
       "api_reference": "https://developer.openstack.org/api-ref/baremetal/",
625 679
       "project": "ironic",
626 680
       "service_type": "baremetal"
@@ -652,7 +706,7 @@
652 706
       "aliases": [
653 707
         "messaging"
654 708
       ],
655
-      "api_reference": "https://developer.openstack.org/api-ref/messaging/",
709
+      "api_reference": "https://developer.openstack.org/api-ref/message/",
656 710
       "project": "zaqar",
657 711
       "service_type": "message"
658 712
     },
@@ -705,7 +759,7 @@
705 759
         "sharev2",
706 760
         "share"
707 761
       ],
708
-      "api_reference": "https://developer.openstack.org/api-ref/shared-file-systems/",
762
+      "api_reference": "https://developer.openstack.org/api-ref/shared-file-system/",
709 763
       "project": "manila",
710 764
       "service_type": "shared-file-system"
711 765
     },
@@ -723,7 +777,8 @@
723 777
       "aliases": [
724 778
         "volumev3",
725 779
         "volumev2",
726
-        "volume"
780
+        "volume",
781
+        "block-store"
727 782
       ],
728 783
       "api_reference": "https://developer.openstack.org/api-ref/block-storage/",
729 784
       "project": "cinder",
@@ -739,7 +794,8 @@
739 794
     },
740 795
     {
741 796
       "aliases": [
742
-        "metering"
797
+        "metering",
798
+        "telemetry"
743 799
       ],
744 800
       "api_reference": "https://docs.openstack.org/developer/ceilometer/webapi/index.html",
745 801
       "project": "ceilometer",
@@ -778,7 +834,7 @@
778 834
       "aliases": [
779 835
         "container"
780 836
       ],
781
-      "api_reference": "https://git.openstack.org/cgit/openstack/zun/tree/api-ref/source",
837
+      "api_reference": "https://developer.openstack.org/api-ref/application-container/",
782 838
       "project": "zun",
783 839
       "service_type": "application-container"
784 840
     },
@@ -810,7 +866,7 @@
810 866
       "aliases": [
811 867
         "monitoring-log-api"
812 868
       ],
813
-      "api_reference": "https://developer.openstack.org/api-ref/monitoring-log-api/",
869
+      "api_reference": "https://developer.openstack.org/api-ref/monitoring-logging/",
814 870
       "project": "monasca-log-api",
815 871
       "service_type": "monitoring-logging"
816 872
     },
@@ -820,7 +876,7 @@
820 876
       "service_type": "monitoring"
821 877
     },
822 878
     {
823
-      "api_reference": "https://developer.openstack.org/api-ref/monitoring-events-api/",
879
+      "api_reference": "https://developer.openstack.org/api-ref/monitoring-events/",
824 880
       "project": "monasca-events-api",
825 881
       "service_type": "monitoring-events"
826 882
     },
@@ -829,8 +885,21 @@
829 885
       "project": "nova",
830 886
       "secondary": true,
831 887
       "service_type": "placement"
888
+    },
889
+    {
890
+      "aliases": [
891
+        "ha"
892
+      ],
893
+      "api_reference": "https://developer.openstack.org/api-ref/instance-ha/",
894
+      "project": "masakari",
895
+      "service_type": "instance-ha"
896
+    },
897
+    {
898
+      "api_reference": "https://developer.openstack.org/api-ref/reservation/",
899
+      "project": "blazar",
900
+      "service_type": "reservation"
832 901
     }
833 902
   ],
834
-  "sha": "e9b1b4a14ac74c44a2d145072ca195d34766a5e5",
835
-  "version": "2017-08-17T14:25:08.515079"
836
-}
903
+  "sha": "6c2697de1636dc2dfc5a7ee64d29e8185fcb784f",
904
+  "version": "2018-02-14T15:26:17.931502"
905
+}

+ 7
- 4
os_service_types/tests/base.py View File

@@ -54,23 +54,26 @@ class ServiceDataMixin(object):
54 54
             is_known=True, is_alias=False, is_official=True, project='nova')),
55 55
         ('volumev2', dict(
56 56
             service_type='volumev2', official='block-storage', aliases=[],
57
-            all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
57
+            all_types=['block-storage', 'volumev3', 'volumev2', 'volume',
58
+                       'block-store'],
58 59
             api_reference='block-storage', api_reference_project=None,
59 60
             is_known=True, is_alias=True, is_official=False,
60 61
             is_secondary=False, all_services=['block-storage'],
61 62
             project='cinder')),
62 63
         ('volumev3', dict(
63 64
             service_type='volumev3', official='block-storage', aliases=[],
64
-            all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
65
+            all_types=['block-storage', 'volumev3', 'volumev2', 'volume',
66
+                       'block-store'],
65 67
             api_reference='block-storage', api_reference_project=None,
66 68
             is_known=True, is_alias=True, is_official=False,
67 69
             is_secondary=False, all_services=['block-storage'],
68 70
             project='cinder')),
69 71
         ('block-storage', dict(
70 72
             service_type='block-storage', official='block-storage',
71
-            all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
73
+            all_types=['block-storage', 'volumev3', 'volumev2', 'volume',
74
+                       'block-store'],
72 75
             api_reference='block-storage', api_reference_project=None,
73
-            aliases=['volumev3', 'volumev2', 'volume'],
76
+            aliases=['volumev3', 'volumev2', 'volume', 'block-store'],
74 77
             is_known=True, is_alias=False, is_official=True,
75 78
             is_secondary=False, all_services=['block-storage'],
76 79
             project='cinder')),

Loading…
Cancel
Save