Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to add project API support for FC host WWPNs. #102

Merged
merged 8 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions v1/api/swagger/components/schemas/Host.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ allOf:
- Workflow
- SummaryStatus
- Labels
- WWPNs
properties:
Description:
type: string
Expand Down Expand Up @@ -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
8 changes: 8 additions & 0 deletions v1/api/swagger/components/schemas/NewHost.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,11 @@ properties:
example:
serviceType: BMaaS
region: us-west-2
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
Comment on lines +152 to +159
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chitranm This should be removed from here since this is for creating new Hosts. WWPNs are h/w info that the user should not provide. Sorry I missed this previously.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mchuang3. So I should remove it only from NewHost.yaml right? And keep the changes in Host.yaml as is?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mchuang3. So I should remove it only from NewHost.yaml right? And keep the changes in Host.yaml as is?

Yes, remove from user Create request only for Hosts, which is NewHost.yml.

29 changes: 15 additions & 14 deletions v1/html/index.html

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions v1/pkg/client/api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2893,6 +2893,9 @@ components:
Description: Description of new Host
NetworkUntagged: 046b6c7f-0b8a-43b9-b35d-6489e6daee92
UserData: UserData
WWPNs:
- 20:31:01:02:ad:f2:a8:e5
- 21:31:01:02:ad:f2:a8:e5
LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
VolumeIDs:
- 046b6c7f-0b8a-43b9-b35d-6489e6daee91
Expand Down Expand Up @@ -3055,6 +3058,14 @@ components:
serviceType: BMaaS
region: us-west-2
type: object
WWPNs:
description: FC HBA world wide port names
example:
- 20:31:01:02:ad:f2:a8:e5
- 21:31:01:02:ad:f2:a8:e5
items:
type: string
type: array
required:
- LocationID
- MachineSizeID
Expand Down Expand Up @@ -6365,6 +6376,14 @@ components:
example:
serviceType: BMaaS
type: object
WWPNs:
description: FC HBA world wide port names
example:
- 20:31:01:02:ad:f2:a8:e5
- 21:31:01:02:ad:f2:a8:e5
items:
type: string
type: array
required:
- Alert
- AlertInfo
Expand Down Expand Up @@ -6397,6 +6416,7 @@ components:
- SubstateTime
- SummaryStatus
- UserData
- WWPNs
- Workflow
UpdateHost_allOf:
properties:
Expand Down
1 change: 1 addition & 0 deletions v1/pkg/client/docs/Host.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Name | Type | Description | Notes
**Workflow** | **string** | The current workflow the host is in |
**SummaryStatus** | [**HealthStatus**](HealthStatus.md) | |
**Labels** | **map[string]string** | The map of label name to label value for the resource. |
**WWPNs** | **[]string** | FC HBA world wide port names |

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
1 change: 1 addition & 0 deletions v1/pkg/client/docs/HostAllOf.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Name | Type | Description | Notes
**Workflow** | **string** | The current workflow the host is in |
**SummaryStatus** | [**HealthStatus**](HealthStatus.md) | |
**Labels** | **map[string]string** | The map of label name to label value for the resource. |
**WWPNs** | **[]string** | FC HBA world wide port names |

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
1 change: 1 addition & 0 deletions v1/pkg/client/docs/NewHost.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Name | Type | Description | Notes
**UserData** | **string** | User-provided data to be attached to the image configuration data. | [optional]
**NodeID** | **string** | User-provided data to represent the identity of the host within an application environment. For example, this could be set to represent the Kubernetes node ID if the host is provisioned as a Kubernetes node. | [optional]
**Labels** | **map[string]string** | The map of service/user specified label name to label value for this host. Setting service labels is restricted by role. | [optional]
**WWPNs** | **[]string** | FC HBA world wide port names | [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)

Expand Down
2 changes: 2 additions & 0 deletions v1/pkg/client/model_host.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,6 @@ type Host struct {
SummaryStatus HealthStatus `json:"SummaryStatus"`
// The map of label name to label value for the resource.
Labels map[string]string `json:"Labels"`
// FC HBA world wide port names
WWPNs []string `json:"WWPNs"`
}
2 changes: 2 additions & 0 deletions v1/pkg/client/model_host_all_of.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,6 @@ type HostAllOf struct {
SummaryStatus HealthStatus `json:"SummaryStatus"`
// The map of label name to label value for the resource.
Labels map[string]string `json:"Labels"`
// FC HBA world wide port names
WWPNs []string `json:"WWPNs"`
}
2 changes: 2 additions & 0 deletions v1/pkg/client/model_new_host.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ type NewHost struct {
NodeID string `json:"NodeID,omitempty"`
// The map of service/user specified label name to label value for this host. Setting service labels is restricted by role.
Labels map[string]string `json:"Labels,omitempty"`
// FC HBA world wide port names
WWPNs []string `json:"WWPNs,omitempty"`
}