From 03e70494128d6603ad468b1cc292cfaf18714852 Mon Sep 17 00:00:00 2001
From: Shital Savekar <iamshital@users.noreply.github.com>
Date: Tue, 29 May 2018 13:12:00 -0700
Subject: [PATCH] Re-arranged tests

---
 XML/TestCases/BVT.xml                         | 158 +-----------------
 ...{FunctionalTests.xml => FunctionalGPU.xml} |   8 +-
 XML/TestCases/FunctionalWALA.xml              | 107 ++++++++++++
 3 files changed, 112 insertions(+), 161 deletions(-)
 rename XML/TestCases/{FunctionalTests.xml => FunctionalGPU.xml} (95%)
 create mode 100644 XML/TestCases/FunctionalWALA.xml

diff --git a/XML/TestCases/BVT.xml b/XML/TestCases/BVT.xml
index 3acda0fb2..df2b04814 100644
--- a/XML/TestCases/BVT.xml
+++ b/XML/TestCases/BVT.xml
@@ -13,21 +13,6 @@
 		<Area>BVT</Area>
 		<Tags>bvt,boot</Tags>
         <TestID>AzureBVT_001</TestID>
-    </test>
-	<test>
-        <testName>BVT-VERIFY-HOSTNAME</testName>
-        <testScript>BVT-VERIFY-HOSTNAME.py</testScript>
-        <PowershellScript>BVT-VERIFY-HOSTNAME.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\nslookup.py,.\Testscripts\Linux\BVT-VERIFY-HOSTNAME.py,.\Testscripts\Linux\azuremodules.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_002</TestID>
     </test>
     <test>
         <testName>BVT-IS-ROOT-PASSWORD-DELETED</testName>
@@ -44,36 +29,6 @@
         <Tags>bvt</Tags>
         <TestID>AzureBVT_003</TestID>
     </test>
-    <test>
-        <testName>BVT-WA-PROC-CHECK</testName>
-        <testScript>BVT-WA-PROC-CHECK.py</testScript>
-        <PowershellScript>BVT-WA-PROC-CHECK.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\BVT-WA-PROC-CHECK.py,.\Testscripts\Linux\azuremodules.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_004</TestID>
-    </test>
-    <test>
-        <testName>BVT-WA-VER-CHECK</testName>
-        <testScript>BVT-WA-VER-CHECK.py</testScript>
-        <PowershellScript>BVT-WA-VER-CHECK.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\BVT-WA-VER-CHECK.py,.\Testscripts\Linux\azuremodules.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_005</TestID>
-    </test>
     <test>
         <testName>BVT-ROOT-DEVICE-TIMEOUT-CHECK</testName>
         <testScript>BVT-ROOT-DEVICE-TIMEOUT-CHECK.py</testScript>
@@ -104,21 +59,6 @@
         <Tags>bvt</Tags>
         <TestID>AzureBVT_007</TestID>
     </test>
-    <test>
-        <testName>BVT-RESOURCE-DISK-FILESYSTEM</testName>
-        <testScript>BVT-RESOURCE-DISK-FILESYSTEM.py</testScript>
-        <PowershellScript>BVT-RESOURCE-DISK-FILESYSTEM.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\BVT-RESOURCE-DISK-FILESYSTEM.py,.\Testscripts\Linux\azuremodules.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_008</TestID>
-    </test>
     <test>
         <testName>BVT-SWAP-CHECK</testName>
         <testScript>BVT-SWAP-CHECK.py</testScript>
@@ -179,21 +119,7 @@
         <Tags>bvt</Tags>
         <TestID>AzureBVT_012</TestID>
     </test>
-    <test>
-        <testName>BVT-VERIFY-FIREWALL-STATUS</testName>
-        <testScript>BVT-VERIFY-FIREWALL-STATUS.py</testScript>
-        <PowershellScript>BVT-VERIFY-FIREWALL-STATUS.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\azuremodules.py,.\Testscripts\Linux\BVT-VERIFY-FIREWALL-STATUS.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_013</TestID>
-    </test>
+
     <test>
         <testName>BVT-VERIFY-BOOT-ERROR-WARNINGS</testName>
         <testScript>BVT-VERIFY-BOOT-ERROR-WARNINGS.py</testScript>
@@ -224,36 +150,6 @@
         <Tags>bvt</Tags>
         <TestID>AzureBVT_015</TestID>
     </test>
-    <test>
-        <testName>BVT-VERIFY-RESTART</testName>
-        <testScript></testScript>
-        <PowershellScript>BVT-VERIFY-RESTART.ps1</PowershellScript>
-        <files></files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_016</TestID>
-    </test>
-    <test>
-        <testName>BVT-VERIFY-MNT-RESOURCE-WRITABLE</testName>
-        <testScript>BVT-VERIFY-MNT-RESOURCE-WRITABLE.py</testScript>
-        <PowershellScript>BVT-VERIFY-MNT-RESOURCE-WRITABLE.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\BVT-VERIFY-MNT-RESOURCE-WRITABLE.py,.\Testscripts\Linux\azuremodules.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_017</TestID>
-    </test>
     <test>
         <testName>BVT-VERIFY-UUID-FSTAB</testName>
         <testScript>BVT-VERIFY-UUID-FSTAB.py</testScript>
