Revert "Refactor mechanism driver metadata"

This reverts commit 79ffa26858d682f404984175dc1ab93863a149ad.

Fixes PROD-14994

Change-Id: I8dc05999dd072b3249831a7ef01d07831e46db0f
diff --git a/tests/pillar/compute_dvr_fwaas_v1.sls b/tests/pillar/compute_dvr_fwaas_v1.sls
index f483775..a4b86d2 100644
--- a/tests/pillar/compute_dvr_fwaas_v1.sls
+++ b/tests/pillar/compute_dvr_fwaas_v1.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        - openvswitch
-        - l2population
+        ovs:
+          driver: openvswitch
     dvr: true
     enabled: true
     external_access: true