colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix capitalization of "InfiniBand"

Browse Source 
"InfiniBand" has a capital "B". Fix that everywhere it's being used as
a human-readable string.

In particular, the RH initscripts recognize "TYPE=infiniband" and
"TYPE=InfiniBand", but not "TYPE=Infiniband", which is what we were
writing before.
This commit is contained in:
Dan Winship
2012-03-06 12:55:24 -05:00
parent 4fc8b8ccd0
commit 49214066a4
20 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/connections.c
View File

@@ -1431,14 +1431,14 @@ check_infiniband_compatible (NMDeviceInfiniband *device, NMConnection *connectio
connection_type = nm_setting_connection_get_connection_type (s_con); connection_type = nm_setting_connection_get_connection_type (s_con);
if (strcmp (connection_type, NM_SETTING_INFINIBAND_SETTING_NAME)) { if (strcmp (connection_type, NM_SETTING_INFINIBAND_SETTING_NAME)) {
g_set_error (error, 0, 0, g_set_error (error, 0, 0,
"The connection was not an Infiniband connection."); "The connection was not an InfiniBand connection.");
return FALSE; return FALSE;
} }
s_infiniband = nm_connection_get_setting_infiniband (connection); s_infiniband = nm_connection_get_setting_infiniband (connection);
if (!s_infiniband) { if (!s_infiniband) {
g_set_error (error, 0, 0, g_set_error (error, 0, 0,
"The connection was not a valid Infiniband connection."); "The connection was not a valid InfiniBand connection.");
return FALSE; return FALSE;
} }

2
cli/src/devices.c
View File

@@ -419,7 +419,7 @@ device_reason_to_string (NMDeviceStateReason reason)
return _("GSM Modem's SIM wrong"); return _("GSM Modem's SIM wrong");
case NM_DEVICE_STATE_REASON_INFINIBAND_MODE: case NM_DEVICE_STATE_REASON_INFINIBAND_MODE:
return _("Infiniband device does not support connected mode"); return _("InfiniBand device does not support connected mode");
case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED:
return _("A dependency of the connection failed"); return _("A dependency of the connection failed");

4
include/NetworkManager.h
View File

@@ -104,7 +104,7 @@ typedef enum {
* @NM_DEVICE_TYPE_WIMAX: an 802.16e Mobile WiMAX broadband device * @NM_DEVICE_TYPE_WIMAX: an 802.16e Mobile WiMAX broadband device
* @NM_DEVICE_TYPE_MODEM: a modem supporting analog telephone, CDMA/EVDO, * @NM_DEVICE_TYPE_MODEM: a modem supporting analog telephone, CDMA/EVDO,
* GSM/UMTS, or LTE network access protocols * GSM/UMTS, or LTE network access protocols
* @NM_DEVICE_TYPE_INFINIBAND: an IP-over-Infiniband device * @NM_DEVICE_TYPE_INFINIBAND: an IP-over-InfiniBand device
* @NM_DEVICE_TYPE_BOND: a bond master interface * @NM_DEVICE_TYPE_BOND: a bond master interface
* *
* #NMDeviceType values indicate the type of hardware represented by * #NMDeviceType values indicate the type of hardware represented by
@@ -484,7 +484,7 @@ typedef enum {
/* GSM Modem's SIM wrong */ /* GSM Modem's SIM wrong */
NM_DEVICE_STATE_REASON_GSM_SIM_WRONG = 48, NM_DEVICE_STATE_REASON_GSM_SIM_WRONG = 48,
/* Infiniband device does not support connected mode */ /* InfiniBand device does not support connected mode */
NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49, NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49,
/* A dependency of the connection failed */ /* A dependency of the connection failed */

4
introspection/nm-device.xml
View File

@@ -243,7 +243,7 @@
</tp:enumvalue> </tp:enumvalue>
<tp:enumvalue suffix="INFINIBAND" value="9"> <tp:enumvalue suffix="INFINIBAND" value="9">
<tp:docstring> <tp:docstring>
The device is an IP-capable Infiniband interface. The device is an IP-capable InfiniBand interface.
</tp:docstring> </tp:docstring>
</tp:enumvalue> </tp:enumvalue>
<tp:enumvalue suffix="BOND" value="10"> <tp:enumvalue suffix="BOND" value="10">
@@ -518,7 +518,7 @@
</tp:enumvalue> </tp:enumvalue>
<tp:enumvalue suffix="INFINIBAND_MODE" value="49"> <tp:enumvalue suffix="INFINIBAND_MODE" value="49">
<tp:docstring> <tp:docstring>
Infiniband device does not support connected mode. InfiniBand device does not support connected mode.
</tp:docstring> </tp:docstring>
</tp:enumvalue> </tp:enumvalue>
<tp:enumvalue suffix="DEPENDENCY_FAILED" value="50"> <tp:enumvalue suffix="DEPENDENCY_FAILED" value="50">

4
libnm-util/nm-setting-infiniband.c
View File

@@ -28,11 +28,11 @@
/** /**
* SECTION:nm-setting-infiniband * SECTION:nm-setting-infiniband
* @short_description: Describes connection properties for IP-over-Infiniband networks * @short_description: Describes connection properties for IP-over-InfiniBand networks
* @include: nm-setting-infiniband.h * @include: nm-setting-infiniband.h
* *
* The #NMSettingInfiniband object is a #NMSetting subclass that describes properties * The #NMSettingInfiniband object is a #NMSetting subclass that describes properties
* necessary for connection to IP-over-Infiniband networks. * necessary for connection to IP-over-InfiniBand networks.
**/ **/
/** /**

8
po/hu.po
View File

@@ -1150,8 +1150,8 @@ msgid "GSM Modem's SIM wrong"
msgstr "A GSM modem SIM kódja hibás" msgstr "A GSM modem SIM kódja hibás"
#: ../cli/src/devices.c:421 #: ../cli/src/devices.c:421
msgid "Infiniband device does not support connected mode" msgid "InfiniBand device does not support connected mode"
msgstr "Az Infiniband eszköz nem támogatja a csatlakoztatott módot" msgstr "Az InfiniBand eszköz nem támogatja a csatlakoztatott módot"
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 #: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622 #: ../cli/src/devices.c:578 ../cli/src/devices.c:622
@@ -2561,8 +2561,8 @@ msgstr "%d. vezetékes kapcsolat"
#: ../src/nm-device-infiniband.c:332 #: ../src/nm-device-infiniband.c:332
#, c-format #, c-format
#| msgid "Wired connection %d" #| msgid "Wired connection %d"
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "%d. Infiniband kapcsolat" msgstr "%d. InfiniBand kapcsolat"
#: ../src/nm-device-olpc-mesh.c:323 #: ../src/nm-device-olpc-mesh.c:323
#, c-format #, c-format

6
po/ml.po
View File

@@ -1096,7 +1096,7 @@ msgid "GSM Modem's SIM wrong"
msgstr "GSM മോഡത്തിന്റെ സിം തെറ്റാണ്" msgstr "GSM മോഡത്തിന്റെ സിം തെറ്റാണ്"
#: ../cli/src/devices.c:421 #: ../cli/src/devices.c:421
msgid "Infiniband device does not support connected mode" msgid "InfiniBand device does not support connected mode"
msgstr "" msgstr ""
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 #: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
@@ -2449,8 +2449,8 @@ msgstr "Wired കണക്ഷന്‍ %d"
#: ../src/nm-device-infiniband.c:303 #: ../src/nm-device-infiniband.c:303
#, c-format #, c-format
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "Infiniband കണക്ഷന്‍ %d" msgstr "InfiniBand കണക്ഷന്‍ %d"
#: ../src/nm-device-olpc-mesh.c:293 #: ../src/nm-device-olpc-mesh.c:293
#, c-format #, c-format

8
po/pl.po
View File

@@ -1098,8 +1098,8 @@ msgid "GSM Modem's SIM wrong"
msgstr "Karta SIM modemu GSM jest błędna" msgstr "Karta SIM modemu GSM jest błędna"
#: ../cli/src/devices.c:421 #: ../cli/src/devices.c:421
msgid "Infiniband device does not support connected mode" msgid "InfiniBand device does not support connected mode"
msgstr "Urządzenie Infiniband nie obsługuje trybu połączonego" msgstr "Urządzenie InfiniBand nie obsługuje trybu połączonego"
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 #: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622 #: ../cli/src/devices.c:578 ../cli/src/devices.c:622
@@ -2497,8 +2497,8 @@ msgstr "Połączenie przewodowe %d"
#: ../src/nm-device-infiniband.c:303 #: ../src/nm-device-infiniband.c:303
#, c-format #, c-format
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "Połączenie Infiniband %d" msgstr "Połączenie InfiniBand %d"
#: ../src/nm-device-olpc-mesh.c:293 #: ../src/nm-device-olpc-mesh.c:293
#, c-format #, c-format

8
po/pt_BR.po
View File

@@ -1099,8 +1099,8 @@ msgid "GSM Modem's SIM wrong"
msgstr "SIM do modem GSM errado" msgstr "SIM do modem GSM errado"
#: ../cli/src/devices.c:421 #: ../cli/src/devices.c:421
msgid "Infiniband device does not support connected mode" msgid "InfiniBand device does not support connected mode"
msgstr "Dispositivo Infiniband não oferece suporte ao modo conectado" msgstr "Dispositivo InfiniBand não oferece suporte ao modo conectado"
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 #: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622 #: ../cli/src/devices.c:578 ../cli/src/devices.c:622
@@ -2487,8 +2487,8 @@ msgstr "Conexão cabeada %d"
#: ../src/nm-device-infiniband.c:302 #: ../src/nm-device-infiniband.c:302
#, c-format #, c-format
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "Conexão Infiniband %d" msgstr "Conexão InfiniBand %d"
#: ../src/nm-device-olpc-mesh.c:293 #: ../src/nm-device-olpc-mesh.c:293
#, c-format #, c-format

8
po/sl.po
View File

@@ -1206,8 +1206,8 @@ msgid "GSM Modem's SIM wrong"
msgstr "Kartica SIM modema GSM ni ustrezna" msgstr "Kartica SIM modema GSM ni ustrezna"
#: ../cli/src/devices.c:421 #: ../cli/src/devices.c:421
msgid "Infiniband device does not support connected mode" msgid "InfiniBand device does not support connected mode"
msgstr "Naprava Infiniband ne podpira povezanega načina" msgstr "Naprava InfiniBand ne podpira povezanega načina"
#: ../cli/src/devices.c:423 #: ../cli/src/devices.c:423
#: ../cli/src/devices.c:446 #: ../cli/src/devices.c:446
@@ -2576,8 +2576,8 @@ msgstr "Žična povezava %d"
#: ../src/nm-device-infiniband.c:302 #: ../src/nm-device-infiniband.c:302
#, c-format #, c-format
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "Povezava Infiniband %d" msgstr "Povezava InfiniBand %d"
#: ../src/nm-device-olpc-mesh.c:293 #: ../src/nm-device-olpc-mesh.c:293
#, c-format #, c-format

4
po/tr.po
View File

@@ -2055,8 +2055,8 @@ msgstr "Kablolu bağlantı %d"
#: ../src/nm-device-infiniband.c:292 #: ../src/nm-device-infiniband.c:292
#, c-format #, c-format
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "Infiniband bağlantısı %d" msgstr "InfiniBand bağlantısı %d"
#: ../src/nm-device-olpc-mesh.c:323 #: ../src/nm-device-olpc-mesh.c:323
#, c-format #, c-format

8
po/uk.po
View File

@@ -1155,8 +1155,8 @@ msgid "GSM Modem's SIM wrong"
msgstr "Помилкова SIM-картка у модемі GSM" msgstr "Помилкова SIM-картка у модемі GSM"
#: ../cli/src/devices.c:421 #: ../cli/src/devices.c:421
msgid "Infiniband device does not support connected mode" msgid "InfiniBand device does not support connected mode"
msgstr "У пристрої Infiniband не передбачено режиму з’єднання" msgstr "У пристрої InfiniBand не передбачено режиму з’єднання"
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 #: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622 #: ../cli/src/devices.c:578 ../cli/src/devices.c:622
@@ -2562,8 +2562,8 @@ msgstr "Дротове з’єднання %d"
#: ../src/nm-device-infiniband.c:332 #: ../src/nm-device-infiniband.c:332
#, c-format #, c-format
#| msgid "Wired connection %d" #| msgid "Wired connection %d"
msgid "Infiniband connection %d" msgid "InfiniBand connection %d"
msgstr "З’єднання Infiniband %d" msgstr "З’єднання InfiniBand %d"
#: ../src/nm-device-olpc-mesh.c:323 #: ../src/nm-device-olpc-mesh.c:323
#, c-format #, c-format

6
src/nm-device-infiniband.c
View File

@@ -115,7 +115,7 @@ nm_device_infiniband_new (const char *udi,
NM_DEVICE_UDI, udi, NM_DEVICE_UDI, udi,
NM_DEVICE_IFACE, iface, NM_DEVICE_IFACE, iface,
NM_DEVICE_DRIVER, driver, NM_DEVICE_DRIVER, driver,
NM_DEVICE_TYPE_DESC, "Infiniband", NM_DEVICE_TYPE_DESC, "InfiniBand",
NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_INFINIBAND, NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_INFINIBAND,
NULL); NULL);
} }
@@ -258,7 +258,7 @@ real_check_connection_compatible (NMDevice *device,
g_set_error (error, g_set_error (error,
NM_INFINIBAND_ERROR, NM_INFINIBAND_ERROR,
NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND,
"The connection was not an Infiniband connection."); "The connection was not an InfiniBand connection.");
return FALSE; return FALSE;
} }
@@ -300,7 +300,7 @@ real_complete_connection (NMDevice *device,
nm_utils_complete_generic (connection, nm_utils_complete_generic (connection,
NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_SETTING_NAME,
existing_connections, existing_connections,
_("Infiniband connection %d"), _("InfiniBand connection %d"),
NULL, NULL,
TRUE); TRUE);

2
src/nm-manager.c
View File

@@ -946,7 +946,7 @@ find_vlan_parent (NMManager *self,
/* The 'parent' property could be either an interface name, a connection /* The 'parent' property could be either an interface name, a connection
* UUID, or even given by the MAC address of the connection's ethernet, * UUID, or even given by the MAC address of the connection's ethernet,
* Infiniband, or WiFi setting. * InfiniBand, or WiFi setting.
*/ */
s_vlan = nm_connection_get_setting_vlan (connection); s_vlan = nm_connection_get_setting_vlan (connection);
g_return_val_if_fail (s_vlan != NULL, NULL); g_return_val_if_fail (s_vlan != NULL, NULL);

2
src/settings/plugins/ifcfg-rh/common.h
View File

@@ -43,7 +43,7 @@
#define TYPE_ETHERNET "Ethernet" #define TYPE_ETHERNET "Ethernet"
#define TYPE_WIRELESS "Wireless" #define TYPE_WIRELESS "Wireless"
#define TYPE_INFINIBAND "Infiniband" #define TYPE_INFINIBAND "InfiniBand"
#define TYPE_BRIDGE "Bridge" #define TYPE_BRIDGE "Bridge"
#define TYPE_BOND "Bond" #define TYPE_BOND "Bond"
#define TYPE_VLAN "Vlan" #define TYPE_VLAN "Vlan"

2
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
View File

@@ -1,4 +1,4 @@
TYPE=Infiniband TYPE=InfiniBand
DEVICE=ib0 DEVICE=ib0
HWADDR=80:00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:00:11:22 HWADDR=80:00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:00:11:22
CONNECTED_MODE=yes CONNECTED_MODE=yes

4
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View File

@@ -12508,14 +12508,14 @@ test_write_infiniband (void)
uuid = nm_utils_uuid_generate (); uuid = nm_utils_uuid_generate ();
g_object_set (s_con, g_object_set (s_con,
NM_SETTING_CONNECTION_ID, "Test Write Infiniband", NM_SETTING_CONNECTION_ID, "Test Write InfiniBand",
NM_SETTING_CONNECTION_UUID, uuid, NM_SETTING_CONNECTION_UUID, uuid,
NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME,
NULL); NULL);
g_free (uuid); g_free (uuid);
/* Infiniband setting */ /* InfiniBand setting */
s_infiniband = (NMSettingInfiniband *) nm_setting_infiniband_new (); s_infiniband = (NMSettingInfiniband *) nm_setting_infiniband_new ();
ASSERT (s_infiniband != NULL, ASSERT (s_infiniband != NULL,
"infiniband-write", "failed to allocate new %s setting", "infiniband-write", "failed to allocate new %s setting",

2
src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
View File

@@ -14,7 +14,7 @@ KEYFILES = \
Test_Wired_TLS_New \ Test_Wired_TLS_New \
Test_Wired_TLS_Blob \ Test_Wired_TLS_Blob \
Test_Wired_TLS_Path_Missing \ Test_Wired_TLS_Path_Missing \
Test_Infiniband_Connection Test_InfiniBand_Connection
CERTS = \ CERTS = \
test-ca-cert.pem \ test-ca-cert.pem \

2
src/settings/plugins/keyfile/tests/keyfiles/Test_Infiniband_Connection → src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
View File

@@ -1,5 +1,5 @@
[connection] [connection]
id=Test Infiniband Connection id=Test InfiniBand Connection
uuid=4e80a56d-c99f-4aad-a6dd-b449bc398c57 uuid=4e80a56d-c99f-4aad-a6dd-b449bc398c57
type=infiniband type=infiniband

10
src/settings/plugins/keyfile/tests/test-keyfile.c
View File

@@ -2830,7 +2830,7 @@ test_write_wired_8021x_tls_connection_blob (void)
g_object_unref (connection); g_object_unref (connection);
} }
#define TEST_INFINIBAND_FILE TEST_KEYFILES_DIR"/Test_Infiniband_Connection" #define TEST_INFINIBAND_FILE TEST_KEYFILES_DIR"/Test_InfiniBand_Connection"
static void static void
test_read_infiniband_connection (void) test_read_infiniband_connection (void)
@@ -2843,7 +2843,7 @@ test_read_infiniband_connection (void)
guint8 expected_mac[INFINIBAND_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, guint8 expected_mac[INFINIBAND_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
0x77, 0x88, 0x99, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x77, 0x88, 0x99, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89,
0x90 }; 0x90 };
const char *expected_id = "Test Infiniband Connection"; const char *expected_id = "Test InfiniBand Connection";
const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57"; const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57";
gboolean success; gboolean success;
@@ -2860,7 +2860,7 @@ test_read_infiniband_connection (void)
g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, expected_id); g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, expected_id);
g_assert_cmpstr (nm_setting_connection_get_uuid (s_con), ==, expected_uuid); g_assert_cmpstr (nm_setting_connection_get_uuid (s_con), ==, expected_uuid);
/* Infiniband setting */ /* InfiniBand setting */
s_ib = nm_connection_get_setting_infiniband (connection); s_ib = nm_connection_get_setting_infiniband (connection);
g_assert (s_ib); g_assert (s_ib);
@@ -2903,14 +2903,14 @@ test_write_infiniband_connection (void)
uuid = nm_utils_uuid_generate (); uuid = nm_utils_uuid_generate ();
g_object_set (s_con, g_object_set (s_con,
NM_SETTING_CONNECTION_ID, "Work Infiniband", NM_SETTING_CONNECTION_ID, "Work InfiniBand",
NM_SETTING_CONNECTION_UUID, uuid, NM_SETTING_CONNECTION_UUID, uuid,
NM_SETTING_CONNECTION_AUTOCONNECT, FALSE, NM_SETTING_CONNECTION_AUTOCONNECT, FALSE,
NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME,
NULL); NULL);
g_free (uuid); g_free (uuid);
/* Infiniband setting */ /* InfiniBand setting */
s_ib = (NMSettingInfiniband *) nm_setting_infiniband_new (); s_ib = (NMSettingInfiniband *) nm_setting_infiniband_new ();
g_assert (s_ib); g_assert (s_ib);
nm_connection_add_setting (connection, NM_SETTING (s_ib)); nm_connection_add_setting (connection, NM_SETTING (s_ib));