More machine Queries

doc/index.html

@@ -8099,7 +8099,8 @@ <h3 id="metalstack.api.v2.NetworkType">NetworkType</h3>
                 <td><p>NETWORK_TYPE_CHILD_SHARED indicates a child network of a project which allows the allocation of ips from different projects.
 Connectivity to external networks is not possible, as for normal child networks.
 These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
-With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.</p></td>
+With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.
+Only one child shared network per project is allowed.</p></td>
               </tr>
 
           </tbody>
@@ -10378,6 +10379,27 @@ <h3 id="metalstack.api.v2.MachineQuery">MachineQuery</h3>
                   <td><p>State this machine has </p></td>
                 </tr>
 
+                <tr>
+                  <td>waiting</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td>optional</td>
+                  <td><p>Waiting indicates this machine is actually waiting. </p></td>
+                </tr>
+
+                <tr>
+                  <td>preallocated</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td>optional</td>
+                  <td><p>Preallocated indicates if this machine is currently preallocated. </p></td>
+                </tr>
+
+                <tr>
+                  <td>not_allocated</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td>optional</td>
+                  <td><p>NotAllocated if set to true, only machines which are not allocated are returned. </p></td>
+                </tr>
+
             </tbody>
           </table>
 
@@ -11449,7 +11471,7 @@ <h3 id="metalstack.api.v2.MachineState">MachineState</h3>
               <tr>
                 <td>MACHINE_STATE_AVAILABLE</td>
                 <td>3</td>
-                <td><p>MACHINE_STATE_LOCKED this machine is available for all</p></td>
+                <td><p>MACHINE_STATE_AVAILABLE this machine is available for all</p></td>
               </tr>
 
           </tbody>

js/metalstack/api/v2/machine_pb.d.ts

@@ -1586,6 +1586,24 @@ export type MachineQuery = Message<"metalstack.api.v2.MachineQuery"> & {
      * @generated from field: optional metalstack.api.v2.MachineState state = 14;
      */
     state?: MachineState;
+    /**
+     * Waiting indicates this machine is actually waiting.
+     *
+     * @generated from field: optional bool waiting = 15;
+     */
+    waiting?: boolean;
+    /**
+     * Preallocated indicates if this machine is currently preallocated.
+     *
+     * @generated from field: optional bool preallocated = 16;
+     */
+    preallocated?: boolean;
+    /**
+     * NotAllocated if set to true, only machines which are not allocated are returned.
+     *
+     * @generated from field: optional bool not_allocated = 17;
+     */
+    notAllocated?: boolean;
 };
 /**
  * Describes the message metalstack.api.v2.MachineQuery.
@@ -1940,7 +1958,7 @@ export declare enum MachineState {
      */
     LOCKED = 2,
     /**
-     * MACHINE_STATE_LOCKED this machine is available for all
+     * MACHINE_STATE_AVAILABLE this machine is available for all
      *
      * @generated from enum value: MACHINE_STATE_AVAILABLE = 3;
      */

js/metalstack/api/v2/network_pb.d.ts

@@ -707,6 +707,7 @@ export declare enum NetworkType {
      * Connectivity to external networks is not possible, as for normal child networks.
      * These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
      * With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.
+     * Only one child shared network per project is allowed.
      *
      * @generated from enum value: NETWORK_TYPE_CHILD_SHARED = 6;
      */

js/metalstack/api/v2/network_pb.js

@@ -191,6 +191,7 @@ export var NetworkType;
      * Connectivity to external networks is not possible, as for normal child networks.
      * These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
      * With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.
+     * Only one child shared network per project is allowed.
      *
      * @generated from enum value: NETWORK_TYPE_CHILD_SHARED = 6;
      */

js/metalstack/api/v2/network_pb.ts

@@ -830,6 +830,7 @@ export enum NetworkType {
    * Connectivity to external networks is not possible, as for normal child networks.
    * These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
    * With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.
+   * Only one child shared network per project is allowed.
    *
    * @generated from enum value: NETWORK_TYPE_CHILD_SHARED = 6;
    */

proto/buf.gen.yaml

@@ -20,9 +20,9 @@ plugins:
     out: ../go
     opt: paths=source_relative,simple
   # python
-  - remote: buf.build/protocolbuffers/python:v33.5
+  - remote: buf.build/protocolbuffers/python:v34.0
     out: ../python
-  - remote: buf.build/protocolbuffers/pyi:v33.5
+  - remote: buf.build/protocolbuffers/pyi:v34.0
     out: ../python
   - remote: buf.build/connectrpc/python:v0.8.1
     out: ../python

proto/metalstack/api/v2/machine.proto

@@ -510,7 +510,7 @@ enum MachineState {
   MACHINE_STATE_RESERVED = 1 [(enum_string_value) = "reserved"];
   // MACHINE_STATE_LOCKED this machine is locked
   MACHINE_STATE_LOCKED = 2 [(enum_string_value) = "locked"];
-  // MACHINE_STATE_LOCKED this machine is available for all
+  // MACHINE_STATE_AVAILABLE this machine is available for all
   MACHINE_STATE_AVAILABLE = 3 [(enum_string_value) = "available"];
 }
 
@@ -778,6 +778,12 @@ message MachineQuery {
   optional MachineHardwareQuery hardware = 13;
   // State this machine has
   optional MachineState state = 14;
+  // Waiting indicates this machine is actually waiting.
+  optional bool waiting = 15;
+  // Preallocated indicates if this machine is currently preallocated.
+  optional bool preallocated = 16;
+  // NotAllocated if set to true, only machines which are not allocated are returned.
+  optional bool not_allocated = 17;
 }
 
 // MachineAllocationQuery allocation specific query parameters

proto/metalstack/api/v2/network.proto

@@ -313,7 +313,20 @@ enum NetworkType {
   // Connectivity to external networks is not possible, as for normal child networks.
   // These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
   // With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.
+  // Only one child shared network per project is allowed.
   NETWORK_TYPE_CHILD_SHARED = 6 [(enum_string_value) = "child-shared"];
+
+  /*
+           // PrivatePrimaryUnshared is a network which is for machines which is private
+           PrivatePrimaryUnshared = "privateprimaryunshared" => CHILD
+           // PrivatePrimaryShared is a network which is for machines which is private and shared for other networks
+     // This is the case for firewalls and nodes in storage clusters
+           PrivatePrimaryShared = "privateprimaryshared" => CHILD_SHARED
+           // PrivateSecondaryShared is a network which is for machines which is consumed from a other shared network
+     // This is the case for firewall in other clusters which consume the storage
+     // FIXME ALLOW only one Child Shared Network per project
+           PrivateSecondaryShared = "privatesecondaryshared" => CHILD_SHARED if machine/firewall project != network project
+  */
 }
 
 // NetworkAddressFamily defines the address family of a network