diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES index 3cd6cf37e5da..806f55072e19 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES @@ -35,6 +35,7 @@ docs/SgxEpcConfig.md docs/TokenBucket.md docs/TpmConfig.md docs/VdpaConfig.md +docs/VmAddUserDevice.md docs/VmConfig.md docs/VmCoredumpData.md docs/VmInfo.md @@ -75,6 +76,7 @@ model_sgx_epc_config.go model_token_bucket.go model_tpm_config.go model_vdpa_config.go +model_vm_add_user_device.go model_vm_config.go model_vm_coredump_data.go model_vm_info.go diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md index cb42aa49b2b9..41de1da7fbad 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md @@ -92,6 +92,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**VmAddFsPut**](docs/DefaultApi.md#vmaddfsput) | **Put** /vm.add-fs | Add a new virtio-fs device to the VM *DefaultApi* | [**VmAddNetPut**](docs/DefaultApi.md#vmaddnetput) | **Put** /vm.add-net | Add a new network device to the VM *DefaultApi* | [**VmAddPmemPut**](docs/DefaultApi.md#vmaddpmemput) | **Put** /vm.add-pmem | Add a new pmem device to the VM +*DefaultApi* | [**VmAddUserDevicePut**](docs/DefaultApi.md#vmadduserdeviceput) | **Put** /vm.add-user-device | Add a new userspace device to the VM *DefaultApi* | [**VmAddVdpaPut**](docs/DefaultApi.md#vmaddvdpaput) | **Put** /vm.add-vdpa | Add a new vDPA device to the VM *DefaultApi* | [**VmAddVsockPut**](docs/DefaultApi.md#vmaddvsockput) | **Put** /vm.add-vsock | Add a new vsock device to the VM *DefaultApi* | [**VmCoredumpPut**](docs/DefaultApi.md#vmcoredumpput) | **Put** /vm.coredump | Takes a VM coredump. @@ -137,6 +138,7 @@ Class | Method | HTTP request | Description - [TokenBucket](docs/TokenBucket.md) - [TpmConfig](docs/TpmConfig.md) - [VdpaConfig](docs/VdpaConfig.md) + - [VmAddUserDevice](docs/VmAddUserDevice.md) - [VmConfig](docs/VmConfig.md) - [VmCoredumpData](docs/VmCoredumpData.md) - [VmInfo](docs/VmInfo.md) diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml index ef26778f9709..45f784a0aff0 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml @@ -328,6 +328,27 @@ paths: "500": description: The new vDPA device could not be added to the VM instance. summary: Add a new vDPA device to the VM + /vm.add-user-device: + put: + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/VmAddUserDevice' + description: The path of the new device + required: true + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/PciDeviceInfo' + description: The new device was successfully added to the VM instance. + "204": + description: The new device was successfully (cold) added to the VM instance. + "404": + description: The new device could not be added to the VM instance. + summary: Add a new userspace device to the VM /vm.snapshot: put: requestBody: @@ -1935,3 +1956,12 @@ components: required: - destination_url type: object + VmAddUserDevice: + example: + socket: socket + properties: + socket: + type: string + required: + - socket + type: object diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api_default.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api_default.go index c321a36de8e4..1e66fd91b632 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api_default.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api_default.go @@ -13,7 +13,7 @@ package openapi import ( "bytes" _context "context" - _io "io" + _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" ) @@ -96,9 +96,9 @@ func (a *DefaultApiService) BootVMExecute(r ApiBootVMRequest) (*_nethttp.Respons return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -196,9 +196,9 @@ func (a *DefaultApiService) CreateVMExecute(r ApiCreateVMRequest) (*_nethttp.Res return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -284,9 +284,9 @@ func (a *DefaultApiService) DeleteVMExecute(r ApiDeleteVMRequest) (*_nethttp.Res return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -372,9 +372,9 @@ func (a *DefaultApiService) PauseVMExecute(r ApiPauseVMRequest) (*_nethttp.Respo return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -460,9 +460,9 @@ func (a *DefaultApiService) PowerButtonVMExecute(r ApiPowerButtonVMRequest) (*_n return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -548,9 +548,9 @@ func (a *DefaultApiService) RebootVMExecute(r ApiRebootVMRequest) (*_nethttp.Res return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -636,9 +636,9 @@ func (a *DefaultApiService) ResumeVMExecute(r ApiResumeVMRequest) (*_nethttp.Res return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -724,9 +724,9 @@ func (a *DefaultApiService) ShutdownVMExecute(r ApiShutdownVMRequest) (*_nethttp return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -812,9 +812,9 @@ func (a *DefaultApiService) ShutdownVMMExecute(r ApiShutdownVMMRequest) (*_netht return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -915,9 +915,9 @@ func (a *DefaultApiService) VmAddDevicePutExecute(r ApiVmAddDevicePutRequest) (P return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1027,9 +1027,9 @@ func (a *DefaultApiService) VmAddDiskPutExecute(r ApiVmAddDiskPutRequest) (PciDe return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1139,9 +1139,9 @@ func (a *DefaultApiService) VmAddFsPutExecute(r ApiVmAddFsPutRequest) (PciDevice return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1251,9 +1251,9 @@ func (a *DefaultApiService) VmAddNetPutExecute(r ApiVmAddNetPutRequest) (PciDevi return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1363,9 +1363,121 @@ func (a *DefaultApiService) VmAddPmemPutExecute(r ApiVmAddPmemPutRequest) (PciDe return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + +type ApiVmAddUserDevicePutRequest struct { + ctx _context.Context + ApiService *DefaultApiService + vmAddUserDevice *VmAddUserDevice +} + +// The path of the new device +func (r ApiVmAddUserDevicePutRequest) VmAddUserDevice(vmAddUserDevice VmAddUserDevice) ApiVmAddUserDevicePutRequest { + r.vmAddUserDevice = &vmAddUserDevice + return r +} + +func (r ApiVmAddUserDevicePutRequest) Execute() (PciDeviceInfo, *_nethttp.Response, error) { + return r.ApiService.VmAddUserDevicePutExecute(r) +} + +/* +VmAddUserDevicePut Add a new userspace device to the VM + + @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiVmAddUserDevicePutRequest +*/ +func (a *DefaultApiService) VmAddUserDevicePut(ctx _context.Context) ApiVmAddUserDevicePutRequest { + return ApiVmAddUserDevicePutRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +// +// @return PciDeviceInfo +func (a *DefaultApiService) VmAddUserDevicePutExecute(r ApiVmAddUserDevicePutRequest) (PciDeviceInfo, *_nethttp.Response, error) { + var ( + localVarHTTPMethod = _nethttp.MethodPut + localVarPostBody interface{} + localVarFormFileName string + localVarFileName string + localVarFileBytes []byte + localVarReturnValue PciDeviceInfo + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.VmAddUserDevicePut") + if err != nil { + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vm.add-user-device" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := _neturl.Values{} + localVarFormParams := _neturl.Values{} + if r.vmAddUserDevice == nil { + return localVarReturnValue, nil, reportError("vmAddUserDevice is required and must be specified") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.vmAddUserDevice + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1475,9 +1587,9 @@ func (a *DefaultApiService) VmAddVdpaPutExecute(r ApiVmAddVdpaPutRequest) (PciDe return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1587,9 +1699,9 @@ func (a *DefaultApiService) VmAddVsockPutExecute(r ApiVmAddVsockPutRequest) (Pci return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1696,9 +1808,9 @@ func (a *DefaultApiService) VmCoredumpPutExecute(r ApiVmCoredumpPutRequest) (*_n return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1787,9 +1899,9 @@ func (a *DefaultApiService) VmCountersGetExecute(r ApiVmCountersGetRequest) (map return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1887,9 +1999,9 @@ func (a *DefaultApiService) VmInfoGetExecute(r ApiVmInfoGetRequest) (VmInfo, *_n return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1996,9 +2108,9 @@ func (a *DefaultApiService) VmReceiveMigrationPutExecute(r ApiVmReceiveMigration return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2096,9 +2208,9 @@ func (a *DefaultApiService) VmRemoveDevicePutExecute(r ApiVmRemoveDevicePutReque return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2196,9 +2308,9 @@ func (a *DefaultApiService) VmResizePutExecute(r ApiVmResizePutRequest) (*_netht return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2296,9 +2408,9 @@ func (a *DefaultApiService) VmResizeZonePutExecute(r ApiVmResizeZonePutRequest) return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2396,9 +2508,9 @@ func (a *DefaultApiService) VmRestorePutExecute(r ApiVmRestorePutRequest) (*_net return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2496,9 +2608,9 @@ func (a *DefaultApiService) VmSendMigrationPutExecute(r ApiVmSendMigrationPutReq return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2596,9 +2708,9 @@ func (a *DefaultApiService) VmSnapshotPutExecute(r ApiVmSnapshotPutRequest) (*_n return localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -2687,9 +2799,9 @@ func (a *DefaultApiService) VmmPingGetExecute(r ApiVmmPingGetRequest) (VmmPingRe return localVarReturnValue, localVarHTTPResponse, err } - localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body) + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody)) + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md index d6109771936b..06ee1730c2a9 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md @@ -18,6 +18,7 @@ Method | HTTP request | Description [**VmAddFsPut**](DefaultApi.md#VmAddFsPut) | **Put** /vm.add-fs | Add a new virtio-fs device to the VM [**VmAddNetPut**](DefaultApi.md#VmAddNetPut) | **Put** /vm.add-net | Add a new network device to the VM [**VmAddPmemPut**](DefaultApi.md#VmAddPmemPut) | **Put** /vm.add-pmem | Add a new pmem device to the VM +[**VmAddUserDevicePut**](DefaultApi.md#VmAddUserDevicePut) | **Put** /vm.add-user-device | Add a new userspace device to the VM [**VmAddVdpaPut**](DefaultApi.md#VmAddVdpaPut) | **Put** /vm.add-vdpa | Add a new vDPA device to the VM [**VmAddVsockPut**](DefaultApi.md#VmAddVsockPut) | **Put** /vm.add-vsock | Add a new vsock device to the VM [**VmCoredumpPut**](DefaultApi.md#VmCoredumpPut) | **Put** /vm.coredump | Takes a VM coredump. @@ -872,6 +873,70 @@ No authorization required [[Back to README]](../README.md) +## VmAddUserDevicePut + +> PciDeviceInfo VmAddUserDevicePut(ctx).VmAddUserDevice(vmAddUserDevice).Execute() + +Add a new userspace device to the VM + +### Example + +```go +package main + +import ( + "context" + "fmt" + "os" + openapiclient "./openapi" +) + +func main() { + vmAddUserDevice := *openapiclient.NewVmAddUserDevice("Socket_example") // VmAddUserDevice | The path of the new device + + configuration := openapiclient.NewConfiguration() + api_client := openapiclient.NewAPIClient(configuration) + resp, r, err := api_client.DefaultApi.VmAddUserDevicePut(context.Background()).VmAddUserDevice(vmAddUserDevice).Execute() + if err != nil { + fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.VmAddUserDevicePut``: %v\n", err) + fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) + } + // response from `VmAddUserDevicePut`: PciDeviceInfo + fmt.Fprintf(os.Stdout, "Response from `DefaultApi.VmAddUserDevicePut`: %v\n", resp) +} +``` + +### Path Parameters + + + +### Other Parameters + +Other parameters are passed through a pointer to a apiVmAddUserDevicePutRequest struct via the builder pattern + + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **vmAddUserDevice** | [**VmAddUserDevice**](VmAddUserDevice.md) | The path of the new device | + +### Return type + +[**PciDeviceInfo**](PciDeviceInfo.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json +- **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to README]](../README.md) + + ## VmAddVdpaPut > PciDeviceInfo VmAddVdpaPut(ctx).VdpaConfig(vdpaConfig).Execute() diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddUserDevice.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddUserDevice.md new file mode 100644 index 000000000000..3c1cda58ba25 --- /dev/null +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddUserDevice.md @@ -0,0 +1,51 @@ +# VmAddUserDevice + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Socket** | **string** | | + +## Methods + +### NewVmAddUserDevice + +`func NewVmAddUserDevice(socket string, ) *VmAddUserDevice` + +NewVmAddUserDevice instantiates a new VmAddUserDevice object +This constructor will assign default values to properties that have it defined, +and makes sure properties required by API are set, but the set of arguments +will change when the set of required properties is changed + +### NewVmAddUserDeviceWithDefaults + +`func NewVmAddUserDeviceWithDefaults() *VmAddUserDevice` + +NewVmAddUserDeviceWithDefaults instantiates a new VmAddUserDevice object +This constructor will only assign default values to properties that have it defined, +but it doesn't guarantee that properties required by API are set + +### GetSocket + +`func (o *VmAddUserDevice) GetSocket() string` + +GetSocket returns the Socket field if non-nil, zero value otherwise. + +### GetSocketOk + +`func (o *VmAddUserDevice) GetSocketOk() (*string, bool)` + +GetSocketOk returns a tuple with the Socket field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetSocket + +`func (o *VmAddUserDevice) SetSocket(v string)` + +SetSocket sets Socket field to given value. + + + +[[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/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_user_device.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_user_device.go new file mode 100644 index 000000000000..fd93f85cde5f --- /dev/null +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_user_device.go @@ -0,0 +1,106 @@ +/* +Cloud Hypervisor API + +Local HTTP based API for managing and inspecting a cloud-hypervisor virtual machine. + +API version: 0.3.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi + +import ( + "encoding/json" +) + +// VmAddUserDevice struct for VmAddUserDevice +type VmAddUserDevice struct { + Socket string `json:"socket"` +} + +// NewVmAddUserDevice instantiates a new VmAddUserDevice object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewVmAddUserDevice(socket string) *VmAddUserDevice { + this := VmAddUserDevice{} + this.Socket = socket + return &this +} + +// NewVmAddUserDeviceWithDefaults instantiates a new VmAddUserDevice object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewVmAddUserDeviceWithDefaults() *VmAddUserDevice { + this := VmAddUserDevice{} + return &this +} + +// GetSocket returns the Socket field value +func (o *VmAddUserDevice) GetSocket() string { + if o == nil { + var ret string + return ret + } + + return o.Socket +} + +// GetSocketOk returns a tuple with the Socket field value +// and a boolean to check if the value has been set. +func (o *VmAddUserDevice) GetSocketOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.Socket, true +} + +// SetSocket sets field value +func (o *VmAddUserDevice) SetSocket(v string) { + o.Socket = v +} + +func (o VmAddUserDevice) MarshalJSON() ([]byte, error) { + toSerialize := map[string]interface{}{} + if true { + toSerialize["socket"] = o.Socket + } + return json.Marshal(toSerialize) +} + +type NullableVmAddUserDevice struct { + value *VmAddUserDevice + isSet bool +} + +func (v NullableVmAddUserDevice) Get() *VmAddUserDevice { + return v.value +} + +func (v *NullableVmAddUserDevice) Set(val *VmAddUserDevice) { + v.value = val + v.isSet = true +} + +func (v NullableVmAddUserDevice) IsSet() bool { + return v.isSet +} + +func (v *NullableVmAddUserDevice) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableVmAddUserDevice(val *VmAddUserDevice) *NullableVmAddUserDevice { + return &NullableVmAddUserDevice{value: val, isSet: true} +} + +func (v NullableVmAddUserDevice) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableVmAddUserDevice) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml index fa855da619d4..3353bf695f01 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml @@ -347,6 +347,28 @@ paths: 500: description: The new vDPA device could not be added to the VM instance. + /vm.add-user-device: + put: + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/VmAddUserDevice' + description: The path of the new device + required: true + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/PciDeviceInfo' + description: The new device was successfully added to the VM instance. + "204": + description: The new device was successfully (cold) added to the VM instance. + "404": + description: The new device could not be added to the VM instance. + summary: Add a new userspace device to the VM + /vm.snapshot: put: summary: Returns a VM snapshot. @@ -1156,3 +1178,11 @@ components: type: string local: type: boolean + + VmAddUserDevice: + required: + - socket + type: object + properties: + socket: + type: string