Revision 7be048f0 test/ganeti.rapi.rlib2_unittest.py

b/test/ganeti.rapi.rlib2_unittest.py
67 67

  
68 68
      # Two NICs
69 69
      [
70
        { "ip": "1.2.3.4", "mode": constants.NIC_MODE_ROUTED, },
70
        { "ip": "1.2.3.4", "mode": constants.NIC_MODE_ROUTED,
71
          "mac": "01:23:45:67:68:9A",
72
        },
71 73
        { "mode": constants.NIC_MODE_BRIDGED, "link": "n0", "bridge": "br1", },
72 74
      ],
73 75

  
......
122 124
                  self.assertEqual(len(op.disks), len(disks))
123 125
                  self.assertEqual(len(op.nics), len(nics))
124 126

  
125
                  self.assert_(compat.all(opdisk.get("size") ==
126
                                          disk.get("size") and
127
                                          opdisk.get("mode") ==
128
                                          disk.get("mode") and
129
                                          "unknown" not in opdisk
130
                                          for opdisk, disk in zip(op.disks,
131
                                                                  disks)))
132

  
133
                  self.assert_(compat.all(opnic.get("size") ==
134
                                          nic.get("size") and
135
                                          opnic.get("mode") ==
136
                                          nic.get("mode") and
137
                                          "unknown" not in opnic and
138
                                          "foobar" not in opnic
139
                                          for opnic, nic in zip(op.nics, nics)))
127
                  for opdisk, disk in zip(op.disks, disks):
128
                    for key in constants.IDISK_PARAMS:
129
                      self.assertEqual(opdisk.get(key), disk.get(key))
130
                    self.assertFalse("unknown" in opdisk)
131

  
132
                  for opnic, nic in zip(op.nics, nics):
133
                    for key in constants.INIC_PARAMS:
134
                      self.assertEqual(opnic.get(key), nic.get(key))
135
                    self.assertFalse("unknown" in opnic)
136
                    self.assertFalse("foobar" in opnic)
140 137

  
141 138
                  if beparams is None:
142 139
                    self.assertEqualValues(op.beparams, {})

Also available in: Unified diff