Revision e809466b
Correction positionnement nom d'interface réseau
Si le champ "comment" était vide, alors un nom vide était donné à
l'interface dans le fichier de configuration généré.
Ceci empêchait ensuite le déploiement de la configuration.
Change-Id: I0f004b09da44dee2a8737174d2eed0340db46d22
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/2371
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Francois POIROTTE <francois.poirotte@c-s.fr>
| src/Vigilo/VigiloHost.php | ||
|---|---|---|
| 148 | 148 |
} |
| 149 | 149 |
|
| 150 | 150 |
$args = array(); |
| 151 |
$label = isset($port->fields['comment']) ? $port->fields['comment'] : $port->getName();
|
|
| 151 |
$label = !empty($port->fields['comment']) ? $port->fields['comment'] : $port->getName();
|
|
| 152 | 152 |
$ethport = $ethport->find('networkports_id=' . $np['id']);
|
| 153 | 153 |
foreach ($ethport as $rowEthPort) {
|
| 154 | 154 |
if ($rowEthPort['speed']) {
|
| src/Vigilo/VigiloNetworkEquipment.php | ||
|---|---|---|
| 114 | 114 |
} |
| 115 | 115 |
|
| 116 | 116 |
$args = array(); |
| 117 |
$label = isset($port->fields['comment']) ? $port->fields['comment'] : $port->getName();
|
|
| 117 |
$label = !empty($port->fields['comment']) ? $port->fields['comment'] : $port->getName();
|
|
| 118 | 118 |
$ethport = $ethport->find('networkports_id=' . $np['id']);
|
| 119 | 119 |
foreach ($ethport as $rowEthPort) {
|
| 120 | 120 |
if ($rowEthPort['speed']) {
|
| src/Vigilo/VigiloPrinter.php | ||
|---|---|---|
| 114 | 114 |
} |
| 115 | 115 |
|
| 116 | 116 |
$args = array(); |
| 117 |
$label = isset($port->fields['comment']) ? $port->fields['comment'] : $port->getName();
|
|
| 117 |
$label = !empty($port->fields['comment']) ? $port->fields['comment'] : $port->getName();
|
|
| 118 | 118 |
$ethport = $ethport->find('networkports_id=' . $np['id']);
|
| 119 | 119 |
foreach ($ethport as $rowEthPort) {
|
| 120 | 120 |
if ($rowEthPort['speed']) {
|
Also available in: Unified diff