Consolidate OVS_EXTRA for the vlan test.
Consolidate OVS_EXTRA for the vlan test.

Consolidates the test data into a single string block for the
ovs vlan port test string.

rdo-management/os-disk-config,fredericlepied/os-net-config,dprince/os-net-config,agroup/os-disk-config,openstack/os-net-config