Revision 86a4a625

b/qa/qa_network.py
26 26
import qa_config
27 27
import qa_utils
28 28

  
29
from ganeti import query
30

  
29 31
from qa_utils import AssertCommand
30 32

  
31 33

  
34
def TestNetworkList():
35
  """gnt-network list"""
36
  qa_utils.GenericQueryTest("gnt-network", query.NETWORK_FIELDS.keys())
37

  
38

  
39
def TestNetworkListFields():
40
  """gnt-network list-fields"""
41
  qa_utils.GenericQueryFieldsTest("gnt-network", query.NETWORK_FIELDS.keys())
42

  
43

  
32 44
def GetNonexistentNetworks(count):
33 45
  """Gets network names which shouldn't exist on the cluster.
34 46

  
......
52 64
  AssertCommand(["gnt-network", "add", "--network", "203.0.133.0/24", network2],
53 65
                fail=True)
54 66

  
55
  AssertCommand(["gnt-network", "list"])
67
  TestNetworkList()
68
  TestNetworkListFields()
56 69

  
57 70
  AssertCommand(["gnt-network", "remove", network1])
58 71
  AssertCommand(["gnt-network", "remove", network2])
59 72

  
60
  AssertCommand(["gnt-network", "list"])
73
  TestNetworkList()
61 74

  
62 75

  
63 76
def TestNetworkConnect():
......
79 92
  AssertCommand(["gnt-network", "add", "--network", "192.0.2.0/24", network1])
80 93

  
81 94
  AssertCommand(["gnt-network", "connect", network1, mode, link, group1])
82
  AssertCommand(["gnt-network", "list"])
95

  
96
  TestNetworkList()
97

  
83 98
  AssertCommand(["gnt-network", "disconnect", network1, group1])
84 99

  
85 100
  AssertCommand(["gnt-group", "remove", group1])

Also available in: Unified diff