ADD: many changes; copied from test_cloudnetworks

Change-Id: I5120f471c37d8a8e5abcdbb7190f7772013056bc