E2E Tests: Fix azure templating name. (openshift#573)

* Fixing Azure to run locally

* Aligning json

Author: deepakraj1997

tests/e2e/e2e_suite_test.go

@@ -104,6 +104,7 @@ var _ = BeforeSuite(func() {
 			// ci cloud
 			ciJsonData, err := utils.GetJsonData(ci_cred_file)
 			Expect(err).NotTo(HaveOccurred())
+
 			if _, ok := ciJsonData["resourceGroup"]; !ok {
 				resourceGroup, err := GetAzureResource(azure_resource_file)
 				Expect(err).NotTo(HaveOccurred())
@@ -116,6 +117,23 @@ var _ = BeforeSuite(func() {
 			err = utils.WriteFile(dpaCR.Credentials, ciCreds)
 			Expect(err).NotTo(HaveOccurred())
 		}
+	} else {
+		if dpaCR.Provider == "azure" {
+			cloudCredData, err := utils.GetJsonData(dpaCR.Credentials) // azure credentials need to be in json - can be changed
+			Expect(err).NotTo(HaveOccurred())
+			dpaCR.DpaAzureConfig = DpaAzureConfig{
+				BslSubscriptionId:          fmt.Sprintf("%v", cloudCredData["subscriptionId"]),
+				BslResourceGroup:           fmt.Sprintf("%v", cloudCredData["resourceGroup"]),
+				BslStorageAccount:          fmt.Sprintf("%v", cloudCredData["storageAccount"]),
+				BslStorageAccountKeyEnvVar: "AZURE_STORAGE_ACCOUNT_ACCESS_KEY",
+				VslSubscriptionId:          fmt.Sprintf("%v", cloudCredData["subscriptionId"]),
+				VslResourceGroup:           fmt.Sprintf("%v", cloudCredData["resourceGroup"]),
+			}
+			ciCreds := GetAzureCreds(cloudCredData)
+			dpaCR.Credentials = "/tmp/azure-credentials"
+			err = utils.WriteFile(dpaCR.Credentials, ciCreds)
+			Expect(err).NotTo(HaveOccurred())
+		}
 	}
 	credData, err := utils.ReadFile(dpaCR.Credentials)
 	Expect(err).NotTo(HaveOccurred())

tests/e2e/scripts/azure_setting.sh renamed to tests/e2e/scripts/azure_settings.sh

@@ -18,7 +18,7 @@ cat > $TMP_DIR/oadpcreds <<EOF
               "subscriptionId": "",
               "storageAccount": "",
               "resourceGroup": "",
-              "storageAccountKeyEnvVar": "",
+              "storageAccountKeyEnvVar": ""
             },
             
             "objectStorage":{
@@ -37,7 +37,7 @@ cat > $TMP_DIR/oadpcreds <<EOF
            "provider": "$PROVIDER",
            "config": { 
               "subscriptionId": "",
-						  "resourceGroup": "",
+              "resourceGroup": ""
            }
          }
        }