Skip to content

Commit 2737b8c

Browse files
iljarotariljarotar
committed
Merge branch 'main' of github.com:metal-stack/api into mep17
2 parents efe63fc + 2a202cb commit 2737b8c

File tree

5 files changed

+305
-238
lines changed

5 files changed

+305
-238
lines changed

‎doc/index.html‎

Lines changed: 62 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,15 +1589,15 @@ <h2>Table of Contents</h2>
15891589
</li>
15901590

15911591
<li>
1592-
<a href="#metalstack.api.v2.MachineLiveliness"><span class="badge">E</span>MachineLiveliness</a>
1592+
<a href="#metalstack.api.v2.MachineAllocationType"><span class="badge">E</span>MachineAllocationType</a>
15931593
</li>
15941594

15951595
<li>
1596-
<a href="#metalstack.api.v2.MachineProvisioningEventState"><span class="badge">E</span>MachineProvisioningEventState</a>
1596+
<a href="#metalstack.api.v2.MachineLiveliness"><span class="badge">E</span>MachineLiveliness</a>
15971597
</li>
15981598

15991599
<li>
1600-
<a href="#metalstack.api.v2.MachineRole"><span class="badge">E</span>MachineRole</a>
1600+
<a href="#metalstack.api.v2.MachineProvisioningEventState"><span class="badge">E</span>MachineProvisioningEventState</a>
16011601
</li>
16021602

16031603
<li>
@@ -14677,10 +14677,10 @@ <h3 id="metalstack.api.v2.MachineAllocation">MachineAllocation</h3>
1467714677
</tr>
1467814678

1467914679
<tr>
14680-
<td>role</td>
14681-
<td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
14680+
<td>allocation_type</td>
14681+
<td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
1468214682
<td></td>
14683-
<td><p>Role defines if this is machine or a firewall </p></td>
14683+
<td><p>AllocationType of this machine </p></td>
1468414684
</tr>
1468514685

1468614686
<tr>
@@ -14803,10 +14803,10 @@ <h3 id="metalstack.api.v2.MachineAllocationQuery">MachineAllocationQuery</h3>
1480314803
</tr>
1480414804

1480514805
<tr>
14806-
<td>role</td>
14807-
<td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
14806+
<td>allocation_type</td>
14807+
<td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
1480814808
<td>optional</td>
14809-
<td><p>Role of this machine </p></td>
14809+
<td><p>AllocationType of this machine </p></td>
1481014810
</tr>
1481114811

1481214812
</tbody>
@@ -15349,6 +15349,27 @@ <h3 id="metalstack.api.v2.MachineNic">MachineNic</h3>
1534915349
<td><p>Identifier the unique identifier of this network interface </p></td>
1535015350
</tr>
1535115351

15352+
<tr>
15353+
<td>vendor</td>
15354+
<td><a href="#string">string</a></td>
15355+
<td></td>
15356+
<td><p>Vendor of this network card </p></td>
15357+
</tr>
15358+
15359+
<tr>
15360+
<td>model</td>
15361+
<td><a href="#string">string</a></td>
15362+
<td></td>
15363+
<td><p>Model of this network card </p></td>
15364+
</tr>
15365+
15366+
<tr>
15367+
<td>speed</td>
15368+
<td><a href="#uint64">uint64</a></td>
15369+
<td></td>
15370+
<td><p>Speed in bits/second of this network card </p></td>
15371+
</tr>
15372+
1535215373
<tr>
1535315374
<td>neighbors</td>
1535415375
<td><a href="#metalstack.api.v2.MachineNic">MachineNic</a></td>
@@ -15755,10 +15776,10 @@ <h3 id="metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateReque
1575515776
</tr>
1575615777

1575715778
<tr>
15758-
<td>role</td>
15759-
<td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
15779+
<td>allocation_type</td>
15780+
<td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
1576015781
<td></td>
15761-
<td><p>Role defines if this is machine or a firewall </p></td>
15782+
<td><p>AllocationType of this machine </p></td>
1576215783
</tr>
1576315784

1576415785
<tr>
@@ -16232,6 +16253,35 @@ <h3 id="metalstack.api.v2.IPProtocol">IPProtocol</h3>
1623216253
</tbody>
1623316254
</table>
1623416255

16256+
<h3 id="metalstack.api.v2.MachineAllocationType">MachineAllocationType</h3>
16257+
<p>MachineAllocationType defines if this is a machine or a firewall</p>
16258+
<table class="enum-table">
16259+
<thead>
16260+
<tr><td>Name</td><td>Number</td><td>Description</td></tr>
16261+
</thead>
16262+
<tbody>
16263+
16264+
<tr>
16265+
<td>MACHINE_ALLOCATION_TYPE_UNSPECIFIED</td>
16266+
<td>0</td>
16267+
<td><p>MACHINE_ALLOCATION_TYPE_UNSPECIFIED is unspecified</p></td>
16268+
</tr>
16269+
16270+
<tr>
16271+
<td>MACHINE_ALLOCATION_TYPE_MACHINE</td>
16272+
<td>1</td>
16273+
<td><p>MACHINE_ALLOCATION_TYPE_MACHINE is a machine</p></td>
16274+
</tr>
16275+
16276+
<tr>
16277+
<td>MACHINE_ALLOCATION_TYPE_FIREWALL</td>
16278+
<td>2</td>
16279+
<td><p>MACHINE_ALLOCATION_TYPE_FIREWALL is a firewall</p></td>
16280+
</tr>
16281+
16282+
</tbody>
16283+
</table>
16284+
1623516285
<h3 id="metalstack.api.v2.MachineLiveliness">MachineLiveliness</h3>
1623616286
<p>MachineLiveliness specifies the liveliness of a machine</p>
1623716287
<table class="enum-table">
@@ -16296,35 +16346,6 @@ <h3 id="metalstack.api.v2.MachineProvisioningEventState">MachineProvisioningEven
1629616346
</tbody>
1629716347
</table>
1629816348

16299-
<h3 id="metalstack.api.v2.MachineRole">MachineRole</h3>
16300-
<p>MachineRole defines if this is a machine or a firewall</p>
16301-
<table class="enum-table">
16302-
<thead>
16303-
<tr><td>Name</td><td>Number</td><td>Description</td></tr>
16304-
</thead>
16305-
<tbody>
16306-
16307-
<tr>
16308-
<td>MACHINE_ROLE_UNSPECIFIED</td>
16309-
<td>0</td>
16310-
<td><p>MACHINE_ROLE_UNSPECIFIED is unspecified</p></td>
16311-
</tr>
16312-
16313-
<tr>
16314-
<td>MACHINE_ROLE_MACHINE</td>
16315-
<td>1</td>
16316-
<td><p>MACHINE_ROLE_MACHINE is a machine</p></td>
16317-
</tr>
16318-
16319-
<tr>
16320-
<td>MACHINE_ROLE_FIREWALL</td>
16321-
<td>2</td>
16322-
<td><p>MACHINE_ROLE_FIREWALL is a firewall</p></td>
16323-
</tr>
16324-
16325-
</tbody>
16326-
</table>
16327-
1632816349
<h3 id="metalstack.api.v2.MachineState">MachineState</h3>
1632916350
<p>MachineState defines if the machine was locked or reserved from a operator</p>
1633016351
<table class="enum-table">

0 commit comments

Comments
 (0)