Skip to content

Commit fe67e1a

Browse files
metal3-io-botmetal3-io-bot
authored
Merge pull request #2750 from dtantsur/no-ilo
⚠️ Drop the non-Redfish iLO 4 and iLO 5 drivers
2 parents 87ec414 + 5b5451c commit fe67e1a

File tree

3 files changed

+0
-594
lines changed

3 files changed

+0
-594
lines changed

‎pkg/hardwareutils/bmc/access_test.go‎

Lines changed: 0 additions & 261 deletions
Original file line numberDiff line numberDiff line change
@@ -217,66 +217,6 @@ func TestParse(t *testing.T) {
217217
Hostname: "192.168.122.1",
218218
Path: "",
219219
},
220-
221-
{
222-
Scenario: "ilo4 url",
223-
Address: "ilo4://192.168.122.1",
224-
Type: "ilo4",
225-
Port: "",
226-
Host: "192.168.122.1",
227-
Hostname: "192.168.122.1",
228-
Path: "",
229-
},
230-
231-
{
232-
Scenario: "ilo4 url, ipv6",
233-
Address: "ilo4://[fe80::fc33:62ff:fe83:8a76]",
234-
Type: "ilo4",
235-
Port: "",
236-
Host: "fe80::fc33:62ff:fe83:8a76",
237-
Hostname: "[fe80::fc33:62ff:fe83:8a76]",
238-
Path: "",
239-
},
240-
241-
{
242-
Scenario: "ilo4 url, no sep",
243-
Address: "ilo4:192.168.122.1",
244-
Type: "ilo4",
245-
Port: "",
246-
Host: "192.168.122.1",
247-
Hostname: "192.168.122.1",
248-
Path: "",
249-
},
250-
251-
{
252-
Scenario: "ilo5 url",
253-
Address: "ilo5://192.168.122.1",
254-
Type: "ilo5",
255-
Port: "",
256-
Host: "192.168.122.1",
257-
Hostname: "192.168.122.1",
258-
Path: "",
259-
},
260-
261-
{
262-
Scenario: "ilo5 url, ipv6",
263-
Address: "ilo5://[fe80::fc33:62ff:fe83:8a76]",
264-
Type: "ilo5",
265-
Port: "",
266-
Host: "fe80::fc33:62ff:fe83:8a76",
267-
Hostname: "[fe80::fc33:62ff:fe83:8a76]",
268-
Path: "",
269-
},
270-
271-
{
272-
Scenario: "ilo5 url, no sep",
273-
Address: "ilo5:192.168.122.1",
274-
Type: "ilo5",
275-
Port: "",
276-
Host: "192.168.122.1",
277-
Hostname: "192.168.122.1",
278-
Path: "",
279-
},
280220
} {
281221
t.Run(tc.Scenario, func(t *testing.T) {
282222
url, err := GetParsedURL(tc.Address)
@@ -525,42 +465,6 @@ func TestStaticDriverInfo(t *testing.T) {
525465
power: "idrac-redfish",
526466
vendor: "idrac-redfish",
527467
},
528-
529-
{
530-
Scenario: "ilo4",
531-
input: "ilo4://192.168.122.1",
532-
needsMac: true,
533-
driver: "ilo",
534-
bios: "",
535-
boot: "ilo-ipxe",
536-
firmware: "",
537-
management: "",
538-
power: "",
539-
},
540-
541-
{
542-
Scenario: "ilo4 virtual media",
543-
input: "ilo4-virtualmedia://192.168.122.1",
544-
needsMac: true,
545-
driver: "ilo",
546-
bios: "",
547-
boot: "ilo-virtual-media",
548-
firmware: "",
549-
management: "",
550-
power: "",
551-
},
552-
553-
{
554-
Scenario: "ilo5",
555-
input: "ilo5://192.168.122.1",
556-
needsMac: true,
557-
driver: "ilo5",
558-
bios: "",
559-
boot: "ilo-ipxe",
560-
firmware: "",
561-
management: "",
562-
power: "",
563-
},
564468
} {
565469
t.Run(tc.Scenario, func(t *testing.T) {
566470
acc, err := NewAccessDetails(tc.input, false)
@@ -846,109 +750,6 @@ func TestDriverInfo(t *testing.T) {
846750
"redfish_verify_ca": false,
847751
},
848752
},
849-
850-
{
851-
Scenario: "ilo4",
852-
input: "ilo4://192.168.122.1",
853-
expects: map[string]interface{}{
854-
"ilo_address": "192.168.122.1",
855-
"ilo_password": "",
856-
"ilo_username": "",
857-
"ilo_verify_ca": false,
858-
},
859-
},
860-
861-
{
862-
Scenario: "ilo4 port",
863-
input: "ilo4://192.168.122.1:8080",
864-
expects: map[string]interface{}{
865-
"ilo_address": "192.168.122.1",
866-
"client_port": "8080",
867-
"ilo_password": "",
868-
"ilo_username": "",
869-
"ilo_verify_ca": false,
870-
},
871-
},
872-
873-
{
874-
Scenario: "ilo4 ipv6",
875-
input: "ilo4://[fe80::fc33:62ff:fe83:8a76]",
876-
expects: map[string]interface{}{
877-
"ilo_address": "fe80::fc33:62ff:fe83:8a76",
878-
"ilo_password": "",
879-
"ilo_username": "",
880-
"ilo_verify_ca": false,
881-
},
882-
},
883-
884-
{
885-
Scenario: "ilo4 ipv6 port",
886-
input: "ilo4://[fe80::fc33:62ff:fe83:8a76]:8080",
887-
expects: map[string]interface{}{
888-
"ilo_address": "fe80::fc33:62ff:fe83:8a76",
889-
"client_port": "8080",
890-
"ilo_password": "",
891-
"ilo_username": "",
892-
"ilo_verify_ca": false,
893-
},
894-
},
895-
896-
{
897-
Scenario: "ilo4 virtual media",
898-
input: "ilo4-virtualmedia://192.168.122.1",
899-
expects: map[string]interface{}{
900-
"ilo_address": "192.168.122.1",
901-
"ilo_password": "",
902-
"ilo_username": "",
903-
"ilo_verify_ca": false,
904-
},
905-
},
906-
907-
{
908-
Scenario: "ilo5",
909-
input: "ilo5://192.168.122.1",
910-
expects: map[string]interface{}{
911-
"ilo_address": "192.168.122.1",
912-
"ilo_password": "",
913-
"ilo_username": "",
914-
"ilo_verify_ca": false,
915-
},
916-
},
917-
918-
{
919-
Scenario: "ilo5 port",
920-
input: "ilo5://192.168.122.1:8080",
921-
expects: map[string]interface{}{
922-
"ilo_address": "192.168.122.1",
923-
"client_port": "8080",
924-
"ilo_password": "",
925-
"ilo_username": "",
926-
"ilo_verify_ca": false,
927-
},
928-
},
929-
930-
{
931-
Scenario: "ilo5 ipv6",
932-
input: "ilo5://[fe80::fc33:62ff:fe83:8a76]",
933-
expects: map[string]interface{}{
934-
"ilo_address": "fe80::fc33:62ff:fe83:8a76",
935-
"ilo_password": "",
936-
"ilo_username": "",
937-
"ilo_verify_ca": false,
938-
},
939-
},
940-
941-
{
942-
Scenario: "ilo5 ipv6 port",
943-
input: "ilo5://[fe80::fc33:62ff:fe83:8a76]:8080",
944-
expects: map[string]interface{}{
945-
"ilo_address": "fe80::fc33:62ff:fe83:8a76",
946-
"client_port": "8080",
947-
"ilo_password": "",
948-
"ilo_username": "",
949-
"ilo_verify_ca": false,
950-
},
951-
},
952753
} {
953754
t.Run(tc.Scenario, func(t *testing.T) {
954755
acc, err := NewAccessDetails(tc.input, true)
@@ -990,68 +791,6 @@ func TestBuildBIOSCleanSteps(t *testing.T) {
990791
expected []map[string]string
991792
expectedError bool
992793
}{
993-
// ilo4
994-
{
995-
name: "ilo4",
996-
address: "ilo4://192.168.122.1",
997-
firmware: &FirmwareConfig{
998-
VirtualizationEnabled: &True,
999-
SimultaneousMultithreadingEnabled: &False,
1000-
},
1001-
expected: []map[string]string{
1002-
{
1003-
"name": "ProcVirtualization",
1004-
"value": "Enabled",
1005-
},
1006-
{
1007-
"name": "ProcHyperthreading",
1008-
"value": "Disabled",
1009-
},
1010-
},
1011-
},
1012-
{
1013-
name: "ilo4, firmware is nil",
1014-
address: "ilo4://192.168.122.1",
1015-
firmware: nil,
1016-
expected: nil,
1017-
},
1018-
{
1019-
name: "ilo4, firmware is empty",
1020-
address: "ilo4://192.168.122.1",
1021-
firmware: &FirmwareConfig{},
1022-
expected: nil,
1023-
},
1024-
// ilo5
1025-
{
1026-
name: "ilo5",
1027-
address: "ilo5://192.168.122.1",
1028-
firmware: &FirmwareConfig{
1029-
VirtualizationEnabled: &True,
1030-
SimultaneousMultithreadingEnabled: &False,
1031-
},
1032-
expected: []map[string]string{
1033-
{
1034-
"name": "ProcVirtualization",
1035-
"value": "Enabled",
1036-
},
1037-
{
1038-
"name": "ProcHyperthreading",
1039-
"value": "Disabled",
1040-
},
1041-
},
1042-
},
1043-
{
1044-
name: "ilo5, firmware is nil",
1045-
address: "ilo5://192.168.122.1",
1046-
firmware: nil,
1047-
expected: nil,
1048-
},
1049-
{
1050-
name: "ilo5, firmware is empty",
1051-
address: "ilo5://192.168.122.1",
1052-
firmware: &FirmwareConfig{},
1053-
expected: nil,
1054-
},
1055794
// irmc
1056795
{
1057796
name: "irmc",

0 commit comments

Comments
 (0)