Minor changes in Azure Experiments (#476)

* Removed AUT and app check from azure experiments

Signed-off-by: Akash Shrivastava <[email protected]>

* Changed azure status functions to accept string values rather than experimentType struct

Signed-off-by: Akash Shrivastava <[email protected]>

* Removed unused variables from test.yaml

Signed-off-by: Akash Shrivastava <[email protected]>

* Added AUT and Auxillary app check

Signed-off-by: Akash Shrivastava <[email protected]>

* Updated test.yaml

Signed-off-by: Akash Shrivastava <[email protected]>

Author: Akash Shrivastava

experiments/azure/azure-disk-loss/experiment/azure-disk-loss.go

@@ -69,6 +69,7 @@ func AzureDiskLoss(clients clients.ClientSets) {
 
 	//DISPLAY THE APP INFORMATION
 	log.InfoWithValues("The volume information is as follows", logrus.Fields{
+		"Chaos Duration": experimentsDetails.ChaosDuration,
 		"Disk Names":     experimentsDetails.VirtualDiskNames,
 		"Resource Group": experimentsDetails.ResourceGroup,
 		"Sequence":       experimentsDetails.Sequence,
@@ -104,7 +105,7 @@ func AzureDiskLoss(clients clients.ClientSets) {
 
 	// PRE-CHAOS VIRTUAL DISK STATUS CHECK
 	log.Info("[Status]: Verify that the virtual disk are attached to VM instance(pre-chaos)")
-	if err = azureStatus.CheckVirtualDiskWithInstance(experimentsDetails); err != nil {
+	if err = azureStatus.CheckVirtualDiskWithInstance(experimentsDetails.SubscriptionID, experimentsDetails.VirtualDiskNames, experimentsDetails.ResourceGroup); err != nil {
 		log.Errorf("Virtual disk status check failed, err: %v", err)
 		failStep := "[pre-chaos]: Failed to verify that the virtual disk are attached to VM instance, err: " + err.Error()
 		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
@@ -118,7 +119,7 @@ func AzureDiskLoss(clients clients.ClientSets) {
 		// run the probes in the pre-chaos check
 		if len(resultDetails.ProbeDetails) != 0 {
 
-			if err := probe.RunProbes(&chaosDetails, clients, &resultDetails, "PreChaos", &eventsDetails); err != nil {
+			if err = probe.RunProbes(&chaosDetails, clients, &resultDetails, "PreChaos", &eventsDetails); err != nil {
 				log.Errorf("Probe Failed, err: %v", err)
 				failStep := "[pre-chaos]: Failed while running probes, err: " + err.Error()
 				msg := "AUT: Running, Probes: Unsuccessful"
@@ -153,6 +154,15 @@ func AzureDiskLoss(clients clients.ClientSets) {
 	log.Infof("[Confirmation]: %v chaos has been injected successfully", experimentsDetails.ExperimentName)
 	resultDetails.Verdict = v1alpha1.ResultVerdictPassed
 
+	// POST-CHAOS VIRTUAL DISK STATUS CHECK
+	log.Info("[Status]: Verify that the virtual disk are attached to VM instance(post-chaos)")
+	if err = azureStatus.CheckVirtualDiskWithInstance(experimentsDetails.SubscriptionID, experimentsDetails.VirtualDiskNames, experimentsDetails.ResourceGroup); err != nil {
+		log.Errorf("Virtual disk status check failed, err: %v", err)
+		failStep := "[post-chaos]: Failed to verify that the virtual disk are attached to VM instance, err: " + err.Error()
+		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
+		return
+	}
+
 	//POST-CHAOS APPLICATION STATUS CHECK
 	log.Info("[Status]: Verify that the AUT (Application Under Test) is running (post-chaos)")
 	if err = status.AUTStatusCheck(experimentsDetails.AppNS, experimentsDetails.AppLabel, experimentsDetails.TargetContainer, experimentsDetails.Timeout, experimentsDetails.Delay, clients, &chaosDetails); err != nil {
@@ -173,15 +183,6 @@ func AzureDiskLoss(clients clients.ClientSets) {
 		}
 	}
 
-	// POST-CHAOS VIRTUAL DISK STATUS CHECK
-	log.Info("[Status]: Verify that the virtual disk are attached to VM instance(post-chaos)")
-	if err = azureStatus.CheckVirtualDiskWithInstance(experimentsDetails); err != nil {
-		log.Errorf("Virtual disk status check failed, err: %v", err)
-		failStep := "[post-chaos]: Failed to verify that the virtual disk are attached to VM instance, err: " + err.Error()
-		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
-		return
-	}
-
 	if experimentsDetails.EngineName != "" {
 		// marking AUT as running, as we already checked the status of application under test
 		msg := "AUT: Running"

experiments/azure/azure-disk-loss/test/test.yml

@@ -21,42 +21,33 @@ spec:
           - sleep
           - "3600"
         env:
-          # provide application namespace
           - name: APP_NAMESPACE
-            value: ''
+            value: 'default'
 
-          # provide application labels
           - name: APP_LABEL
-            value: ''
- 
-          # provide application kind
+            value: 'run=nginx'
+
           - name: APP_KIND
-            value: '' 
+            value: 'deployment'
 
           - name: TOTAL_CHAOS_DURATION
-            value: ''
-
-          # provide auxiliary application details - namespace and labels of the applications
-          # sample input is - "ns1:app=percona,ns2:name=nginx"
-          - name: AUXILIARY_APPINFO
-            value: ''
+            value: '60'
 
+          - name: CHAOS_INTERVAL
+            value: '30'
+
           ## Period to wait before injection of chaos in sec
           - name: RAMP_TIME
             value: ''
 
           ## env var that describes the library used to execute the chaos
           ## default: litmus
           - name: LIB
-            value: ''
+            value: 'litmus'
 
           # provide the chaos namespace
           - name: CHAOS_NAMESPACE
-            value: ''
-          
-          # provide target container name
-          - name: TARGET_CONTAINER
-            value: ''
+            value: 'litmus'
 
           # provide the resouce group of the instance
           - name: RESOURCE_GROUP
@@ -72,7 +63,7 @@ spec:
 
           # provide the sequence type for the run. Options: serial/parallel
           - name: SEQUENCE
-            value: ''
+            value: 'parallel'
 
           # provide the path to aks credentials mounted from secret
           - name: AZURE_AUTH_LOCATION
@@ -88,4 +79,8 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.serviceAccountName
+          
+        secrets:
+          - name: cloud-secret
+            mountPath: /tmp/
 

experiments/azure/instance-stop/experiment/azure-instance-stop.go

@@ -10,12 +10,12 @@ import (
 	clients "github.com/litmuschaos/litmus-go/pkg/clients"
 	azureCommon "github.com/litmuschaos/litmus-go/pkg/cloud/azure/common"
 	azureStatus "github.com/litmuschaos/litmus-go/pkg/cloud/azure/instance"
+	"github.com/litmuschaos/litmus-go/pkg/status"
 
 	"github.com/litmuschaos/litmus-go/pkg/events"
 	"github.com/litmuschaos/litmus-go/pkg/log"
 	"github.com/litmuschaos/litmus-go/pkg/probe"
 	"github.com/litmuschaos/litmus-go/pkg/result"
-	"github.com/litmuschaos/litmus-go/pkg/status"
 	"github.com/litmuschaos/litmus-go/pkg/types"
 	"github.com/litmuschaos/litmus-go/pkg/utils/common"
 	"github.com/sirupsen/logrus"
@@ -64,16 +64,16 @@ func AzureInstanceStop(clients clients.ClientSets) {
 	go common.AbortWatcherWithoutExit(experimentsDetails.ExperimentName, clients, &resultDetails, &chaosDetails, &eventsDetails)
 
 	//DISPLAY THE APP INFORMATION
-	log.InfoWithValues("The application information is as follows", logrus.Fields{
+	log.InfoWithValues("The instance information is as follows", logrus.Fields{
 		"Chaos Duration": experimentsDetails.ChaosDuration,
 		"Resource Group": experimentsDetails.ResourceGroup,
 		"Instance Name":  experimentsDetails.AzureInstanceName,
+		"Sequence":       experimentsDetails.Sequence,
 	})
 
 	//PRE-CHAOS APPLICATION STATUS CHECK
 	log.Info("[Status]: Verify that the AUT (Application Under Test) is running (pre-chaos)")
-	err = status.CheckApplicationStatus(experimentsDetails.AppNS, experimentsDetails.AppLabel, experimentsDetails.Timeout, experimentsDetails.Delay, clients)
-	if err != nil {
+	if err = status.AUTStatusCheck(experimentsDetails.AppNS, experimentsDetails.AppLabel, experimentsDetails.TargetContainer, experimentsDetails.Timeout, experimentsDetails.Delay, clients, &chaosDetails); err != nil {
 		log.Errorf("Application status check failed, err: %v", err)
 		failStep := "[pre-chaos]: Failed to verify that the AUT (Application Under Test) is in running state, err: " + err.Error()
 		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
@@ -83,8 +83,7 @@ func AzureInstanceStop(clients clients.ClientSets) {
 	//PRE-CHAOS AUXILIARY APPLICATION STATUS CHECK
 	if experimentsDetails.AuxiliaryAppInfo != "" {
 		log.Info("[Status]: Verify that the Auxiliary Applications are running (pre-chaos)")
-		err = status.CheckAuxiliaryApplicationStatus(experimentsDetails.AuxiliaryAppInfo, experimentsDetails.Timeout, experimentsDetails.Delay, clients)
-		if err != nil {
+		if err = status.CheckAuxiliaryApplicationStatus(experimentsDetails.AuxiliaryAppInfo, experimentsDetails.Timeout, experimentsDetails.Delay, clients); err != nil {
 			log.Errorf("Auxiliary Application status check failed, err: %v", err)
 			failStep := "[pre-chaos]: Failed to verify that the Auxiliary Applications are in running state, err: " + err.Error()
 			result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
@@ -130,7 +129,7 @@ func AzureInstanceStop(clients clients.ClientSets) {
 	}
 
 	//Verify the azure target instance is running (pre-chaos)
-	if err := azureStatus.InstanceStatusCheckByName(&experimentsDetails); err != nil {
+	if err = azureStatus.InstanceStatusCheckByName(experimentsDetails.AzureInstanceName, experimentsDetails.ScaleSet, experimentsDetails.SubscriptionID, experimentsDetails.ResourceGroup); err != nil {
 		log.Errorf("failed to get the azure instance status, err: %v", err)
 		failStep := "[pre-chaos]: Failed to verify the azure instance status, err: " + err.Error()
 		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
@@ -158,7 +157,7 @@ func AzureInstanceStop(clients clients.ClientSets) {
 	resultDetails.Verdict = v1alpha1.ResultVerdictPassed
 
 	//Verify the azure instance is running (post chaos)
-	if err = azureStatus.InstanceStatusCheckByName(&experimentsDetails); err != nil {
+	if err = azureStatus.InstanceStatusCheckByName(experimentsDetails.AzureInstanceName, experimentsDetails.ScaleSet, experimentsDetails.SubscriptionID, experimentsDetails.ResourceGroup); err != nil {
 		log.Errorf("failed to get the azure instance status, err: %v", err)
 		failStep := "[pre-chaos]: Failed to update the azure instance status, err: " + err.Error()
 		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)
@@ -168,7 +167,7 @@ func AzureInstanceStop(clients clients.ClientSets) {
 
 	//POST-CHAOS APPLICATION STATUS CHECK
 	log.Info("[Status]: Verify that the AUT (Application Under Test) is running (post-chaos)")
-	if err = status.CheckApplicationStatus(experimentsDetails.AppNS, experimentsDetails.AppLabel, experimentsDetails.Timeout, experimentsDetails.Delay, clients); err != nil {
+	if err = status.AUTStatusCheck(experimentsDetails.AppNS, experimentsDetails.AppLabel, experimentsDetails.TargetContainer, experimentsDetails.Timeout, experimentsDetails.Delay, clients, &chaosDetails); err != nil {
 		log.Errorf("Application status check failed, err: %v", err)
 		failStep := "[post-chaos]: Failed to verify that the AUT (Application Under Test) is running, err: " + err.Error()
 		result.RecordAfterFailure(&chaosDetails, &resultDetails, failStep, clients, &eventsDetails)

experiments/azure/instance-stop/test/test.yml

@@ -21,28 +21,61 @@ spec:
           - sleep 
           - "3600"
         env:
-          - name: LIB
-            value: 'litmus'
 
-          - name: AZURE_INSTANCE_NAME
+          - name: APP_NAMESPACE
+            value: 'default'
+
+          - name: APP_LABEL
+            value: 'run=nginx'
+
+          - name: APP_KIND
+            value: 'deployment'
+          
+          - name: RAMP_TIME
             value: ''
+          
+          - name: TOTAL_CHAOS_DURATION
+            value: '60'
+          
+          - name: CHAOS_INTERVAL
+            value: '30'
 
+          - name: LIB
+            value: 'litmus'
+          
           - name: CHAOS_NAMESPACE
-            value: 'default'
+            value: 'litmus'
 
-          - name: RESOURCE_GROUP
+          # provide the instance names (comma seperated if multiple)
+          - name: AZURE_INSTANCE_NAME
             value: ''
-
-          - name: RAMP_TIME
+          
+          # provide the resouce group of the instance
+          - name: RESOURCE_GROUP
             value: ''
 
+          # whether the disk is attached to scale instance or not, accepted values are disable, enable
+          - name: SCALE_SET
+            value: 'disable'
+          
+          # provide the sequence type for the run. Options: serial/parallel
           - name: SEQUENCE
             value: 'parallel'
 
-          - name: CHAOS_INTERVAL
-            value: '30'
+          # provide the path to aks credentials mounted from secret
+          - name: AZURE_AUTH_LOCATION
+            value: '/tmp/azure.auth'
 
           - name: POD_NAME
             valueFrom:
               fieldRef:
-                fieldPath: metadata.name
+                fieldPath: metadata.name
+          
+          - name: CHAOS_SERVICE_ACCOUNT
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.serviceAccountName
+          
+        secrets:
+          - name: cloud-secret
+            mountPath: /tmp/

pkg/azure/disk-loss/environment/environment.go

@@ -14,23 +14,22 @@ func GetENV(experimentDetails *experimentTypes.ExperimentDetails) {
 	experimentDetails.ExperimentName = types.Getenv("EXPERIMENT_NAME", "azure-disk-loss")
 	experimentDetails.ChaosNamespace = types.Getenv("CHAOS_NAMESPACE", "litmus")
 	experimentDetails.EngineName = types.Getenv("CHAOSENGINE", "")
-	experimentDetails.ChaosDuration, _ = strconv.Atoi(types.Getenv("TOTAL_CHAOS_DURATION", "30"))
-	experimentDetails.ChaosInterval, _ = strconv.Atoi(types.Getenv("CHAOS_INTERVAL", "30"))
-	experimentDetails.RampTime, _ = strconv.Atoi(types.Getenv("RAMP_TIME", "0"))
-	experimentDetails.ChaosLib = types.Getenv("LIB", "litmus")
 	experimentDetails.AppNS = types.Getenv("APP_NAMESPACE", "")
 	experimentDetails.AppLabel = types.Getenv("APP_LABEL", "")
 	experimentDetails.AppKind = types.Getenv("APP_KIND", "")
 	experimentDetails.AuxiliaryAppInfo = types.Getenv("AUXILIARY_APPINFO", "")
+	experimentDetails.TargetContainer = types.Getenv("TARGET_CONTAINER", "")
+	experimentDetails.ChaosDuration, _ = strconv.Atoi(types.Getenv("TOTAL_CHAOS_DURATION", "30"))
+	experimentDetails.ChaosInterval, _ = strconv.Atoi(types.Getenv("CHAOS_INTERVAL", "30"))
+	experimentDetails.RampTime, _ = strconv.Atoi(types.Getenv("RAMP_TIME", "0"))
+	experimentDetails.ChaosLib = types.Getenv("LIB", "litmus")
 	experimentDetails.ChaosUID = clientTypes.UID(types.Getenv("CHAOS_UID", ""))
 	experimentDetails.InstanceID = types.Getenv("INSTANCE_ID", "")
 	experimentDetails.ChaosPodName = types.Getenv("POD_NAME", "")
 	experimentDetails.Delay, _ = strconv.Atoi(types.Getenv("STATUS_CHECK_DELAY", "2"))
 	experimentDetails.Timeout, _ = strconv.Atoi(types.Getenv("STATUS_CHECK_TIMEOUT", "180"))
-	experimentDetails.TargetContainer = types.Getenv("TARGET_CONTAINER", "")
 	experimentDetails.ScaleSet = types.Getenv("SCALE_SET", "disable")
 	experimentDetails.ResourceGroup = types.Getenv("RESOURCE_GROUP", "")
 	experimentDetails.VirtualDiskNames = types.Getenv("VIRTUAL_DISK_NAMES", "")
-	experimentDetails.SubscriptionID = types.Getenv("SUBSCRIPTION_ID", "")
 	experimentDetails.Sequence = types.Getenv("SEQUENCE", "parallel")
 }

pkg/azure/disk-loss/types/types.go

@@ -11,19 +11,19 @@ type ExperimentDetails struct {
 	ChaosDuration      int
 	ChaosInterval      int
 	RampTime           int
-	ChaosLib           string
 	AppNS              string
 	AppLabel           string
 	AppKind            string
 	AuxiliaryAppInfo   string
+	ChaosLib           string
 	ChaosUID           clientTypes.UID
 	InstanceID         string
 	ChaosNamespace     string
 	ChaosPodName       string
+	TargetContainer    string
 	Timeout            int
 	Delay              int
 	LIBImagePullPolicy string
-	TargetContainer    string
 	ScaleSet           string
 	ResourceGroup      string
 	SubscriptionID     string

pkg/azure/instance-stop/environment/environment.go

@@ -18,6 +18,7 @@ func GetENV(experimentDetails *experimentTypes.ExperimentDetails) {
 	experimentDetails.AppLabel = types.Getenv("APP_LABEL", "")
 	experimentDetails.AppKind = types.Getenv("APP_KIND", "")
 	experimentDetails.AuxiliaryAppInfo = types.Getenv("AUXILIARY_APPINFO", "")
+	experimentDetails.TargetContainer = types.Getenv("TARGET_CONTAINER", "")
 	experimentDetails.ChaosDuration, _ = strconv.Atoi(types.Getenv("TOTAL_CHAOS_DURATION", "30"))
 	experimentDetails.ChaosInterval, _ = strconv.Atoi(types.Getenv("CHAOS_INTERVAL", "30"))
 	experimentDetails.RampTime, _ = strconv.Atoi(types.Getenv("RAMP_TIME", "0"))

pkg/azure/instance-stop/types/types.go

@@ -20,6 +20,7 @@ type ExperimentDetails struct {
 	InstanceID         string
 	ChaosNamespace     string
 	ChaosPodName       string
+	TargetContainer    string
 	Timeout            int
 	Delay              int
 	AzureInstanceName  string

pkg/cloud/azure/disk/disk-status.go

@@ -10,7 +10,6 @@ import (
 	"github.com/Azure/go-autorest/autorest/azure/auth"
 	"github.com/litmuschaos/litmus-go/pkg/cloud/azure/common"
 
-	experimentTypes "github.com/litmuschaos/litmus-go/pkg/azure/disk-loss/types"
 	"github.com/pkg/errors"
 )
 
@@ -80,10 +79,10 @@ func GetDiskStatus(subscriptionID, resourceGroup, diskName string) (compute.Disk
 }
 
 // CheckVirtualDiskWithInstance checks whether the given list of disk are attached to the provided VM instance
-func CheckVirtualDiskWithInstance(experimentsDetails experimentTypes.ExperimentDetails) error {
+func CheckVirtualDiskWithInstance(subscriptionID, virtualDiskNames, resourceGroup string) error {
 
 	// Setup and authorize disk client
-	diskClient := compute.NewDisksClient(experimentsDetails.SubscriptionID)
+	diskClient := compute.NewDisksClient(subscriptionID)
 	authorizer, err := auth.NewAuthorizerFromFile(azure.PublicCloud.ResourceManagerEndpoint)
 
 	if err != nil {
@@ -92,10 +91,10 @@ func CheckVirtualDiskWithInstance(experimentsDetails experimentTypes.ExperimentD
 	diskClient.Authorizer = authorizer
 
 	// Creating an array of the name of the attached disks
-	diskNameList := strings.Split(experimentsDetails.VirtualDiskNames, ",")
+	diskNameList := strings.Split(virtualDiskNames, ",")
 
 	for _, diskName := range diskNameList {
-		disk, err := diskClient.Get(context.Background(), experimentsDetails.ResourceGroup, diskName)
+		disk, err := diskClient.Get(context.Background(), resourceGroup, diskName)
 		if err != nil {
 			return errors.Errorf("failed to get disk: %v, err: %v", diskName, err)
 		}