Merge pull request #570 from q384566678/blockIO-validate

validate: add weightDevice validation

Author: liangchenye

validate/validate.go

@@ -819,6 +819,18 @@ func (v *Validator) CheckLinuxResources() (errs error) {
 		}
 	}
 
+	if r.BlockIO != nil && r.BlockIO.WeightDevice != nil {
+		for i, weightDevice := range r.BlockIO.WeightDevice {
+			if weightDevice.Weight == nil && weightDevice.LeafWeight == nil {
+				errs = multierror.Append(errs,
+					specerror.NewError(
+						specerror.BlkIOWeightOrLeafWeightExist,
+						fmt.Errorf("linux.resources.blockIO.weightDevice[%d] specifies neither weight nor leafWeight", i),
+						rspec.Version))
+			}
+		}
+	}
+
 	return
 }
 

validate/validate_test.go

@@ -508,6 +508,12 @@ func TestCheckProcess(t *testing.T) {
 }
 
 func TestCheckLinux(t *testing.T) {
+	weightDevices := []rspec.LinuxWeightDevice{
+		rspec.LinuxWeightDevice{},
+	}
+	weightDevices[0].Major = 5
+	weightDevices[0].Minor = 0
+
 	cases := []struct {
 		val      rspec.Spec
 		expected specerror.Code
@@ -595,6 +601,19 @@ func TestCheckLinux(t *testing.T) {
 			},
 			expected: specerror.ReadonlyPathsAbs,
 		},
+		{
+			val: rspec.Spec{
+				Version: "1.0.0",
+				Linux: &rspec.Linux{
+					Resources: &rspec.LinuxResources{
+						BlockIO: &rspec.LinuxBlockIO{
+							WeightDevice: weightDevices,
+						},
+					},
+				},
+			},
+			expected: specerror.BlkIOWeightOrLeafWeightExist,
+		},
 	}
 	for _, c := range cases {
 		v, err := NewValidator(&c.val, ".", false, "linux")