From 948d381418b3f32a65e0dfd965af51e0b96b50be Mon Sep 17 00:00:00 2001
From: Divyen Patel <divyenp@vmware.com>
Date: Thu, 1 Feb 2018 09:47:29 -0800
Subject: [PATCH] fixing node labels for random tests invocation

addressed Michelle Au's review comments
---
 .../storage/vsphere/vsphere_volume_diskformat.go  |  9 ++++++---
 .../storage/vsphere/vsphere_volume_placement.go   | 15 +++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/test/e2e/storage/vsphere/vsphere_volume_diskformat.go b/test/e2e/storage/vsphere/vsphere_volume_diskformat.go
index 34d0f0e08a7..a1dd4ea94f4 100644
--- a/test/e2e/storage/vsphere/vsphere_volume_diskformat.go
+++ b/test/e2e/storage/vsphere/vsphere_volume_diskformat.go
@@ -52,6 +52,9 @@ import (
 
 var _ = utils.SIGDescribe("Volume Disk Format [Feature:vsphere]", func() {
 	f := framework.NewDefaultFramework("volume-disk-format")
+	const (
+		NodeLabelKey = "vsphere_e2e_label_volume_diskformat"
+	)
 	var (
 		client            clientset.Interface
 		namespace         string
@@ -73,15 +76,15 @@ var _ = utils.SIGDescribe("Volume Disk Format [Feature:vsphere]", func() {
 		if !isNodeLabeled {
 			nodeLabelValue = "vsphere_e2e_" + string(uuid.NewUUID())
 			nodeKeyValueLabel = make(map[string]string)
-			nodeKeyValueLabel["vsphere_e2e_label"] = nodeLabelValue
-			framework.AddOrUpdateLabelOnNode(client, nodeName, "vsphere_e2e_label", nodeLabelValue)
+			nodeKeyValueLabel[NodeLabelKey] = nodeLabelValue
+			framework.AddOrUpdateLabelOnNode(client, nodeName, NodeLabelKey, nodeLabelValue)
 			isNodeLabeled = true
 		}
 	})
 	framework.AddCleanupAction(func() {
 		// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
 		if len(namespace) > 0 && len(nodeLabelValue) > 0 {
-			framework.RemoveLabelOffNode(client, nodeName, "vsphere_e2e_label")
+			framework.RemoveLabelOffNode(client, nodeName, NodeLabelKey)
 		}
 	})
 
diff --git a/test/e2e/storage/vsphere/vsphere_volume_placement.go b/test/e2e/storage/vsphere/vsphere_volume_placement.go
index 7695458b7eb..8a2b3f245a5 100644
--- a/test/e2e/storage/vsphere/vsphere_volume_placement.go
+++ b/test/e2e/storage/vsphere/vsphere_volume_placement.go
@@ -35,6 +35,9 @@ import (
 
 var _ = utils.SIGDescribe("Volume Placement", func() {
 	f := framework.NewDefaultFramework("volume-placement")
+	const (
+		NodeLabelKey = "vsphere_e2e_label_volume_placement"
+	)
 	var (
 		c                  clientset.Interface
 		ns                 string
@@ -80,10 +83,10 @@ var _ = utils.SIGDescribe("Volume Placement", func() {
 		// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
 		if len(ns) > 0 {
 			if len(node1KeyValueLabel) > 0 {
-				framework.RemoveLabelOffNode(c, node1Name, "vsphere_e2e_label")
+				framework.RemoveLabelOffNode(c, node1Name, NodeLabelKey)
 			}
 			if len(node2KeyValueLabel) > 0 {
-				framework.RemoveLabelOffNode(c, node2Name, "vsphere_e2e_label")
+				framework.RemoveLabelOffNode(c, node2Name, NodeLabelKey)
 			}
 		}
 	})
@@ -339,13 +342,13 @@ func testSetupVolumePlacement(client clientset.Interface, namespace string) (nod
 	node2Name = nodes.Items[1].Name
 	node1LabelValue := "vsphere_e2e_" + string(uuid.NewUUID())
 	node1KeyValueLabel = make(map[string]string)
-	node1KeyValueLabel["vsphere_e2e_label"] = node1LabelValue
-	framework.AddOrUpdateLabelOnNode(client, node1Name, "vsphere_e2e_label", node1LabelValue)
+	node1KeyValueLabel[NodeLabelKey] = node1LabelValue
+	framework.AddOrUpdateLabelOnNode(client, node1Name, NodeLabelKey, node1LabelValue)
 
 	node2LabelValue := "vsphere_e2e_" + string(uuid.NewUUID())
 	node2KeyValueLabel = make(map[string]string)
-	node2KeyValueLabel["vsphere_e2e_label"] = node2LabelValue
-	framework.AddOrUpdateLabelOnNode(client, node2Name, "vsphere_e2e_label", node2LabelValue)
+	node2KeyValueLabel[NodeLabelKey] = node2LabelValue
+	framework.AddOrUpdateLabelOnNode(client, node2Name, NodeLabelKey, node2LabelValue)
 	return node1Name, node1KeyValueLabel, node2Name, node2KeyValueLabel
 }