Merge branch 'master' into dependabot/go_modules/golang.org/x/oauth2-…

…0.25.0
HewlettPackard · Jan 16, 2025 · 09df83b · 09df83b
2 parents f92a888 + fa33f79
commit 09df83b
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 11 deletions.
diff --git a/v1/api/swagger/components/parameters/SiteID.yaml b/v1/api/swagger/components/parameters/SiteID.yaml
@@ -3,5 +3,9 @@ in: query
 description: GreenLake site ID
 required: false
 schema:
-  type: string
+  type: array
+  items:
+    type: string
+style: form
+explode: true
 example: 95688cf9-82ff-4e32-80fc-2b0b41648dab
diff --git a/v1/api/swagger/components/schemas/HostState.yaml b/v1/api/swagger/components/schemas/HostState.yaml
@@ -12,6 +12,7 @@ enum:
   - Connecting
   - Booting
   - Ready
+  - Offline
   - Reimaging Prep
   - Replacing
   - Releasing

diff --git a/v1/api/swagger/components/schemas/UpdateProject.yaml b/v1/api/swagger/components/schemas/UpdateProject.yaml
@@ -23,3 +23,12 @@ allOf:
         example:
           - 046b6c7f-0b8a-43b9-b35d-6489e6daee91
           - 91eec8b5-6460-4532-aad1-47b983edb63c
+      PermittedSites:
+        description: Array listing the permitted site IDs
+        type: array
+        items:
+          type: string
+          format: uuid
+        example:
+          - 046b6c7f-0b8a-43b9-b35d-6489e6daee91
+          - 91eec8b5-6460-4532-aad1-47b983edb63c
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
@@ -478,11 +478,15 @@ paths:
           type: string
       - description: GreenLake site ID
         example: 95688cf9-82ff-4e32-80fc-2b0b41648dab
+        explode: true
         in: query
         name: siteid
         required: false
         schema:
-          type: string
+          items:
+            type: string
+          type: array
+        style: form
       - description: GreenLake Platform role name
         example: metal-infra-admin
         in: header
@@ -4889,6 +4893,7 @@ components:
       - Connecting
       - Booting
       - Ready
+      - Offline
       - Reimaging Prep
       - Replacing
       - Releasing
@@ -6942,6 +6947,15 @@ components:
             format: uuid
             type: string
           type: array
+        PermittedSites:
+          description: Array listing the permitted site IDs
+          example:
+          - 046b6c7f-0b8a-43b9-b35d-6489e6daee91
+          - 91eec8b5-6460-4532-aad1-47b983edb63c
+          items:
+            format: uuid
+            type: string
+          type: array
       required:
       - Limits
       - PermittedOSImages

diff --git a/v1/pkg/client/api_projects_info.go b/v1/pkg/client/api_projects_info.go
@@ -17,6 +17,7 @@ import (
 	_nethttp "net/http"
 	_neturl "net/url"
 	"github.com/antihax/optional"
+	"reflect"
 )
 
 // Linger please
@@ -31,7 +32,7 @@ type ProjectsInfoApiService service
 type ProjectsInfoApiListOpts struct {
     Space optional.String
     Spaceid optional.String
-    Siteid optional.String
+    Siteid optional.Interface
     XRole optional.String
     XWorkspaceid optional.String
 }
@@ -43,7 +44,7 @@ Returns an object with information on projects, machine sizes, and volume flavor
  * @param optional nil or *ProjectsInfoApiListOpts - Optional Parameters:
  * @param "Space" (optional.String) -  GreenLake Cloud Services space name
  * @param "Spaceid" (optional.String) -  GreenLake Cloud Services space ID
- * @param "Siteid" (optional.String) -  GreenLake site ID
+ * @param "Siteid" (optional.Interface of []string) -  GreenLake site ID
  * @param "XRole" (optional.String) -  GreenLake Platform role name
  * @param "XWorkspaceid" (optional.String) -  GreenLake Platform workspace ID
 @return ProjectsInfo
