US69000: Adding extra fields for external volume import (#128)

* volume: field for external vol import * [auto generated] Checking in generated offline HTML doc * volume: added model.ReplicationEnabled sup to client * [auto generated] Checking in generated offline HTML doc --------- Co-authored-by: achu-1612 <[email protected]>
HewlettPackard · Aug 29, 2024 · 77c13cf · 77c13cf
1 parent 9a91850
commit 77c13cf
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 5 deletions.
diff --git a/v1/api/swagger/components/schemas/Volume.yaml b/v1/api/swagger/components/schemas/Volume.yaml
@@ -6,13 +6,19 @@ allOf:
       - FlavorID
       - StoragePoolID
       - Capacity
+      - CapacityUsed
       - Shareable
       - LocationID
       - State
       - SubState
       - Status
       - Labels
       - WWN
+      - ReplicationEnabled 
+      - UnmanagedVolume
+      - ActiveSite 
+      - CreatedSite 
+
     properties:
       Description:
         type: string
@@ -35,6 +41,12 @@ allOf:
         example: 10485760
         minimum: 0
         description: The size of the volume in KiB
+      CapacityUsed:
+        type: integer
+        format: int64
+        example: 10485760
+        minimum: 0
+        description: The amount of the volume currently used as reported by the array in KiB
       Shareable:
         type: boolean
         description: Indicates if the volume can be attached to multiple hosts
@@ -63,3 +75,20 @@ allOf:
       WWN:
         type: string
         description: Serial number of the volume.
+      ReplicationEnabled:
+        type: boolean
+        description: Indicates whether replication is enabled for this volume.
+      UnmanagedVolume:
+        type: boolean
+        description: Indicates whether the volume is a native Metal created one or an external one.
+      ActiveSite:
+        type: string
+        format: uuid
+        description: >-
+          The site where the remote copy role for the volume is 
+          Primary at the time of most recent import.
+      CreatedSite:
+        type: string
+        format: uuid
+        description: >-
+          The site where the volume was originally created.      
diff --git a/v1/html/index.html b/v1/html/index.html
diff --git a/v1/pkg/client/api/openapi.yaml b/v1/pkg/client/api/openapi.yaml
@@ -7111,6 +7111,13 @@ components:
           format: int64
           minimum: 0
           type: integer
+        CapacityUsed:
+          description: The amount of the volume currently used as reported by the
+            array in KiB
+          example: 10485760
+          format: int64
+          minimum: 0
+          type: integer
         Shareable:
           description: Indicates if the volume can be attached to multiple hosts
           type: boolean
@@ -7143,17 +7150,38 @@ components:
         WWN:
           description: Serial number of the volume.
           type: string
+        ReplicationEnabled:
+          description: Indicates whether replication is enabled for this volume.
+          type: boolean
+        UnmanagedVolume:
+          description: Indicates whether the volume is a native Metal created one
+            or an external one.
+          type: boolean
+        ActiveSite:
+          description: The site where the remote copy role for the volume is  Primary
+            at the time of most recent import.
+          format: uuid
+          type: string
+        CreatedSite:
+          description: 'The site where the volume was originally created.      '
+          format: uuid
+          type: string
       required:
+      - ActiveSite
       - Capacity
+      - CapacityUsed
+      - CreatedSite
       - Description
       - FlavorID
       - Labels
       - LocationID
+      - ReplicationEnabled
       - Shareable
       - State
       - Status
       - StoragePoolID
       - SubState
+      - UnmanagedVolume
       - WWN
     UpdateVolume_allOf:
       properties:

diff --git a/v1/pkg/client/docs/Volume.md b/v1/pkg/client/docs/Volume.md
@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **FlavorID** | **string** | The VolumeFlavorID matching an entry in the VolumeFlavors array returned as part of the get /available-resources call | 
 **StoragePoolID** | **string** | The storage pool ID matching an entry in the StoragePools array returned as part of the get /available-resources call | 
 **Capacity** | **int64** | The size of the volume in KiB | 
+**CapacityUsed** | **int64** | The amount of the volume currently used as reported by the array in KiB | 
 **Shareable** | **bool** | Indicates if the volume can be attached to multiple hosts | 
 **LocationID** | **string** | The location of the volume (and the storage array) LocationID is one 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** | **string** | The optional volume collection ID matching an entry in the VolumeCollections array returned as part of the get /available-resources call | [optional] 
@@ -21,6 +22,10 @@ Name | Type | Description | Notes
 **Status** | [**VolumeStatus**](VolumeStatus.md) |  | 
 **Labels** | **map[string]string** | The map of label name to label value for the resource. | 
 **WWN** | **string** | Serial number of the volume. | 
+**ReplicationEnabled** | **bool** | Indicates whether replication is enabled for this volume. | 
+**UnmanagedVolume** | **bool** | Indicates whether the volume is a native Metal created one or an external one. | 
+**ActiveSite** | **string** | The site where the remote copy role for the volume is  Primary at the time of most recent import. | 
+**CreatedSite** | **string** | The site where the volume was originally created.       | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/v1/pkg/client/docs/VolumeAllOf.md b/v1/pkg/client/docs/VolumeAllOf.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **FlavorID** | **string** | The VolumeFlavorID matching an entry in the VolumeFlavors array returned as part of the get /available-resources call | 
 **StoragePoolID** | **string** | The storage pool ID matching an entry in the StoragePools array returned as part of the get /available-resources call | 
 **Capacity** | **int64** | The size of the volume in KiB | 
+**CapacityUsed** | **int64** | The amount of the volume currently used as reported by the array in KiB | 
 **Shareable** | **bool** | Indicates if the volume can be attached to multiple hosts | 
 **LocationID** | **string** | The location of the volume (and the storage array) LocationID is one 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** | **string** | The optional volume collection ID matching an entry in the VolumeCollections array returned as part of the get /available-resources call | [optional] 
@@ -16,6 +17,10 @@ Name | Type | Description | Notes
 **Status** | [**VolumeStatus**](VolumeStatus.md) |  | 
 **Labels** | **map[string]string** | The map of label name to label value for the resource. | 
 **WWN** | **string** | Serial number of the volume. | 
+**ReplicationEnabled** | **bool** | Indicates whether replication is enabled for this volume. | 
+**UnmanagedVolume** | **bool** | Indicates whether the volume is a native Metal created one or an external one. | 
+**ActiveSite** | **string** | The site where the remote copy role for the volume is  Primary at the time of most recent import. | 
+**CreatedSite** | **string** | The site where the volume was originally created.       | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/v1/pkg/client/model_volume.go b/v1/pkg/client/model_volume.go
@@ -32,6 +32,8 @@ type Volume struct {
 	StoragePoolID string `json:"StoragePoolID"`
 	// The size of the volume in KiB
 	Capacity int64 `json:"Capacity"`
+	// The amount of the volume currently used as reported by the array in KiB
+	CapacityUsed int64 `json:"CapacityUsed"`
 	// Indicates if the volume can be attached to multiple hosts
 	Shareable bool `json:"Shareable"`
 	// The location of the volume (and the storage array) LocationID is one 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.
@@ -45,4 +47,12 @@ type Volume struct {
 	Labels map[string]string `json:"Labels"`
 	// Serial number of the volume.
 	WWN string `json:"WWN"`
+	// Indicates whether replication is enabled for this volume.
+	ReplicationEnabled bool `json:"ReplicationEnabled"`
+	// Indicates whether the volume is a native Metal created one or an external one.
+	UnmanagedVolume bool `json:"UnmanagedVolume"`
+	// The site where the remote copy role for the volume is  Primary at the time of most recent import.
+	ActiveSite string `json:"ActiveSite"`
+	// The site where the volume was originally created.      
+	CreatedSite string `json:"CreatedSite"`
 }
diff --git a/v1/pkg/client/model_volume_all_of.go b/v1/pkg/client/model_volume_all_of.go
@@ -19,6 +19,8 @@ type VolumeAllOf struct {
 	StoragePoolID string `json:"StoragePoolID"`
 	// The size of the volume in KiB
 	Capacity int64 `json:"Capacity"`
+	// The amount of the volume currently used as reported by the array in KiB
+	CapacityUsed int64 `json:"CapacityUsed"`
 	// Indicates if the volume can be attached to multiple hosts
 	Shareable bool `json:"Shareable"`
 	// The location of the volume (and the storage array) LocationID is one 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.
@@ -32,4 +34,12 @@ type VolumeAllOf struct {
 	Labels map[string]string `json:"Labels"`
 	// Serial number of the volume.
 	WWN string `json:"WWN"`
+	// Indicates whether replication is enabled for this volume.
+	ReplicationEnabled bool `json:"ReplicationEnabled"`
+	// Indicates whether the volume is a native Metal created one or an external one.
+	UnmanagedVolume bool `json:"UnmanagedVolume"`
+	// The site where the remote copy role for the volume is  Primary at the time of most recent import.
+	ActiveSite string `json:"ActiveSite"`
+	// The site where the volume was originally created.      
+	CreatedSite string `json:"CreatedSite"`
 }