Rebased adminstateup

skipped test networks as a bug
I think it is possible to just return test_server dict, get the routers directly with "_get_tenant_routers" function and ignore networks, even though networks can be gutted from servers in any case. So we can avoid returning 3 items.