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

ifcfg-rh: add support for Infiniband partitions

Browse Source
This commit is contained in:
Dan Winship
2013-06-10 16:18:48 -03:00
parent 6854481fe8
commit cb5606cf1c
2 changed files with 95 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/settings/plugins/ifcfg-rh/reader.c
View File

@@ -3490,6 +3490,72 @@ wired_connection_from_ifcfg (const char *file,
return connection;
}
static gboolean
parse_infiniband_p_key (shvarFile *ifcfg,
int *out_p_key,
char **out_parent,
GError **error)
{
char *device = NULL, *physdev = NULL, *vlan_id = NULL, *end;
char *ifname = NULL;
guint32 id;
gboolean ret = FALSE;
device = svGetValue (ifcfg, "DEVICE", FALSE);
if (!device) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand connection specified VLAN but not DEVICE");
goto done;
}
physdev = svGetValue (ifcfg, "PHYSDEV", FALSE);
if (!physdev) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand connection specified VLAN but not PHYSDEV");
goto done;
}
vlan_id = svGetValue (ifcfg, "VLAN_ID", FALSE);
if (!vlan_id) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand connection specified VLAN but not VLAN_ID");
goto done;
}
if (g_str_has_prefix (vlan_id, "0x"))
id = strtoul (vlan_id, &end, 16);
else if (!g_str_has_prefix (vlan_id, "0"))
id = strtoul (vlan_id, &end, 10);
else
end = vlan_id;
if (end == vlan_id || *end || id > 0xFFFF) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, " invalid InfiniBand VLAN_ID '%s'", vlan_id);
goto done;
}
id = (id | 0x8000);
ifname = g_strdup_printf ("%s.%04x", physdev, id);
if (strcmp (device, ifname) != 0) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand DEVICE (%s) does not match PHYSDEV+VLAN_ID (%s)",
device, ifname);
goto done;
}
*out_p_key = id;
*out_parent = g_strdup (physdev);
ret = TRUE;
done:
g_free (device);
g_free (physdev);
g_free (vlan_id);
g_free (ifname);
if (!ret) {
g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
"Failed to create InfiniBand setting.");
}
return ret;
}
static NMSetting *
make_infiniband_setting (shvarFile *ifcfg,
const char *file,
@@ -3538,6 +3604,21 @@ make_infiniband_setting (shvarFile *ifcfg,
else
g_object_set (s_infiniband, NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram", NULL);
if (svTrueValue (ifcfg, "VLAN", FALSE)) {
int p_key;
char *parent;
if (!parse_infiniband_p_key (ifcfg, &p_key, &parent, error)) {
g_object_unref (s_infiniband);
return NULL;
}
g_object_set (s_infiniband,
NM_SETTING_INFINIBAND_P_KEY, p_key,
NM_SETTING_INFINIBAND_PARENT, parent,
NULL);
}
return (NMSetting *) s_infiniband;
}

15
src/settings/plugins/ifcfg-rh/writer.c
View File

@@ -957,8 +957,9 @@ write_infiniband_setting (NMConnection *connection, shvarFile *ifcfg, GError **e
NMSettingInfiniband *s_infiniband;
const GByteArray *mac;
char *tmp;
const char *transport_mode;
const char *transport_mode, *parent;
guint32 mtu;
int p_key;
s_infiniband = nm_connection_get_setting_infiniband (connection);
if (!s_infiniband) {
@@ -988,6 +989,18 @@ write_infiniband_setting (NMConnection *connection, shvarFile *ifcfg, GError **e
strcmp (transport_mode, "connected") == 0 ? "yes" : "no",
FALSE);
p_key = nm_setting_infiniband_get_p_key (s_infiniband);
if (p_key != -1) {
svSetValue (ifcfg, "VLAN", "yes", FALSE);
tmp = g_strdup_printf ("%u", p_key);
svSetValue (ifcfg, "VLAN_ID", tmp, FALSE);
g_free (tmp);
parent = nm_setting_infiniband_get_parent (s_infiniband);
if (parent)
svSetValue (ifcfg, "PHYSDEV", parent, FALSE);
}
svSetValue (ifcfg, "TYPE", TYPE_INFINIBAND, FALSE);
return TRUE;