Merge "Move logging instance creation to create_instance"

diff --combined test/functest/testcase_2.py
index 89ba009,d1f7001..e8b8048
--- 1/test/functest/testcase_2.py
--- 2/test/functest/testcase_2.py
+++ b/test/functest/testcase_2.py
@@@ -57,33 -57,23 +57,33 @@@ def main()
                                              disk=COMMON_CONFIG.image_format,
                                              container="bare",
                                              public=True)
 -    network_1_id, _, _ = test_utils.create_network(
 +    network_1_id = test_utils.create_net(
 +        neutron_client,
 +        TESTCASE_CONFIG.net_1_name)
 +    test_utils.create_subnet(
          neutron_client,
 -        TESTCASE_CONFIG.net_1_name,
          TESTCASE_CONFIG.subnet_1a_name,
          TESTCASE_CONFIG.subnet_1a_cidr,
 -        TESTCASE_CONFIG.router_1_name,
 +        network_1_id)
 +    test_utils.create_subnet(
 +        neutron_client,
          TESTCASE_CONFIG.subnet_1b_name,
 -        TESTCASE_CONFIG.subnet_1b_cidr)
 +        TESTCASE_CONFIG.subnet_1b_cidr,
 +        network_1_id)
  
 -    network_2_id, _, _ = test_utils.create_network(
 +    network_2_id = test_utils.create_net(
 +        neutron_client,
 +        TESTCASE_CONFIG.net_2_name)
 +    test_utils.create_subnet(
          neutron_client,
 -        TESTCASE_CONFIG.net_2_name,
          TESTCASE_CONFIG.subnet_2a_name,
          TESTCASE_CONFIG.subnet_2a_cidr,
 -        TESTCASE_CONFIG.router_2_name,
 +        network_2_id)
 +    test_utils.create_subnet(
 +        neutron_client,
          TESTCASE_CONFIG.subnet_2b_name,
 -        TESTCASE_CONFIG.subnet_2b_cidr)
 +        TESTCASE_CONFIG.subnet_2b_cidr,
 +        network_2_id)
  
      sg_id = os_utils.create_security_group_full(neutron_client,
                                                  TESTCASE_CONFIG.secgroup_name,
@@@ -107,8 -97,6 +107,6 @@@
          compute_node=av_zone_1,
          userdata=userdata_common)
      vm_2_ip = vm_2.networks.itervalues().next()[0]
-     logger.debug("Instance '%s' booted successfully. IP='%s'." %
-                  (TESTCASE_CONFIG.instance_2_name, vm_2_ip))
  
      vm_3 = test_utils.create_instance(
          nova_client,
@@@ -121,8 -109,6 +119,6 @@@
          compute_node=av_zone_2,
          userdata=userdata_common)
      vm_3_ip = vm_3.networks.itervalues().next()[0]
-     logger.debug("Instance '%s' booted successfully. IP='%s'." %
-                  (TESTCASE_CONFIG.instance_3_name, vm_3_ip))
  
      vm_5 = test_utils.create_instance(
          nova_client,
@@@ -135,8 -121,6 +131,6 @@@
          compute_node=av_zone_2,
          userdata=userdata_common)
      vm_5_ip = vm_5.networks.itervalues().next()[0]
-     logger.debug("Instance '%s' booted successfully. IP='%s'." %
-                  (TESTCASE_CONFIG.instance_5_name, vm_5_ip))
  
      # We boot vm5 first because we need vm5_ip for vm4 userdata
      u4 = test_utils.generate_userdata_with_ssh(
@@@ -155,8 -139,6 +149,6 @@@
          userdata=u4,
          files=files)
      vm_4_ip = vm_4.networks.itervalues().next()[0]
-     logger.debug("Instance '%s' booted successfully. IP='%s'." %
-                  (TESTCASE_CONFIG.instance_4_name, vm_4_ip))
  
      # We boot VM1 at the end because we need to get the IPs first to generate
      # the userdata
@@@ -177,8 -159,6 +169,6 @@@
          userdata=u1,
          files=files)
      vm_1_ip = vm_1.networks.itervalues().next()[0]
-     logger.debug("Instance '%s' booted successfully. IP='%s'." %
-                  (TESTCASE_CONFIG.instance_1_name, vm_1_ip))
  
      msg = ("Create VPN1 with eRT=iRT")
      logger.info(msg)
@@@ -187,7 -167,6 +177,7 @@@
      kwargs = {"import_targets": TESTCASE_CONFIG.targets2,
                "export_targets": TESTCASE_CONFIG.targets2,
                "route_targets": TESTCASE_CONFIG.targets2,
 +              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers1,
                "name": vpn1_name}
      bgpvpn1 = os_utils.create_bgpvpn(neutron_client, **kwargs)
      bgpvpn1_id = bgpvpn1['bgpvpn']['id']
@@@ -235,7 -214,6 +225,7 @@@
      kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
                "export_targets": TESTCASE_CONFIG.targets1,
                "route_targets": TESTCASE_CONFIG.targets1,
 +              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers2,
                "name": vpn2_name}
      bgpvpn2 = os_utils.create_bgpvpn(neutron_client, **kwargs)
      bgpvpn2_id = bgpvpn2['bgpvpn']['id']