Skip to content

Refresh swagger #287

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.

Sign up for GitHub

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

Merged
jterry75 merged 1 commit into from
Aug 17, 2018
Merged

Refresh swagger #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/hcsoci/hcsdoc_wcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func createWindowsContainerDocument(coi *createOptionsInternal) (interface{}, er
}
if coi.Spec.Windows.Resources.CPU.Maximum != nil {
v1.ProcessorMaximum = int64(*coi.Spec.Windows.Resources.CPU.Maximum)
v2Container.Processor.MaximumPercentage = int32(v1.ProcessorMaximum)
v2Container.Processor.Maximum = int32(v1.ProcessorMaximum)
}
}
if coi.Spec.Windows.Resources.Memory != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/schema2/memory_2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Memory2 struct {

SizeInMB int32 `json:"SizeInMB,omitempty"`

Backing string `json:"Backing,omitempty"`
AllowOvercommit bool `json:"AllowOvercommit,omitempty"`

EnableHotHint bool `json:"EnableHotHint,omitempty"`

Expand Down
2 changes: 1 addition & 1 deletion internal/schema2/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Processor struct {

Count int32 `json:"Count,omitempty"`

MaximumPercentage int32 `json:"MaximumPercentage,omitempty"`
Maximum int32 `json:"Maximum,omitempty"`

Weight int32 `json:"Weight,omitempty"`
}
4 changes: 4 additions & 0 deletions internal/schema2/processor_2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,9 @@ type Processor2 struct {

Count int32 `json:"Count,omitempty"`

Limit int32 `json:"Limit,omitempty"`

Weight int32 `json:"Weight,omitempty"`

ExposeVirtualizationExtensions bool `json:"ExposeVirtualizationExtensions,omitempty"`
}
2 changes: 2 additions & 0 deletions internal/schema2/virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ type VirtualMachine struct {

RegistryChanges *RegistryChanges `json:"RegistryChanges,omitempty"`

StorageQoS *StorageQoS `json:"StorageQoS,omitempty"`

GuestConnection *GuestConnection `json:"GuestConnection,omitempty"`
}
2 changes: 0 additions & 2 deletions internal/schema2/windows_crash_reporting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ type WindowsCrashReporting struct {
DumpFileName string `json:"DumpFileName,omitempty"`

MaxDumpSize int64 `json:"MaxDumpSize,omitempty"`

DumpType string `json:"DumpType,omitempty"`
}
4 changes: 2 additions & 2 deletions internal/uvm/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ func Create(opts *UVMOptions) (_ *UtilityVM, err error) {

ComputeTopology: &hcsschema.Topology{
Memory: &hcsschema.Memory2{
Backing: "Virtual",
SizeInMB: memory,
AllowOvercommit: true,
SizeInMB: memory,
},
Processor: &hcsschema.Processor2{
Count: processors,
Expand Down