Revision 2ff6426b lib/cmdlib/group.py
| b/lib/cmdlib/group.py | ||
|---|---|---|
| 28 | 28 |
from ganeti import errors |
| 29 | 29 |
from ganeti import locking |
| 30 | 30 |
from ganeti import objects |
| 31 |
from ganeti import opcodes |
|
| 32 | 31 |
from ganeti import utils |
| 33 | 32 |
from ganeti.masterd import iallocator |
| 34 | 33 |
from ganeti.cmdlib.base import LogicalUnit, NoHooksLU, ResultWithJobs |
| ... | ... | |
| 38 | 37 |
ComputeNewInstanceViolations, GetDefaultIAllocator, ShareAll, \ |
| 39 | 38 |
CheckInstancesNodeGroups, LoadNodeEvacResult, MapInstanceLvsToNodes, \ |
| 40 | 39 |
CheckIpolicyVsDiskTemplates, CheckDiskAccessModeValidity, \ |
| 41 |
CheckDiskAccessModeConsistency |
|
| 40 |
CheckDiskAccessModeConsistency, OpConnectInstanceCommunicationNetwork
|
|
| 42 | 41 |
|
| 43 | 42 |
import ganeti.masterd.instance |
| 44 | 43 |
|
| ... | ... | |
| 157 | 156 |
L{None}
|
| 158 | 157 |
|
| 159 | 158 |
""" |
| 160 |
jobs = [] |
|
| 161 |
|
|
| 162 | 159 |
try: |
| 163 | 160 |
cfg.LookupNetwork(network_name) |
| 164 | 161 |
network_exists = True |
| ... | ... | |
| 166 | 163 |
network_exists = False |
| 167 | 164 |
|
| 168 | 165 |
if network_exists: |
| 169 |
op = opcodes.OpNetworkConnect( |
|
| 170 |
group_name=group_uuid, |
|
| 171 |
network_name=network_name, |
|
| 172 |
network_mode=constants.NIC_MODE_ROUTED, |
|
| 173 |
network_link=constants.INSTANCE_COMMUNICATION_NETWORK_LINK, |
|
| 174 |
conflicts_check=True) |
|
| 175 |
jobs.append(op) |
|
| 176 |
|
|
| 177 |
if jobs: |
|
| 178 |
return ResultWithJobs([jobs]) |
|
| 166 |
op = OpConnectInstanceCommunicationNetwork(group_uuid, network_name) |
|
| 167 |
return ResultWithJobs([[op]]) |
|
| 179 | 168 |
else: |
| 180 | 169 |
return None |
| 181 | 170 |
|
Also available in: Unified diff