Merge branch 'master' into dependabot/github_actions/actions/checkout-4

.github/workflows/ci.yml

@@ -11,9 +11,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21.3
 
       - name: Set up Node.js
         uses: actions/setup-node@v3

go.mod

@@ -1,6 +1,6 @@
 module github.com/hewlettpackard/hpegl-metal-client
 
-go 1.19
+go 1.21.0
 
 require (
 	github.com/antihax/optional v1.0.0

go.sum

@@ -10,6 +10,7 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/jessevdk/go-flags v1.4.1-0.20181029123624-5de817a9aa20 h1:dAOsPLhnBzIyxu0VvmnKjlNcIlgMK+erD6VRHDtweMI=
 github.com/jessevdk/go-flags v1.4.1-0.20181029123624-5de817a9aa20/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

v1/Makefile

@@ -51,8 +51,7 @@ api_files:
 
 # fixup invokes a script to generate interfaces for all of the
 # generated client types to allow consumers to use mocks to test their code that
-# interacts with Quake via the client and adds copyrights to all the generated
-# files.
+# interacts with Quake via the client and adds copyrights to all the generated files.
 .PHONY: fixup
 fixup: api_files vendor
 	@bash fixup_generated_files.bash ${OUTPUT_DIR}

v1/api/swagger/components/schemas/AddVolume.yaml

@@ -29,3 +29,9 @@ properties:
       The storage pool is one of those listed by the StoragePools array returned
       as part of the get /available-resources call that are available to create
       volumes of the specified flavor and location.
+  VolumeCollectionID:
+    type: string
+    format: uuid
+    description: >-
+      The  optional volume collection is one of those listed by the VolumeCollections 
+      array returned as part of the get /available-resources call 

v1/api/swagger/components/schemas/AvailableImage.yaml

@@ -4,6 +4,7 @@ required:
   - ID
   - Category
   - Flavor
+  - Name
   - Version
   - Description
 properties:
@@ -23,11 +24,15 @@ properties:
     description: >-
       Second-level grouping of imaging services.  Typically references a
       specific OS or application.
+  Name:
+    type: string
+    example: HPE Ubuntu 18.04
+    description: Name of imaging service.
   Version:
     type: string
     example: '18.04'
     description: Specific version of a imaging service flavor.
   Description:
     type: string
     example: ubuntu OS also including Docker runtime
-    description: Additional image information for additional services added to the OS
+    description: Additional image information for additional services added to the OS

v1/api/swagger/components/schemas/AvailableResources.yaml

@@ -10,6 +10,7 @@ required:
   - StorageInventory
   - SSHKeys
   - StoragePools
+  - VolumeCollections
 properties:
   Images:
     type: array
@@ -67,3 +68,8 @@ properties:
     description: Array listing the available storage pools
     items:
       $ref: ./StoragePool.yaml
+  VolumeCollections:
+    type: array
+    description: Array listing the available volume collections
+    items:
+      $ref: ./VolumeCollection.yaml

v1/api/swagger/components/schemas/Host.yaml

@@ -34,6 +34,7 @@ allOf:
       - Workflow
       - SummaryStatus
       - Labels
+      - WWPNs
     properties:
       Description:
         type: string
@@ -191,3 +192,11 @@ allOf:
         description: Host health summary status
       Labels:
         $ref: ./Labels.yaml
+      WWPNs:
+        type: array
+        description: FC HBA world wide port names
+        items:
+          type: string
+        example:
+          - 20:31:01:02:ad:f2:a8:e5
+          - 21:31:01:02:ad:f2:a8:e5

v1/api/swagger/components/schemas/NewVolume.yaml

@@ -53,3 +53,9 @@ properties:
       The storage pool is one of those listed by the StoragePools array returned
       as part of the get /available-resources call that are available to create
       volumes of the specified flavor and location.
+  VolumeCollectionID:
+    type: string
+    format: uuid
+    description: >-
+      The  optional volume collection is one of those listed by the VolumeCollections 
+      array returned as part of the get /available-resources call 

v1/api/swagger/components/schemas/StorageInventory.yaml

@@ -26,3 +26,12 @@ properties:
     type: string
     format: uuid
     description: Unique ID of the storage pool as listed in the StoragePools array
+  VolumeCollectionIDs:
+    description: IDs of the volume collections for this flavor as listed in the Volume collections array
+    type: array
+    items:
+      type: string
+      format: uuid
+    example:
+      - 7dc2567a-9756-40b9-ab9f-ba66492fb3f7
+      - a6d87f06-c141-4a26-a9df-4803dc446a83

v1/api/swagger/components/schemas/UpdateVolume.yaml

@@ -11,6 +11,11 @@ allOf:
         example: 10485760
         minimum: 0
         description: The size of the volume in KiB
+      VolumeCollectionID:
+        type: string
+        format: uuid
+        example: 90be909e-4609-40f5-9630-f24910dc8591
+        description: The volume collection the volume is a part of
       Labels:
         type: object
         additionalProperties:

v1/api/swagger/components/schemas/Volume.yaml

@@ -46,6 +46,12 @@ allOf:
           of those listed by the LocationInfo array returned as part of the get
           /available-resources call. Any volumes must be in the same location as
           their attached Host.
+      VolumeCollectionID:
+        type: string
+        format: uuid
+        description: >-
+          The optional volume collection ID matching an entry in the VolumeCollections array
+          returned as part of the get /available-resources call
       State:
         $ref: ./VolumeState.yaml
       SubState:

v1/api/swagger/components/schemas/VolumeCollection.yaml

@@ -0,0 +1,33 @@
+---
+type: object
+description: Volume collection within a data center location
+required:
+  - ID
+  - Name
+  - LocationID
+  - Description
+properties:
+  ID:
+    type: string
+    format: uuid
+    description: The ID of the volume collection resource that can be used while
+      creating a volume
+  Name:
+    type: string
+    description: The name of the volume collection resource
+  LocationID:
+    type: string
+    format: uuid
+    description: The location ID of the data center where the volume collection resides
+  Description:
+    type: string
+    description: The description of the volume collection resource
+  StoragePoolIDs: 
+    description: IDs of the storage pools that are valid for this volume collection as listed in the Storage Pools array
+    type: array
+    items:
+      type: string
+      format: uuid
+    example:
+      - 7dc2567a-9756-40b9-ab9f-ba66492fb3f7
+      - a6d87f06-c141-4a26-a9df-4803dc446a83

v1/api/swagger/components/schemas/VolumeInfo.yaml

@@ -9,6 +9,7 @@ required:
   - Capacity
   - Shareable
   - LocationID
+  - VolumeCollectionID
   - DiscoveryIP
   - TargetIQN
   - State
@@ -47,6 +48,10 @@ properties:
     type: string
     format: uuid
     description: The location ID of the data center where the volume exists
+  VolumeCollectionID:
+    type: string
+    format: uuid
+    description: The ID of volume collection of which this volume is a member
   DiscoveryIP:
     type: string
     description: The discovery IP for the iSCSI volume

v1/api/swagger/paths/hosts@{hostId}@reimage.yaml

@@ -5,6 +5,7 @@ post:
   summary: Reimage Host by ID
   description: >-
     Re-deploys a host to the same machine.
+    WARNING -- all drives will be erased!
     Only the Host OS is reinstalled, IP addresses, volumes, etc are not changed.
     The host must be powered off.  The host must also be in the Ready state.
   operationId: reimage

v1/api/swagger/paths/hosts@{hostId}@replace.yaml

@@ -5,6 +5,7 @@ post:
   summary: Replace Host by ID
   description: >-
     Re-deploys a host with a new machine that satisfies the current host settings.
+    WARNING -- all drives will be erased!
     Only the machine is replaced, IP addresses, volumes, etc are not changed.
     The host must be powered off.  The host must also be in the Ready state or in
     the Failed state and in the Replace or Maintenace workflow.