Consolidate OVS_EXTRA for the vlan test.

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