Refactoring VnfApiProvider part 1