Revision 53195377 lib/config.py
| b/lib/config.py | ||
|---|---|---|
| 341 | 341 |
|
| 342 | 342 |
""" |
| 343 | 343 |
nobj = self._UnlockedGetNetwork(net_uuid) |
| 344 |
pool = network.AddressPool(nobj)
|
|
| 344 |
pool = network.Network(nobj)
|
|
| 345 | 345 |
if action == constants.RESERVE_ACTION: |
| 346 | 346 |
pool.Reserve(address, external) |
| 347 | 347 |
elif action == constants.RELEASE_ACTION: |
| ... | ... | |
| 374 | 374 |
|
| 375 | 375 |
""" |
| 376 | 376 |
nobj = self._UnlockedGetNetwork(net_uuid) |
| 377 |
pool = network.AddressPool(nobj)
|
|
| 377 |
pool = network.Network(nobj)
|
|
| 378 | 378 |
|
| 379 | 379 |
def gen_one(): |
| 380 | 380 |
try: |
| ... | ... | |
| 393 | 393 |
|
| 394 | 394 |
""" |
| 395 | 395 |
nobj = self._UnlockedGetNetwork(net_uuid) |
| 396 |
pool = network.AddressPool(nobj)
|
|
| 396 |
pool = network.Network(nobj)
|
|
| 397 | 397 |
if (address, net_uuid) in self._AllIPs(): |
| 398 | 398 |
raise errors.ConfigurationError("Address '%s' already exists in"
|
| 399 | 399 |
" network '%s'" % (address, nobj.name)) |
| ... | ... | |
| 2651 | 2651 |
node_info = self._UnlockedGetNodeInfo(node) |
| 2652 | 2652 |
nodegroup_info = self._UnlockedGetNodeGroup(node_info.group) |
| 2653 | 2653 |
for net_uuid in nodegroup_info.networks.keys(): |
| 2654 |
net_info = self._UnlockedGetNetwork(net_uuid)
|
|
| 2655 |
pool = network.AddressPool(net_info)
|
|
| 2654 |
nobj = self._UnlockedGetNetwork(net_uuid)
|
|
| 2655 |
pool = network.Network(nobj)
|
|
| 2656 | 2656 |
if pool.Contains(ip): |
| 2657 |
return (net_info.name, nodegroup_info.networks[net_uuid])
|
|
| 2657 |
return (nobj.name, nodegroup_info.networks[net_uuid])
|
|
| 2658 | 2658 |
|
| 2659 | 2659 |
return (None, None) |
Also available in: Unified diff