@@ -314,21 +210,6 @@
         <Tags>bvt</Tags>
         <TestID>AzureBVT_021</TestID>
     </test>
-    <test>
-        <testName>BVT-VERIFY-MNT-RESOURCE-README</testName>
-        <testScript>BVT-VERIFY-MNT-RESOURCE-README.py</testScript>
-        <PowershellScript>BVT-VERIFY-MNT-RESOURCE-README.ps1</PowershellScript>
-        <files>.\Testscripts\Linux\BVT-VERIFY-MNT-RESOURCE-README.py,.\Testscripts\Linux\azuremodules.py</files>
-        <setupType>BVTDeployment</setupType>
-        <TestType></TestType>
-        <TestFeature></TestFeature>
-        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-       <Tags>bvt</Tags>
-        <TestID>AzureBVT_022</TestID>
-    </test>
     <test>
         <testName>BVT-VERIFY-NO-ERROR-IN-LOGS</testName>
         <testScript>BVT-VERIFY-NO-ERROR-IN-LOGS.py</testScript>
@@ -391,40 +272,6 @@
         <Tags>bvt</Tags>
         <TestID>AzureBVT_026</TestID>
     </test>
-    <test>
-        <testName>BVT-CAPTURE-VHD</testName>
-        <testScript></testScript>
-        <PowershellScript>BVT-CAPTURE-VHD.ps1</PowershellScript>
-        <files></files>
-        <setupType>BVTDeployment</setupType>
-        <TestType>
-        </TestType>
-        <TestFeature>
-        </TestFeature>
-        <SupportedExecutionModes>AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-        <TestID>AzureBVT_027</TestID>
-    </test>
-    <test>
-	    <testName>BVT-DELETE-VHD</testName>
-	    <testScript></testScript>
-	    <PowershellScript>BVT-CAPTURE-VHD.ps1</PowershellScript>
-	    <files></files>
-	    <setupType>BVTDeployment</setupType>
-	    <TestType>
-	    </TestType>
-	    <TestFeature>
-	    </TestFeature>
-	    <SupportedExecutionModes>AzureResourceManager</SupportedExecutionModes>
-        <Platform>Azure</Platform>
-        <Category>BVT</Category>
-        <Area>BVT</Area>
-        <Tags>bvt</Tags>
-	    <TestID>AzureBVT_028</TestID>
-    </test>
     <test>
         <testName>BVT-VERIFY-KVP-DAEMON-STATUS</testName>
         <testScript></testScript>
@@ -449,7 +296,6 @@
         <SubtestValues></SubtestValues>
         <files>.\Testscripts\Linux\azuremodules.sh</files>
         <TestParameters>
-            <param></param>
         </TestParameters>
         <Platform>Azure</Platform>
         <Category>BVT</Category>
@@ -466,7 +312,6 @@
         <SubtestValues></SubtestValues>
         <files>.\Testscripts\Linux\azuremodules.sh</files>
         <TestParameters>
-            <param></param>
         </TestParameters>
         <Platform>Azure</Platform>
         <Category>BVT</Category>
@@ -483,7 +328,6 @@
         <SubtestValues></SubtestValues>
         <files>.\Testscripts\Linux\azuremodules.sh</files>
         <TestParameters>
-            <param></param>
         </TestParameters>
         <Platform>Azure</Platform>
         <Category>BVT</Category>
diff --git a/XML/TestCases/FunctionalTests.xml b/XML/TestCases/FunctionalGPU.xml
similarity index 95%
rename from XML/TestCases/FunctionalTests.xml
rename to XML/TestCases/FunctionalGPU.xml
index 885f19d7e..d318b1780 100644
--- a/XML/TestCases/FunctionalTests.xml
+++ b/XML/TestCases/FunctionalGPU.xml
@@ -8,7 +8,7 @@
 		<files>.\Testscripts\Linux\azuremodules.sh,.\Testscripts\Linux\InstallCUDADrivers.sh</files>
 		<Platform>Azure</Platform>
 		<Category>Functional</Category>
-		<Area>default</Area>
+		<Area>GPU</Area>
 		<Tags>gpu,pci_hyperv</Tags>
 		<TestID>Functional_GPU_001</TestID>
 	</test>
@@ -21,7 +21,7 @@
 		<files>.\Testscripts\Linux\azuremodules.sh,.\Testscripts\Linux\InstallCUDADrivers.sh</files>
 		<Platform>Azure</Platform>
 		<Category>Functional</Category>
-		<Area>default</Area>
+		<Area>GPU</Area>
 		<Tags>gpu,pci_hyperv</Tags>
 		<TestID>Functional_GPU_002</TestID>
 	</test>
@@ -34,7 +34,7 @@
 		<files>.\Testscripts\Linux\azuremodules.sh,.\Testscripts\Linux\InstallCUDADrivers.sh</files>
 		<Platform>Azure</Platform>
 		<Category>Functional</Category>
-		<Area>default</Area>
+		<Area>GPU</Area>
 		<Tags>gpu,pci_hyperv</Tags>
 		<TestID>Functional_GPU_003</TestID>
 	</test>
@@ -47,7 +47,7 @@
 		<files>.\Testscripts\Linux\azuremodules.sh,.\Testscripts\Linux\InstallCUDADrivers.sh</files>
 		<Platform>Azure</Platform>
 		<Category>Functional</Category>
-		<Area>default</Area>
+		<Area>GPU</Area>
 		<Tags>gpu,pci_hyperv</Tags>
 		<TestID>Functional_GPU_004</TestID>
 	</test>			
diff --git a/XML/TestCases/FunctionalWALA.xml b/XML/TestCases/FunctionalWALA.xml
new file mode 100644
index 000000000..7e4e66f54
--- /dev/null
+++ b/XML/TestCases/FunctionalWALA.xml
@@ -0,0 +1,107 @@
+<TestCases>
+	<test>
+        <testName>WALA-VERIFY-HOSTNAME</testName>
+        <testScript>WALA-VERIFY-HOSTNAME.py</testScript>
+        <PowershellScript>WALA-VERIFY-HOSTNAME.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\nslookup.py,.\Testscripts\Linux\WALA-VERIFY-HOSTNAME.py,.\Testscripts\Linux\azuremodules.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_002</TestID>
+    </test>
+    <test>
+        <testName>WALA-PROCESS-CHECK</testName>
+        <testScript>WALA-WA-PROC-CHECK.py</testScript>
+        <PowershellScript>WALA-WA-PROC-CHECK.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\WALA-WA-PROC-CHECK.py,.\Testscripts\Linux\azuremodules.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_004</TestID>
+    </test>
+    <test>
+        <testName>WALA-VERSION-CHECK</testName>
+        <testScript>WALA-WA-VER-CHECK.py</testScript>
+        <PowershellScript>WALA-WA-VER-CHECK.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\WALA-WA-VER-CHECK.py,.\Testscripts\Linux\azuremodules.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_005</TestID>
+    </test>
+    <test>
+        <testName>WALA-RESOURCE-DISK-FILESYSTEM-CHECK</testName>
+        <testScript>WALA-RESOURCE-DISK-FILESYSTEM.py</testScript>
+        <PowershellScript>WALA-RESOURCE-DISK-FILESYSTEM.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\WALA-RESOURCE-DISK-FILESYSTEM.py,.\Testscripts\Linux\azuremodules.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_008</TestID>
+    </test>
+    <test>
+        <testName>WALA-VERIFY-MNT-RESOURCE-WRITABLE</testName>
+        <testScript>WALA-VERIFY-MNT-RESOURCE-WRITABLE.py</testScript>
+        <PowershellScript>WALA-VERIFY-MNT-RESOURCE-WRITABLE.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\WALA-VERIFY-MNT-RESOURCE-WRITABLE.py,.\Testscripts\Linux\azuremodules.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_017</TestID>
+    </test>
+    <test>
+        <testName>WALA-VERIFY-MNT-RESOURCE-README</testName>
+        <testScript>WALA-VERIFY-MNT-RESOURCE-README.py</testScript>
+        <PowershellScript>WALA-VERIFY-MNT-RESOURCE-README.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\WALA-VERIFY-MNT-RESOURCE-README.py,.\Testscripts\Linux\azuremodules.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_022</TestID>
+    </test>
+    <test>
+        <testName>WALA-VERIFY-FIREWALL-STATUS</testName>
+        <testScript>WALA-VERIFY-FIREWALL-STATUS.py</testScript>
+        <PowershellScript>WALA-VERIFY-FIREWALL-STATUS.ps1</PowershellScript>
+        <files>.\Testscripts\Linux\azuremodules.py,.\Testscripts\Linux\WALA-VERIFY-FIREWALL-STATUS.py</files>
+        <setupType>BVTDeployment</setupType>
+        <TestType></TestType>
+        <TestFeature></TestFeature>
+        <SupportedExecutionModes>AzureServiceManagement,AzureResourceManager</SupportedExecutionModes>
+        <Platform>Azure</Platform>
+        <Category>Functional</Category>
+        <Area>WALA</Area>
+        <Tags>wala</Tags>
+        <TestID>AzureWALA_013</TestID>
+    </test>            
+</TestCases>
\ No newline at end of file