Merge "Complete caching images for vnf testcases"