Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more wireless options to network model #1014

Merged
merged 6 commits into from
Jan 29, 2024

Conversation

jcronenberg
Copy link
Contributor

@jcronenberg jcronenberg commented Jan 24, 2024

Problem

For the migration there are a few wireless options that yast2lan has that are missing in agama.

Solution

Add the missing options.

Testing

@coveralls
Copy link

coveralls commented Jan 24, 2024

Coverage Status

coverage: 74.664% (+0.008%) from 74.656%
when pulling 2489a9a on jcronenberg:more_wireless_options
into df521d7 on openSUSE:master.

@jcronenberg jcronenberg force-pushed the more_wireless_options branch from 3806193 to 2e341ad Compare January 24, 2024 15:47
security.insert("auth-alg", wep_security.auth_alg.to_string().into());
for (i, wep_key) in wep_security.keys.clone().into_iter().enumerate() {
security.insert(
// lifetimes are fun
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps we should use a OwnedNestedHash or just use a String as key.

Suggested change
// lifetimes are fun
// FIXME: lifetimes are fun

let wep_key_type: u32 = *wep_key_type.downcast_ref()?;
match wep_key_type {
// 0 shouldn't appear because it is treated as empty but just in case
0 => WepKeyType::Unknown,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for being so picky, but I would use WEPKeyType just for consistency reasons (we have used WPA and WEP in other places).

} else {
WepKeyType::default()
};
let auth_alg = if let Some(auth_alg) = security.get("auth-alg") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually find using combinators more readable, but I guess it is a matter of taste (I am used to them in other languages):

let auth_alg = security
    .get("auth-alg")
    .and_then(|alg| WepAuthAlg::try_from(alg.downcast_ref()?).ok())
    .unwrap_or_default();

And the same for the index:

let wep_key_index = security
    .get("wep-tx-keyidx")
    .and_then(|idx| idx.downcast_ref::<u32>().cloned())
    .unwrap_or_default();

And I guess you would follow a similar approach above if you move the complex part (the match) to a separate function.

But feel free to ignore these suggestions.

@jcronenberg jcronenberg force-pushed the more_wireless_options branch from 2e341ad to 308a502 Compare January 25, 2024 10:27
Copy link
Contributor

@imobachgs imobachgs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add a changes entry.

@jcronenberg jcronenberg force-pushed the more_wireless_options branch from 95d02b8 to 2489a9a Compare January 29, 2024 10:27
@imobachgs imobachgs merged commit 709f9aa into agama-project:master Jan 29, 2024
1 check passed
@jcronenberg jcronenberg deleted the more_wireless_options branch January 29, 2024 12:54
@imobachgs imobachgs mentioned this pull request Feb 12, 2024
@imobachgs imobachgs mentioned this pull request May 17, 2024
imobachgs added a commit that referenced this pull request May 17, 2024
Prepare for releasing Agama 8. It includes the following pull requests:

* #884
* #886
* #914
* #918
* #956
* #957
* #958
* #959
* #960
* #961
* #962
* #963
* #964
* #965
* #966
* #969
* #970
* #976
* #977
* #978
* #979
* #980
* #981
* #983
* #984
* #985
* #986
* #988
* #991
* #992
* #995
* #996
* #997
* #999
* #1003
* #1004
* #1006
* #1007
* #1008
* #1009
* #1010
* #1011
* #1012
* #1014
* #1015
* #1016
* #1017
* #1020
* #1022
* #1023
* #1024
* #1025
* #1027
* #1028
* #1029
* #1030
* #1031
* #1032
* #1033
* #1034
* #1035
* #1036
* #1038
* #1039
* #1041
* #1042
* #1043
* #1045
* #1046
* #1047
* #1048
* #1052
* #1054
* #1056
* #1057
* #1060
* #1061
* #1062
* #1063
* #1064
* #1066
* #1067
* #1068
* #1069
* #1071
* #1072
* #1073
* #1074
* #1075
* #1079
* #1080
* #1081
* #1082
* #1085
* #1086
* #1087
* #1088
* #1089
* #1090
* #1091
* #1092
* #1093
* #1094
* #1095
* #1096
* #1097
* #1098
* #1099
* #1100
* #1102
* #1103
* #1104
* #1105
* #1106
* #1109
* #1110
* #1111
* #1112
* #1114
* #1116
* #1117
* #1118
* #1119
* #1120
* #1121
* #1122
* #1123
* #1125
* #1126
* #1127
* #1128
* #1129
* #1130
* #1131
* #1132
* #1133
* #1134
* #1135
* #1136
* #1138
* #1139
* #1140
* #1141
* #1142
* #1143
* #1144
* #1145
* #1146
* #1147
* #1148
* #1149
* #1151
* #1152
* #1153
* #1154
* #1155
* #1156
* #1157
* #1158
* #1160
* #1161
* #1162
* #1163
* #1164
* #1165
* #1166
* #1167
* #1168
* #1169
* #1170
* #1171
* #1172
* #1173
* #1174
* #1175
* #1177
* #1178
* #1180
* #1181
* #1182
* #1183
* #1184
* #1185
* #1187
* #1188
* #1189
* #1190
* #1191
* #1192
* #1193
* #1194
* #1195
* #1196
* #1198
* #1199
* #1200
* #1201
* #1203
* #1204
* #1205
* #1206
* #1207
* #1208
* #1209
* #1210
* #1211
* #1212
* #1213
* #1214
* #1215
* #1216
* #1217
* #1219
* #1220
* #1221
* #1222
* #1223
* #1224
* #1225
* #1226
* #1227
* #1229
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants