I don't think we need to add 'net_id', 'v4_fixed_ip', and 'port_id' to vanilla_options do we?

The block you have below should handle these fine.