Added feature to specify Chassis info for domain

th3w4y · Aug 12, 2019 · 0c674d3 · 0c674d3
1 parent 811aecb
commit 0c674d3
Show file tree

Hide file tree

Showing 11 changed files with 179 additions and 1 deletion.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -4164,6 +4164,26 @@
      }
     }
    },
+   "v1.Chassis": {
+    "description": "Chassis specifies the chassins info passed to the domain.",
+    "properties": {
+     "asset": {
+      "type": "string"
+     },
+     "manufacturer": {
+      "type": "string"
+     },
+     "serial": {
+      "type": "string"
+     },
+     "sku": {
+      "type": "string"
+     },
+     "version": {
+      "type": "string"
+     }
+    }
+   },
    "v1.Clock": {
     "description": "Represents the clock and timers of a vmi.",
     "required": [
@@ -4498,6 +4518,10 @@
      "devices"
     ],
     "properties": {
+     "chassis": {
+      "description": "Chassis specifies the chassins info passed to the domain.\n+optional",
+      "$ref": "#/definitions/v1.Chassis"
+     },
      "clock": {
       "description": "Clock sets the clock and timers of the vmi.\n+optional",
       "$ref": "#/definitions/v1.Clock"

diff --git a/examples/vm-cirros.yaml b/examples/vm-cirros.yaml
@@ -26,6 +26,8 @@ spec:
         resources:
           requests:
             memory: 64M
+        chassis:
+          asset: 123456
       terminationGracePeriodSeconds: 0
       volumes:
       - containerDisk:

diff --git a/examples/vmi-fedora.yaml b/examples/vmi-fedora.yaml
@@ -21,6 +21,8 @@ spec:
     resources:
       requests:
         memory: 1024M
+    chassis:
+      asset: 123456
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:

diff --git a/pkg/virt-launcher/virtwrap/api/converter.go b/pkg/virt-launcher/virtwrap/api/converter.go
@@ -687,6 +687,31 @@ func Convert_v1_VirtualMachine_To_api_Domain(vmi *v1.VirtualMachineInstance, dom
 		}
 	}
 
+	if vmi.Spec.Domain.Chassis != nil {
+		domain.Spec.SysInfo.Chassis = []Entry{
+			{
+				Name:  "manufacturer",
+				Value: string(vmi.Spec.Domain.Chassis.Manufacturer),
+			},
+			{
+				Name:  "version",
+				Value: string(vmi.Spec.Domain.Chassis.Version),
+			},
+			{
+				Name:  "serial",
+				Value: string(vmi.Spec.Domain.Chassis.Serial),
+			},
+			{
+				Name:  "asset",
+				Value: string(vmi.Spec.Domain.Chassis.Asset),
+			},
+			{
+				Name:  "sku",
+				Value: string(vmi.Spec.Domain.Chassis.Sku),
+			},
+		}
+	}
+
 	if domain.Spec.Memory, err = QuantityToByte(*getVirtualMemory(vmi)); err != nil {
 		return err
 	}

diff --git a/pkg/virt-launcher/virtwrap/api/deepcopy_generated.go b/pkg/virt-launcher/virtwrap/api/deepcopy_generated.go
diff --git a/pkg/virt-launcher/virtwrap/api/schema.go b/pkg/virt-launcher/virtwrap/api/schema.go
@@ -607,6 +607,7 @@ type SysInfo struct {
 	System    []Entry `xml:"system>entry"`
 	BIOS      []Entry `xml:"bios>entry"`
 	BaseBoard []Entry `xml:"baseBoard>entry"`
+	Chassis   []Entry `xml:"chassis>entry"`
 }
 
 type Entry struct {

diff --git a/staging/src/kubevirt.io/client-go/api/v1/deepcopy_generated.go b/staging/src/kubevirt.io/client-go/api/v1/deepcopy_generated.go
diff --git a/staging/src/kubevirt.io/client-go/api/v1/openapi_generated.go b/staging/src/kubevirt.io/client-go/api/v1/openapi_generated.go
diff --git a/staging/src/kubevirt.io/client-go/api/v1/schema.go b/staging/src/kubevirt.io/client-go/api/v1/schema.go
@@ -170,6 +170,20 @@ type DomainSpec struct {
 	// One of: shared, auto
 	// +optional
 	IOThreadsPolicy *IOThreadsPolicy `json:"ioThreadsPolicy,omitempty"`
+	// Chassis specifies the chassins info passed to the domain.
+	// +optional
+	Chassis *Chassis `json:"chassis,omitempty"`
+}
+
+// Chassis specifies the chassins info passed to the domain.
+// ---
+// +k8s:openapi-gen=true
+type Chassis struct {
+	Manufacturer string `json:"manufacturer,omitempty"`
+	Version      string `json:"version,omitempty"`
+	Serial       string `json:"serial,omitempty"`
+	Asset        string `json:"asset,omitempty"`
+	Sku          string `json:"sku,omitempty"`
 }
 
 // Represents the firmware blob used to assist in the domain creation process.

diff --git a/staging/src/kubevirt.io/client-go/api/v1/schema_swagger_generated.go b/staging/src/kubevirt.io/client-go/api/v1/schema_swagger_generated.go
diff --git a/tests/vmi_configuration_test.go b/tests/vmi_configuration_test.go
@@ -1857,4 +1857,27 @@ var _ = Describe("Configurations", func() {
 			})
 		})
 	})
+
+	Context("Check Chassis value", func() {
+		var vmi *v1.VirtualMachineInstance
+
+		BeforeEach(func() {
+			vmi = tests.NewRandomVMI()
+		})
+
+		It("Test Chassis value in a newly created VM", func() {
+			vmi.Spec.Domain.Chassis = &v1.Chassis{
+				Asset: "Test-123",
+			}
+
+			By("Starting a VirtualMachineInstance")
+			vmi, err = virtClient.VirtualMachineInstance(tests.NamespaceTestDefault).Create(vmi)
+			Expect(err).ToNot(HaveOccurred())
+			tests.WaitForSuccessfulVMIStart(vmi)
+
+			domXml, err := tests.GetRunningVirtualMachineInstanceDomainXML(virtClient, vmi)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(domXml).To(ContainSubstring("<entry name='asset'>Test-123</entry>"))
+		})
+	})
 })