Revision 37a978e7
| b/lib/client/gnt_network.py | ||
|---|---|---|
| 143 | 143 |
# TODO: Change logic to support "--submit" |
| 144 | 144 |
for group in groups: |
| 145 | 145 |
op = opcodes.OpNetworkDisconnect(group_name=group, |
| 146 |
network_name=network, |
|
| 147 |
conflicts_check=opts.conflicts_check) |
|
| 146 |
network_name=network) |
|
| 148 | 147 |
SubmitOpCode(op, opts=opts, cl=cl) |
| 149 | 148 |
|
| 150 | 149 |
|
| ... | ... | |
| 344 | 343 |
"disconnect": ( |
| 345 | 344 |
DisconnectNetwork, |
| 346 | 345 |
[ArgNetwork(min=1, max=1), ArgGroup()], |
| 347 |
[NOCONFLICTSCHECK_OPT, PRIORITY_OPT],
|
|
| 346 |
[PRIORITY_OPT], |
|
| 348 | 347 |
"<network_name> [<node_group>...]", |
| 349 | 348 |
"Unmap a given network from a specified node group"), |
| 350 | 349 |
"remove": ( |
| b/lib/cmdlib.py | ||
|---|---|---|
| 16790 | 16790 |
|
| 16791 | 16791 |
# Lock instances optimistically, needs verification once group lock has |
| 16792 | 16792 |
# been acquired |
| 16793 |
if self.op.conflicts_check: |
|
| 16794 |
self.needed_locks[locking.LEVEL_INSTANCE] = \ |
|
| 16795 |
self.cfg.GetNodeGroupInstances(self.group_uuid) |
|
| 16793 |
self.needed_locks[locking.LEVEL_INSTANCE] = \ |
|
| 16794 |
self.cfg.GetNodeGroupInstances(self.group_uuid) |
|
| 16796 | 16795 |
|
| 16797 | 16796 |
def BuildHooksEnv(self): |
| 16798 | 16797 |
ret = {
|
| ... | ... | |
| 16817 | 16816 |
self.connected = False |
| 16818 | 16817 |
return |
| 16819 | 16818 |
|
| 16820 |
if self.op.conflicts_check: |
|
| 16821 |
_NetworkConflictCheck(self, lambda nic: nic.network == self.network_name, |
|
| 16822 |
"disconnect from") |
|
| 16819 |
_NetworkConflictCheck(self, lambda nic: nic.network == self.network_name, |
|
| 16820 |
"disconnect from") |
|
| 16823 | 16821 |
|
| 16824 | 16822 |
def Exec(self, feedback_fn): |
| 16825 | 16823 |
if not self.connected: |
| b/lib/opcodes.py | ||
|---|---|---|
| 2138 | 2138 |
OP_PARAMS = [ |
| 2139 | 2139 |
_PGroupName, |
| 2140 | 2140 |
_PNetworkName, |
| 2141 |
("conflicts_check", True, ht.TBool, "Whether to check for conflicting IPs"),
|
|
| 2142 | 2141 |
] |
| 2143 | 2142 |
OP_RESULT = ht.TNone |
| 2144 | 2143 |
|
Also available in: Unified diff