Re: [PATCH v3 1/4] regression-tests: Replace deprecated methods in phase1 baremetal tests

[Jan Tluka]

Mon, Oct 26, 2015 at 02:00:32PM CET, jprochaz(a)redhat.com wrote:
> This commit replaces InterfaceAPI methods get_ip() and get_devname()
> with
> HostAPI methods which are supported and recommended.
>
> Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
> ---
>  recipes/regression_tests/phase1/3_vlans.py         | 40 ++++++++++---------
>  .../regression_tests/phase1/3_vlans_over_bond.py   | 46 ++++++++++++----------
>  recipes/regression_tests/phase1/bonding_test.py    | 36 ++++++++---------
>  recipes/regression_tests/phase1/simple_ping.py     | 11 ++++--
>  4 files changed, 71 insertions(+), 62 deletions(-)
>
> diff --git a/recipes/regression_tests/phase1/3_vlans.py
> b/recipes/regression_tests/phase1/3_vlans.py
> index 2007dc4..68974e7 100644
> --- a/recipes/regression_tests/phase1/3_vlans.py
> +++ b/recipes/regression_tests/phase1/3_vlans.py
> @@ -99,37 +99,40 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
>                                    })
>  
>  for vlan1 in vlans:
> +    m1_vlan1 = m1.get_interface(vlan1)
>      for vlan2 in vlans:
> -        ping_mod.update_options({"addr": m2.get_ip(vlan2, 0),
> -                                 "iface": m1.get_devname(vlan1)})
> +        m2_vlan2 = m2.get_interface(vlan2)
>  
> -        ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1),
> -                                  "iface": m1.get_ip(vlan1, 1)})
> +        ping_mod.update_options({"addr": m2_vlan2.get_ip(0),
> +                                 "iface": m1_vlan1.get_devname()})
>  
> -        netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)})
> +        ping_mod6.update_options({"addr": m2_vlan2.get_ip(1),
> +                                  "iface": m1_vlan1.get_ip(1)})
>  
> -        netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
> +        netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
>  
> -        netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
> -                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2.get_ip(vlan1, 0))})
> +        netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
>  
> -        netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
> -                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2.get_ip(vlan1, 0))})
> +        netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0),
> +                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2_vlan2.get_ip(0))})
>  
> -        netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1,
> 1),
> -                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
> +        netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0),
> +                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2_vlan2.get_ip(0))})
>  
> -        netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1,
> 1),
> -                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
> +        netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1),
> +                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
> +
> +        netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1),
> +                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
>  
>          if vlan1 == vlan2:
>              # These tests should pass
>              # Ping between same VLANs
>              for setting in offload_settings:
>                  for offload in setting:
> -                    m1.run("ethtool -K %s %s %s" %
> (m1.get_devname("eth1"),
> +                    m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(),
>                                                      offload[0], offload[1]))
> -                    m2.run("ethtool -K %s %s %s" %
> (m2.get_devname("eth1"),
> +                    m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(),
>                                                      offload[0], offload[1]))
>  
>                  if ipv in [ 'ipv4', 'both' ]:
> @@ -234,7 +237,6 @@ for vlan1 in vlans:
>                      perf_api.save_result(result_udp)
>  
>                      srv_proc.intr()
> -
>          # These tests should fail
>          # Ping across different VLAN
>          else:
> @@ -246,7 +248,7 @@ for vlan1 in vlans:
>  
>  #reset offload states
>  for offload in offloads:
> -    m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"),
> +    m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(),
>                                      offload, "on"))
> -    m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"),
> +    m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(),
>                                      offload, "on"))
> diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
> b/recipes/regression_tests/phase1/3_vlans_over_bond.py
> index 79c4b4d..d382036 100644
> --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
> +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
> @@ -39,6 +39,8 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
>  
>  m1_bond = m1.get_interface("test_bond")
>  m1_bond.set_mtu(mtu)
> +m1_phy1 = m1.get_interface("eth1")
> +m1_phy2 = m1.get_interface("eth2")
>  m2_phy1 = m2.get_interface("eth1")
>  m2_phy1.set_mtu(mtu)
>  
> @@ -99,28 +101,31 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
>                                    })
>  
>  for vlan1 in vlans:
> +    m1_vlan1 = m1.get_interface(vlan1)
>      for vlan2 in vlans:
> -        ping_mod.update_options({"addr": m2.get_ip(vlan2, 0),
> -                                 "iface": m1.get_devname(vlan1)})
> +        m2_vlan2 = m2.get_interface(vlan2)
>  
> -        ping_mod6.update_options({"addr": m2.get_ip(vlan2, 1),
> -                                  "iface": m1.get_ip(vlan1, 1)})
> +        ping_mod.update_options({"addr": m2_vlan2.get_ip(0),
> +                                 "iface": m1_vlan1.get_devname()})
>  
> -        netperf_srv.update_options({"bind": m1.get_ip(vlan1, 0)})
> +        ping_mod6.update_options({"addr": m2_vlan2.get_ip(1),
> +                                  "iface": m1_vlan1.get_ip(1)})
>  
> -        netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
> +        netperf_srv.update_options({"bind": m1_vlan1.get_ip(0)})
>  
> -        netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
> -                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2.get_ip(vlan1, 0))})
> +        netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
>  
> -        netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
> -                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2.get_ip(vlan1, 0))})
> +        netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0),
> +                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2_vlan2.get_ip(0))})
>  
> -        netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1,
> 1),
> -                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
> +        netperf_cli_udp.update_options({"netperf_server": m1_vlan1.get_ip(0),
> +                                        "netperf_opts": "-i %s -L %s"
> % (nperf_max_runs, m2_vlan2.get_ip(0))})
>  
> -        netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1,
> 1),
> -                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
> +        netperf_cli_tcp6.update_options({"netperf_server": m1_vlan1.get_ip(1),
> +                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
> +
> +        netperf_cli_udp6.update_options({"netperf_server": m1_vlan1.get_ip(1),
> +                                         "netperf_opts": "-i %s -L %s
> -6" % (nperf_max_runs, m2_vlan2.get_ip(1))})
>  
>          if vlan1 == vlan2:
>              # These tests should pass
> @@ -128,11 +133,11 @@ for vlan1 in vlans:
>              for setting in offload_settings:
>                  #apply offload setting
>                  for offload in setting:
> -                    m1.run("ethtool -K %s %s %s" %
> (m1.get_devname("eth1"),
> +                    m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(),
>                                                      offload[0], offload[1]))
> -                    m1.run("ethtool -K %s %s %s" %
> (m1.get_devname("eth2"),
> +                    m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(),
>                                                      offload[0], offload[1]))
> -                    m2.run("ethtool -K %s %s %s" %
> (m2.get_devname("eth1"),
> +                    m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(),
>                                                      offload[0], offload[1]))
>  
>                  if ipv in [ 'ipv4', 'both' ]:
> @@ -238,7 +243,6 @@ for vlan1 in vlans:
>                      perf_api.save_result(result_udp)
>  
>                      srv_proc.intr()
> -
>          # These tests should fail
>          # Ping across different VLAN
>          else:
> @@ -250,9 +254,9 @@ for vlan1 in vlans:
>  
>  #reset offload states
>  for offload in offloads:
> -    m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"),
> +    m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(),
>          offload, "on"))
> -    m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"),
> +    m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(),
>          offload, "on"))
> -    m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"),
> +    m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(),
>          offload, "on"))
> diff --git a/recipes/regression_tests/phase1/bonding_test.py
> b/recipes/regression_tests/phase1/bonding_test.py
> index 18659d1..079a8fe 100644
> --- a/recipes/regression_tests/phase1/bonding_test.py
> +++ b/recipes/regression_tests/phase1/bonding_test.py
> @@ -44,83 +44,83 @@ test_if2.set_mtu(mtu)
>  
>  ping_mod = ctl.get_module("IcmpPing",
>                             options={
> -                               "addr" : m2.get_ip("test_if", 0),
> +                               "addr" : test_if2.get_ip(0),
>                                 "count" : 100,
> -                               "iface" : m1.get_devname("test_if"),
> +                               "iface" : test_if1.get_devname(),
>                                 "interval" : 0.1
>                             })
>  
>  ping_mod6 = ctl.get_module("Icmp6Ping",
>                             options={
> -                               "addr" : m2.get_ip("test_if", 1),
> +                               "addr" : test_if2.get_ip(1),
>                                 "count" : 100,
> -                               "iface" : m1.get_devname("test_if"),
> +                               "iface" : test_if1.get_devname(),
>                                 "interval" : 0.1
>                             })
>  
>  netperf_srv = ctl.get_module("Netperf",
>                                options = {
>                                    "role" : "server",
> -                                  "bind" : m1.get_ip("test_if", 0)
> +                                  "bind" : test_if1.get_ip(0)
>                                })
>  
>  netperf_srv6 = ctl.get_module("Netperf",
>                                options={
>                                    "role" : "server",
> -                                  "bind" : m1.get_ip("test_if", 1),
> +                                  "bind" : test_if1.get_ip(1),
>                                    "netperf_opts" : " -6",
>                                })
>  
>  netperf_cli_tcp = ctl.get_module("Netperf",
>                                    options = {
>                                        "role" : "client",
> -                                      "netperf_server" :
> m1.get_ip("test_if", 0),
> +                                      "netperf_server" : test_if1.get_ip(0),
>                                        "duration" : netperf_duration,
>                                        "testname" : "TCP_STREAM",
>                                        "confidence" : nperf_confidence,
> -                                      "netperf_opts" : "-i %s -L %s"
> % (nperf_max_runs, m2.get_ip("test_if", 0))
> +                                      "netperf_opts" : "-i %s -L %s"
> % (nperf_max_runs, test_if2.get_ip(0))
>                                  })
>  
>  netperf_cli_udp = ctl.get_module("Netperf",
>                                    options = {
>                                        "role" : "client",
> -                                      "netperf_server" :
> m1.get_ip("test_if", 0),
> +                                      "netperf_server" : test_if1.get_ip(0),
>                                        "duration" : netperf_duration,
>                                        "testname" : "UDP_STREAM",
>                                        "confidence" : nperf_confidence,
> -                                      "netperf_opts" : "-i %s -L %s"
> % (nperf_max_runs, m2.get_ip("test_if", 0))
> +                                      "netperf_opts" : "-i %s -L %s"
> % (nperf_max_runs, test_if2.get_ip(0))
>                                    })
>  
>  netperf_cli_tcp6 = ctl.get_module("Netperf",
>                                    options={
>                                        "role" : "client",
>                                        "netperf_server" :
> -                                          m1.get_ip("test_if", 1),
> +                                          test_if1.get_ip(1),
>                                        "duration" : netperf_duration,
>                                        "testname" : "TCP_STREAM",
>                                        "confidence" : nperf_confidence,
>                                        "netperf_opts" :
> -                                          "-i %s -L %s -6" % (nperf_max_runs,
> m2.get_ip("test_if", 1))
> +                                          "-i %s -L %s -6" % (nperf_max_runs,
> test_if2.get_ip(1))
>                                    })
>  netperf_cli_udp6 = ctl.get_module("Netperf",
>                                    options={
>                                        "role" : "client",
>                                        "netperf_server" :
> -                                          m1.get_ip("test_if", 1),
> +                                          test_if1.get_ip(1),
>                                        "duration" : netperf_duration,
>                                        "testname" : "UDP_STREAM",
>                                        "confidence" : nperf_confidence,
>                                        "netperf_opts" :
> -                                          "-i %s -L %s -6" % (nperf_max_runs,
> m2.get_ip("test_if", 1))
> +                                          "-i %s -L %s -6" % (nperf_max_runs,
> test_if2.get_ip(1))
>                                    })
>  
>  ctl.wait(15)
>  
>  for setting in offload_settings:
>      for offload in setting:
> -        m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"),
> +        m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(),
>                                          offload[0], offload[1]))
> -        m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"),
> +        m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(),
>                                          offload[0], offload[1]))
>  
>      if ipv in [ 'ipv4', 'both' ]:
> @@ -217,7 +217,7 @@ for setting in offload_settings:
>  
>  #reset offload states
>  for offload in offloads:
> -    m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"),
> +    m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(),
>                                      offload, "on"))
> -    m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"),
> +    m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(),
>                                      offload, "on"))
> diff --git a/recipes/regression_tests/phase1/simple_ping.py
> b/recipes/regression_tests/phase1/simple_ping.py
> index f9e5837..3591402 100644
> --- a/recipes/regression_tests/phase1/simple_ping.py
> +++ b/recipes/regression_tests/phase1/simple_ping.py
> @@ -6,20 +6,23 @@ hostB = ctl.get_host("machine2")
>  hostA.sync_resources(modules=["Icmp6Ping", "IcmpPing"])
>  hostB.sync_resources(modules=["Icmp6Ping", "IcmpPing"])
>  
> +hostA_testiface = hostA.get_interface("testiface")
> +hostB_testiface = hostB.get_interface("testiface")
> +
>  ping_mod = ctl.get_module("IcmpPing",
>                             options={
> -                              "addr": hostB.get_ip("testiface", 0),
> +                              "addr": hostB_testiface.get_ip(0),
>                                "count": 100,
>                                "interval": 0.2,
> -                              "iface" :
> hostA.get_devname("testiface"),
> +                              "iface" : hostA_testiface.get_devname(),
>                                "limit_rate": 90})
>  
>  ping_mod6 = ctl.get_module("Icmp6Ping",
>                             options={
> -                              "addr": hostB.get_ip("testiface", 1),
> +                              "addr": hostB_testiface.get_ip(1),
>                                "count": 100,
>                                "interval": 0.2,
> -                              "iface" : hostA.get_ip("testiface",
> 1),
> +                              "iface" : hostA_testiface.get_ip(1),
>                                "limit_rate": 90})
>  
>  ctl.wait(15)
> -- 
> 2.4.3
>
> _______________________________________________
> LNST-developers mailing list
> LNST-developers(a)lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers 
Ack to series

Acked-by: Jan Tluka <jtluka(a)redhat.com&gt;