Merge "Creating individual resources for vpnaas test case"