Merge "Skip fip_qos test is there is no L3 agent with extension enabled"