Revision f2212a5d lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
16202 | 16202 |
do_instances = query.NETQ_INST in self.requested_data |
16203 | 16203 |
do_groups = do_instances or (query.NETQ_GROUP in self.requested_data) |
16204 | 16204 |
|
16205 |
network_to_groups = None |
|
16206 | 16205 |
network_to_instances = None |
16207 | 16206 |
|
16208 | 16207 |
# For NETQ_GROUP, we need to map network->[groups] |
... | ... | |
16222 | 16221 |
group_instances = [instance for instance in all_instances.values() |
16223 | 16222 |
if instance.primary_node in group_nodes] |
16224 | 16223 |
|
16225 |
for net_uuid in group.networks.keys(): |
|
16226 |
if net_uuid in network_to_groups: |
|
16227 |
netparams = group.networks[net_uuid] |
|
16228 |
|
|
16224 |
for net_uuid in self.wanted: |
|
16225 |
netparams = group.networks.get(net_uuid, None) |
|
16226 |
if netparams: |
|
16229 | 16227 |
info = (group.name, netparams[constants.NIC_MODE], |
16230 | 16228 |
netparams[constants.NIC_LINK]) |
16231 | 16229 |
|
16232 | 16230 |
network_to_groups[net_uuid].append(info) |
16233 | 16231 |
|
16234 |
if do_instances: |
|
16235 |
for instance in group_instances: |
|
16236 |
for nic in instance.nics: |
|
16237 |
if nic.network == self._all_networks[net_uuid].name: |
|
16238 |
network_to_instances[net_uuid].append(instance.name) |
|
16239 |
break |
|
16232 |
if do_instances: |
|
16233 |
for instance in group_instances: |
|
16234 |
for nic in instance.nics: |
|
16235 |
if nic.network == self._all_networks[net_uuid].name: |
|
16236 |
network_to_instances[net_uuid].append(instance.name) |
|
16237 |
break |
|
16238 |
else: |
|
16239 |
network_to_groups = None |
|
16240 | 16240 |
|
16241 | 16241 |
if query.NETQ_STATS in self.requested_data: |
16242 | 16242 |
stats = \ |
Also available in: Unified diff