Revert "Fix scenario test fails when port_vnic_type is set"

This reverts commit 0a03b7a37a20c206932206eea8602d9f4b009ae9.

It looks we broke a working CI which tests SRIOV. Revert this and then
figure what happened. Note: in the future it would be great to have
these external CI publish their results.

Change-Id: I52f7ae49ccd08ce6badb45f201d83c6af172bafe
2 files changed