Skip to content

Commit e79dad7

Browse files
committed
added enumerations to the rendering of the .md page
Signed-off-by: Arne Broering <arne.broering@siemens.com>
1 parent 6e9390c commit e79dad7

File tree

4 files changed

+107
-26
lines changed

4 files changed

+107
-26
lines changed

src/margo-api-reference/workload-api/application-package-api/application-description.linkml.yaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,8 @@ classes:
284284
range: integer
285285
required: true
286286
architecture:
287-
description: The CPU architecture required by the application. This can be e.g. amd64, x86_64, arm64, arm (according to CpuArchitectureType).
287+
description: The CPU architecture required by the application. This can be e.g. amd64, x86_64, arm64, arm.
288+
See the [CpuArchitectureType](#cpuarchitecturetype) definition for all permissible values.
288289
rank: 20
289290
range: CpuArchitectureType
290291
required: false
@@ -321,7 +322,8 @@ classes:
321322
rank: 65
322323
attributes:
323324
type:
324-
description: The type of peripheral. This can be e.g. GPU, display, camera, microphone, speaker (according to PeripheralType).
325+
description: The type of peripheral. This can be e.g. GPU, display, camera, microphone, speaker.
326+
See the [PeriperalType](#peripheraltype) definition for all permissible values.
325327
rank: 20
326328
range: PeripheralType
327329
required: true
@@ -342,7 +344,8 @@ classes:
342344
rank: 66
343345
attributes:
344346
type:
345-
description: The type of interface required to run the application. This can be e.g. Ethernet, WiFi, Cellular, Bluetooth, USB, CANBus, RS232 (according to CommunicationInterfaceType)
347+
description: The type of interface required to run the application. This can be e.g. Ethernet, WiFi, Cellular, Bluetooth, USB, CANBus, RS232.
348+
See the [CommunicationInterfaceType](#communicationinterfacetype) definition for all permissible values.
346349
rank: 30
347350
range: CommunicationInterfaceType
348351
required: false
@@ -739,31 +742,31 @@ enums:
739742

740743
CommunicationInterfaceType:
741744
permissible_values:
742-
Ethernet:
745+
ethernet:
743746
description: This type stands for an Ethernet interface.
744-
WiFi:
747+
wifi:
745748
description: This type stands for an WiFi interface.
746-
Cellular:
749+
cellular:
747750
description: This type stands for cellular communication technologies such as 5G, LTE, 3G, 2G, ....
748-
Bluetooth:
751+
bluetooth:
749752
description: This type stands for a Bluetooth or Bluetooth Low-Energy (BLE) interface.
750-
USB:
753+
usb:
751754
description: This type stands for a USB interface.
752-
CANBus:
755+
canbus:
753756
description: This type stands for a CANBus interface.
754-
RS232:
757+
rs232:
755758
description: This type stands for a RS232 interface.
756759

757760
PeripheralType:
758761
permissible_values:
759-
GPU:
762+
gpu:
760763
description: This type stands for a Graphics Processing Unit (GPU) peripheral.
761-
Display:
764+
display:
762765
description: This type stands for a display peripheral.
763-
Camera:
766+
camera:
764767
description: This type stands for a camera peripheral.
765-
Microphone:
768+
microphone:
766769
description: This type stands for a microphone peripheral.
767-
Speaker:
770+
speaker:
768771
description: This type stands for a speaker peripheral.
769772

src/margo-api-reference/workload-api/application-package-api/resources/examples/valid/ApplicationDescription-002.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ deploymentProfiles:
4646
storage:
4747
sizeMinimum: 10000 # MB := 10 GB
4848
requiredPeripherals:
49-
- type: GPU
49+
- type: gpu
5050
manufacturer: NVIDIA
51-
- type: Display
51+
- type: display
5252
requiredInterfaces:
53-
- type: Ethernet
54-
- type: Bluetooth
53+
- type: ethernet
54+
- type: bluetooth
5555
- type: compose
5656
id: com-northstartida-digitron-orchestrator-compose-a
5757
components:

src/margo-api-reference/workload-api/application-package-api/resources/index.md.jinja2

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ The application description has the purpose of presenting the application, e.g.,
5858
| {{ slot.name }} | <*see description*> | {% if slot.required == True %} Y {% else %} N {% endif %} | {{ slot.description }}|
5959
{%- endif %}
6060
{% endfor %}
61+
6162
{%- endif %}
6263

64+
65+
66+
6367
{%- if c.name.startswith("ComponentProperties") %}
6468

6569
### ComponentProperties Attributes
@@ -94,6 +98,43 @@ To allow customizable configuration values when installing an application, the *
9498
{%- endif %}
9599
{%- endfor %}
96100

101+
102+
## Enumerations
103+
These enumerations are used as vocabularies for attribute values of the `ApplicationDescription`.
104+
105+
### CpuArchitectureType
106+
107+
| Permissible Values | Description |
108+
| --- | --- |
109+
| amd64 | AMD 64-bit architecture.|
110+
| x86_64 | x86 64-bit architecture.|
111+
| arm64 | ARM 64-bit architecture.|
112+
| arm | ARM 32-bit architecture. |
113+
114+
### CommunicationInterfaceType
115+
116+
| Permissible Values | Description |
117+
| --- | --- |
118+
| ethernet | This type stands for an Ethernet interface.|
119+
| wifi | This type stands for an WiFi interface.|
120+
| cellular | This type stands for cellular communication technologies such as 5G, LTE, 3G, 2G, ....|
121+
| bluetooth | This type stands for a Bluetooth or Bluetooth Low-Energy (BLE) interface. |
122+
| usb | This type stands for a USB interface.|
123+
| canbus | This type stands for a CANBus interface.|
124+
| rs232 | This type stands for a RS232 interface. |
125+
126+
### PeripheralType
127+
128+
| Permissible Values | Description |
129+
| --- | --- |
130+
| gpu | This type stands for a Graphics Processing Unit (GPU) peripheral.|
131+
| display | This type stands for a display peripheral.|
132+
| camera | This type stands for a camera peripheral.|
133+
| microphone | This type stands for a microphone peripheral. |
134+
| speaker | This type stands for a speaker peripheral. |
135+
136+
137+
97138
## Application Description Examples
98139

99140
### Example 1: Simple Application Description

system-design/margo-api-reference/workload-api/application-package-api/application-description.md

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ CPU element specifying the CPU requirements for the application. <br>
9696
| Attribute | Type | Required? | Description |
9797
| --- | --- | --- | --- |
9898
| coreCountMinimum | integer | Y | The number of CPU cores required by the application to run in its full functionality. This is defined by the application developer. After deployment of the application, the device MUST provide this number of CPU cores for the application.|
99-
| architecture | CpuArchitectureType | N | The CPU architecture required by the application. This can be e.g. amd64, x86_64, arm64, arm (according to CpuArchitectureType).|
99+
| architecture | CpuArchitectureType | N | The CPU architecture required by the application. This can be e.g. amd64, x86_64, arm64, arm. See the [CpuArchitectureType](#cpuarchitecturetype) definition for all permissible values.|
100100

101101

102102
### Memory Attributes <br><br>
@@ -120,7 +120,7 @@ Peripherals required to run the application. <br>
120120

121121
| Attribute | Type | Required? | Description |
122122
| --- | --- | --- | --- |
123-
| type | PeripheralType | Y | The type of peripheral. This can be e.g. GPU, display, camera, microphone, speaker (according to PeripheralType).|
123+
| type | PeripheralType | Y | The type of peripheral. This can be e.g. GPU, display, camera, microphone, speaker. See the [PeriperalType](#peripheraltype) definition for all permissible values.|
124124
| manufacturer | string | N | The name of the manufacturer.|
125125
| model | string | N | The model of the peripheral.|
126126

@@ -130,7 +130,7 @@ Communication interfaces required to run the application. <br>
130130

131131
| Attribute | Type | Required? | Description |
132132
| --- | --- | --- | --- |
133-
| type | CommunicationInterfaceType | N | The type of interface required to run the application. This can be e.g. Ethernet, WiFi, Cellular, Bluetooth, USB, CANBus, RS232 (according to CommunicationInterfaceType)|
133+
| type | CommunicationInterfaceType | N | The type of interface required to run the application. This can be e.g. Ethernet, WiFi, Cellular, Bluetooth, USB, CANBus, RS232. See the [CommunicationInterfaceType](#communicationinterfacetype) definition for all permissible values.|
134134

135135

136136
### Component Attributes <br><br>
@@ -285,6 +285,43 @@ Extends schema to define a specific set of validation rules that can be used for
285285
| options | []string | Y | This provides the list of acceptable options the user can select from. The data type for each option must match the parameter setting’s data type.|
286286

287287

288+
289+
## Enumerations
290+
These enumerations are used as vocabularies for attribute values of the `ApplicationDescription`.
291+
292+
### CpuArchitectureType
293+
294+
| Permissible Values | Description |
295+
| --- | --- |
296+
| amd64 | AMD 64-bit architecture.|
297+
| x86_64 | x86 64-bit architecture.|
298+
| arm64 | ARM 64-bit architecture.|
299+
| arm | ARM 32-bit architecture. |
300+
301+
### CommunicationInterfaceType
302+
303+
| Permissible Values | Description |
304+
| --- | --- |
305+
| ethernet | This type stands for an Ethernet interface.|
306+
| wifi | This type stands for an WiFi interface.|
307+
| cellular | This type stands for cellular communication technologies such as 5G, LTE, 3G, 2G, ....|
308+
| bluetooth | This type stands for a Bluetooth or Bluetooth Low-Energy (BLE) interface. |
309+
| usb | This type stands for a USB interface.|
310+
| canbus | This type stands for a CANBus interface.|
311+
| rs232 | This type stands for a RS232 interface. |
312+
313+
### PeripheralType
314+
315+
| Permissible Values | Description |
316+
| --- | --- |
317+
| gpu | This type stands for a Graphics Processing Unit (GPU) peripheral.|
318+
| display | This type stands for a display peripheral.|
319+
| camera | This type stands for a camera peripheral.|
320+
| microphone | This type stands for a microphone peripheral. |
321+
| speaker | This type stands for a speaker peripheral. |
322+
323+
324+
288325
## Application Description Examples
289326

290327
### Example 1: Simple Application Description
@@ -404,12 +441,12 @@ deploymentProfiles:
404441
storage:
405442
sizeMinimum: 10000 # MB := 10 GB
406443
requiredPeripherals:
407-
- type: GPU
444+
- type: gpu
408445
manufacturer: NVIDIA
409-
- type: Display
446+
- type: display
410447
requiredInterfaces:
411-
- type: Ethernet
412-
- type: Bluetooth
448+
- type: ethernet
449+
- type: bluetooth
413450
- type: compose
414451
id: com-northstartida-digitron-orchestrator-compose-a
415452
components:

0 commit comments

Comments
 (0)