upgrade test: consolidate resolver test cases (#16443)#16457

huikang merged 1 commit intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

backport/upgrade-test-refactor-L7-traffichashicorp/consul:backport/upgrade-test-refactor-L7-trafficCopy head branch name to clipboard