Update test_vnf to support R4+