Remove val and ok in Storageos

pkg/volume/storageos/storageos_util_test.go

@@ -181,9 +181,9 @@ func TestCreateVolume(t *testing.T) {
 	if len(vol.Labels) == 0 {
 		t.Error("CreateVolume() Labels are empty")
 	} else {
+		var val string
+		var ok bool
 		for k, v := range labels {
-			var val string
-			var ok bool
 			if val, ok = vol.Labels[k]; !ok {
 				t.Errorf("CreateVolume() Label %s not set", k)
 			}
@@ -191,8 +191,6 @@ func TestCreateVolume(t *testing.T) {
 				t.Errorf("CreateVolume() returned unexpected Label value %s", val)
 			}
 		}
-		var val string
-		var ok bool
 		if val, ok = vol.Labels["labelfromapi"]; !ok {
 			t.Error("CreateVolume() Label from api not set")
 		}