Restore scenario ipv6 framework, forgotten _ip_version

Change-Id: I980be80b0b55e0e2ae87756414e48f1406fa6a14