@@ -65,7 +66,15 @@ func (a *ProjectsInfoApiService) List(ctx _context.Context, localVarOptionals *P
 	localVarFormParams := _neturl.Values{}
 
 	if localVarOptionals != nil && localVarOptionals.Siteid.IsSet() {
-		localVarQueryParams.Add("siteid", parameterToString(localVarOptionals.Siteid.Value(), ""))
+		t:=localVarOptionals.Siteid.Value()
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				localVarQueryParams.Add("siteid", parameterToString(s.Index(i), "multi"))
+			}
+		} else {
+			localVarQueryParams.Add("siteid", parameterToString(t, "multi"))
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}

diff --git a/v1/pkg/client/docs/ProjectsInfoApi.md b/v1/pkg/client/docs/ProjectsInfoApi.md
@@ -33,7 +33,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **space** | **optional.String**| GreenLake Cloud Services space name | 
  **spaceid** | **optional.String**| GreenLake Cloud Services space ID | 
- **siteid** | **optional.String**| GreenLake site ID | 
+ **siteid** | [**optional.Interface of []string**](string.md)| GreenLake site ID | 
  **xRole** | **optional.String**| GreenLake Platform role name | 
  **xWorkspaceid** | **optional.String**| GreenLake Platform workspace ID | 
 

diff --git a/v1/pkg/client/docs/UpdateProject.md b/v1/pkg/client/docs/UpdateProject.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **Profile** | [**UpdateProfile**](UpdateProfile.md) |  | 
 **Limits** | [**UpdateLimits**](UpdateLimits.md) |  | 
 **PermittedOSImages** | **[]string** | Array listing the permitted OS service images. | 
+**PermittedSites** | **[]string** | Array listing the permitted site IDs | [optional] 
 
 [[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/UpdateProjectAllOf.md b/v1/pkg/client/docs/UpdateProjectAllOf.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **Profile** | [**UpdateProfile**](UpdateProfile.md) |  | 
 **Limits** | [**UpdateLimits**](UpdateLimits.md) |  | 
 **PermittedOSImages** | **[]string** | Array listing the permitted OS service images. | 
+**PermittedSites** | **[]string** | Array listing the permitted site IDs | [optional] 
 
 [[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/interface_projects_info.go b/v1/pkg/client/interface_projects_info.go
diff --git a/v1/pkg/client/model_host_state.go b/v1/pkg/client/model_host_state.go
@@ -27,6 +27,7 @@ const (
 	HOSTSTATE_CONNECTING HostState = "Connecting"
 	HOSTSTATE_BOOTING HostState = "Booting"
 	HOSTSTATE_READY HostState = "Ready"
+	HOSTSTATE_OFFLINE HostState = "Offline"
 	HOSTSTATE_REIMAGING_PREP HostState = "Reimaging Prep"
 	HOSTSTATE_REPLACING HostState = "Replacing"
 	HOSTSTATE_RELEASING HostState = "Releasing"

diff --git a/v1/pkg/client/model_update_project.go b/v1/pkg/client/model_update_project.go
@@ -22,4 +22,6 @@ type UpdateProject struct {
 	Limits UpdateLimits `json:"Limits"`
 	// Array listing the permitted OS service images.
 	PermittedOSImages []string `json:"PermittedOSImages"`
+	// Array listing the permitted site IDs
+	PermittedSites []string `json:"PermittedSites,omitempty"`
 }
diff --git a/v1/pkg/client/model_update_project_all_of.go b/v1/pkg/client/model_update_project_all_of.go
@@ -16,4 +16,6 @@ type UpdateProjectAllOf struct {
 	Limits UpdateLimits `json:"Limits"`
 	// Array listing the permitted OS service images.
 	PermittedOSImages []string `json:"PermittedOSImages"`
+	// Array listing the permitted site IDs
+	PermittedSites []string `json:"PermittedSites,omitempty"`
 }