Added Logging

Signed-off-by: kanishkarj <kanishkarj@hotmail.com>

Author: kanishkarj

smi-conformance/main.go

@@ -13,7 +13,12 @@ import (
 
 func main() {
 	manifestDirs := []string{}
-	testToRun := "traffic-split"
+
+	// Run all testCases
+	testToRun := ""
+	// Run only traffic-split
+	// testToRun := "traffic-split"
+
 	startKIND := false
 	options := harness.TestSuite{}
 
@@ -40,17 +45,18 @@ func main() {
 	// 	PortSvcC: "9091",
 	// }
 
-	linkerdConfig := test_gen.Linkerd{
+	meshConfig := test_gen.Maesh{
 		PortSvcA: "9091",
 		PortSvcB: "9091",
 		PortSvcC: "9091",
 	}
 
 	annotations := make(map[string]string)
-	annotations["linkerd.io/inject"] = "enabled"
+	// Namespace Injection
+	// annotations["linkerd.io/inject"] = "enabled"
 
 	serviceMeshConfObj := test_gen.SMIConformance{
-		SMObj: linkerdConfig,
+		SMObj: meshConfig,
 	}
 
 	testHandlers := make(map[string]map[string]test.CustomTest)
@@ -65,10 +71,15 @@ func main() {
 			SuiteCustomTests:     testHandlers,
 			NamespaceAnnotations: annotations,
 		}
+
+		// Runs the test using the inCluster kubeConfig (runs only when the code is running inside the pod)
+		// harness.InCluster = true
+
 		s, _ := json.MarshalIndent(options, "", "  ")
 		fmt.Printf("Running integration tests with following options:\n%s\n", string(s))
 		results := harness.Run()
 		data, _ := json.Marshal(results)
+		// Results of the test
 		fmt.Printf("Results :\n%v\n", string(data))
 	})
 }

smi-conformance/test-gen/traffic-access.go

@@ -47,14 +47,18 @@ func (smi *SMIConformance) traffic(
 	url := fmt.Sprintf("http://%s:%s/%s", clusterIPs[SERVICE_A_NAME], smi.SMObj.SvcAGetPort(), CALL)
 	_, err = httpClient.Post(url, "application/json", bytes.NewBuffer(jsonStr))
 
+	Logger.Logf("URL : \n", url)
+	Logger.Logf("Body : \n", string(jsonStr))
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
 	metricsSvcA, err := GetMetrics(clusterIPs[SERVICE_A_NAME], "9091")
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
@@ -90,6 +94,7 @@ func (smi *SMIConformance) allow(
 	kubeClient, err := clientFn(false)
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 	clusterIPs, err := GetClusterIPs(kubeClient, namespace)
@@ -102,15 +107,19 @@ func (smi *SMIConformance) allow(
 	url := fmt.Sprintf("http://%s:%s/%s", clusterIPs[SERVICE_A_NAME], smi.SMObj.SvcAGetPort(), CALL)
 	_, err = httpClient.Post(url, "application/json", bytes.NewBuffer(jsonStr))
 
+	Logger.Logf("URL : \n", url)
+	Logger.Logf("Body : \n", string(jsonStr))
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
 	metricsSvcA, err := GetMetrics(clusterIPs[SERVICE_A_NAME], "9091")
 
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 

smi-conformance/test-gen/traffic-spec.go

@@ -48,8 +48,11 @@ func (smi *SMIConformance) trafficPath(
 	url := fmt.Sprintf("http://%s:%s/%s", clusterIPs[SERVICE_A_NAME], smi.SMObj.SvcAGetPort(), CALL)
 	_, err = httpClient.Post(url, "application/json", bytes.NewBuffer(jsonStr))
 
+	Logger.Logf("URL : \n", url)
+	Logger.Logf("Body : \n", string(jsonStr))
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
@@ -68,6 +71,7 @@ func (smi *SMIConformance) trafficPath(
 	metricsSvcA, err := GetMetrics(clusterIPs[SERVICE_A_NAME], "9091")
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
@@ -121,8 +125,11 @@ func (smi *SMIConformance) trafficMethod(
 	url := fmt.Sprintf("http://%s:%s/%s", clusterIPs[SERVICE_A_NAME], smi.SMObj.SvcAGetPort(), CALL)
 	_, err = httpClient.Post(url, "application/json", bytes.NewBuffer(jsonStr))
 
+	Logger.Logf("URL : \n", url)
+	Logger.Logf("Body : \n", string(jsonStr))
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
@@ -132,14 +139,18 @@ func (smi *SMIConformance) trafficMethod(
 	url = fmt.Sprintf("http://%s:%s/%s", clusterIPs[SERVICE_A_NAME], smi.SMObj.SvcAGetPort(), CALL)
 	_, err = httpClient.Post(url, "application/json", bytes.NewBuffer(jsonStr))
 
+	Logger.Logf("URL : \n", url)
+	Logger.Logf("Body : \n", string(jsonStr))
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}
 
 	metricsSvcA, err := GetMetrics(clusterIPs[SERVICE_A_NAME], "9091")
 	if err != nil {
 		t.Fail()
+		Logger.Logf("Error : %s", err.Error())
 		return []error{err}
 	}