Use base.delete_server in addCleanup

The multi lines of addCleanup of server can be replaced by one calling
to addCleanup(base.delete_server)

Change-Id: I15d179b7131ada87c5a8841459adb81ddc7f56ab
3 files changed