OpenFlow cluster test rework