From 101fb900fa43fdffa8c1cfc3f4b1c5cdb4f2c08d Mon Sep 17 00:00:00 2001 From: John Howard Date: Fri, 17 Aug 2018 10:08:15 -0700 Subject: [PATCH] Refresh swagger Signed-off-by: John Howard --- internal/hcsoci/hcsdoc_wcow.go | 2 +- internal/schema2/memory_2.go | 2 +- internal/schema2/processor.go | 2 +- internal/schema2/processor_2.go | 4 ++++ internal/schema2/virtual_machine.go | 2 ++ internal/schema2/windows_crash_reporting.go | 2 -- internal/uvm/create.go | 4 ++-- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/internal/hcsoci/hcsdoc_wcow.go b/internal/hcsoci/hcsdoc_wcow.go index 916eb9566a..55cd4106e5 100644 --- a/internal/hcsoci/hcsdoc_wcow.go +++ b/internal/hcsoci/hcsdoc_wcow.go @@ -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 { diff --git a/internal/schema2/memory_2.go b/internal/schema2/memory_2.go index f962062f42..fd766f41a3 100644 --- a/internal/schema2/memory_2.go +++ b/internal/schema2/memory_2.go @@ -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"` diff --git a/internal/schema2/processor.go b/internal/schema2/processor.go index 8fe97ec125..7a60b0245a 100644 --- a/internal/schema2/processor.go +++ b/internal/schema2/processor.go @@ -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"` } diff --git a/internal/schema2/processor_2.go b/internal/schema2/processor_2.go index 5b3fa28c37..40d3e7356d 100644 --- a/internal/schema2/processor_2.go +++ b/internal/schema2/processor_2.go @@ -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"` } diff --git a/internal/schema2/virtual_machine.go b/internal/schema2/virtual_machine.go index 90ea88a6f1..11f39eea7b 100644 --- a/internal/schema2/virtual_machine.go +++ b/internal/schema2/virtual_machine.go @@ -23,5 +23,7 @@ type VirtualMachine struct { RegistryChanges *RegistryChanges `json:"RegistryChanges,omitempty"` + StorageQoS *StorageQoS `json:"StorageQoS,omitempty"` + GuestConnection *GuestConnection `json:"GuestConnection,omitempty"` } diff --git a/internal/schema2/windows_crash_reporting.go b/internal/schema2/windows_crash_reporting.go index 8bb4df2bd3..cf632bbc83 100644 --- a/internal/schema2/windows_crash_reporting.go +++ b/internal/schema2/windows_crash_reporting.go @@ -14,6 +14,4 @@ type WindowsCrashReporting struct { DumpFileName string `json:"DumpFileName,omitempty"` MaxDumpSize int64 `json:"MaxDumpSize,omitempty"` - - DumpType string `json:"DumpType,omitempty"` } diff --git a/internal/uvm/create.go b/internal/uvm/create.go index c7fa7602fb..180374fe52 100644 --- a/internal/uvm/create.go +++ b/internal/uvm/create.go @@ -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,