Revision 6bb939a2
| b/lib/client/gnt_network.py | ||
|---|---|---|
| 144 | 144 |
# TODO: Change logic to support "--submit" |
| 145 | 145 |
for group in groups: |
| 146 | 146 |
op = opcodes.OpNetworkDisconnect(group_name=group, |
| 147 |
network_name=network, |
|
| 148 |
conflicts_check=opts.conflicts_check) |
|
| 147 |
network_name=network) |
|
| 149 | 148 |
SubmitOpCode(op, opts=opts, cl=cl) |
| 150 | 149 |
|
| 151 | 150 |
|
| ... | ... | |
| 349 | 348 |
"disconnect": ( |
| 350 | 349 |
DisconnectNetwork, |
| 351 | 350 |
[ArgNetwork(min=1, max=1), ArgGroup()], |
| 352 |
[NOCONFLICTSCHECK_OPT, PRIORITY_OPT],
|
|
| 351 |
[PRIORITY_OPT], |
|
| 353 | 352 |
"<network_name> [<node_group>...]", |
| 354 | 353 |
"Unmap a given network from a specified node group"), |
| 355 | 354 |
"remove": ( |
| b/lib/cmdlib.py | ||
|---|---|---|
| 16811 | 16811 |
|
| 16812 | 16812 |
# Lock instances optimistically, needs verification once group lock has |
| 16813 | 16813 |
# been acquired |
| 16814 |
if self.op.conflicts_check: |
|
| 16815 |
self.needed_locks[locking.LEVEL_INSTANCE] = \ |
|
| 16816 |
self.cfg.GetNodeGroupInstances(self.group_uuid) |
|
| 16814 |
self.needed_locks[locking.LEVEL_INSTANCE] = \ |
|
| 16815 |
self.cfg.GetNodeGroupInstances(self.group_uuid) |
|
| 16817 | 16816 |
|
| 16818 | 16817 |
def BuildHooksEnv(self): |
| 16819 | 16818 |
ret = {
|
| ... | ... | |
| 16838 | 16837 |
self.connected = False |
| 16839 | 16838 |
return |
| 16840 | 16839 |
|
| 16841 |
if self.op.conflicts_check: |
|
| 16842 |
_NetworkConflictCheck(self, lambda nic: nic.network == self.network_name, |
|
| 16843 |
"disconnect from") |
|
| 16840 |
_NetworkConflictCheck(self, lambda nic: nic.network == self.network_name, |
|
| 16841 |
"disconnect from") |
|
| 16844 | 16842 |
|
| 16845 | 16843 |
def Exec(self, feedback_fn): |
| 16846 | 16844 |
if not self.connected: |
| b/lib/opcodes.py | ||
|---|---|---|
| 2143 | 2143 |
OP_PARAMS = [ |
| 2144 | 2144 |
_PGroupName, |
| 2145 | 2145 |
_PNetworkName, |
| 2146 |
("conflicts_check", True, ht.TBool, "Whether to check for conflicting IPs"),
|
|
| 2147 | 2146 |
] |
| 2148 | 2147 |
OP_RESULT = ht.TNone |
| 2149 | 2148 |
|
Also available in: Unified diff