Skip to content

Commit 340143b

Browse files
committed
Use generic SCSI TAPE product name and add more SCTP profiles
1 parent f3f9f8d commit 340143b

3 files changed

Lines changed: 29 additions & 27 deletions

File tree

‎cpp/devices/device_factory.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ shared_ptr<PrimaryDevice> DeviceFactory::CreateDevice(PbDeviceType type, int lun
9999

100100
case SCTP:
101101
device = make_shared<SCSIST>(lun);
102-
// Masquerade as Tandberg
103-
device->SetVendor("TANDBERG");
104-
device->SetProduct(" TDC Streamer");
102+
device->SetProduct("SCSI TAPE");
105103
break;
106104

107105
default:

‎cpp/test/device_factory_test.cpp‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -252,25 +252,5 @@ TEST(DeviceFactoryTest, SCLP_Device_Defaults)
252252

253253
TEST(DeviceFactoryTest, SCTP_Device_Defaults)
254254
{
255-
DeviceFactory device_factory;
256-
257-
auto device = device_factory.CreateDevice(UNDEFINED, 0, "test.tap");
258-
EXPECT_NE(nullptr, device);
259-
EXPECT_EQ(SCTP, device->GetType());
260-
EXPECT_TRUE(device->SupportsFile());
261-
EXPECT_FALSE(device->SupportsParams());
262-
EXPECT_TRUE(device->IsProtectable());
263-
EXPECT_FALSE(device->IsProtected());
264-
EXPECT_FALSE(device->IsReadOnly());
265-
EXPECT_TRUE(device->IsRemovable());
266-
EXPECT_FALSE(device->IsRemoved());
267-
EXPECT_TRUE(device->IsLockable());
268-
EXPECT_FALSE(device->IsLocked());
269-
EXPECT_TRUE(device->IsStoppable());
270-
EXPECT_FALSE(device->IsStopped());
271-
272-
EXPECT_EQ("TANDBERG", device->GetVendor());
273-
EXPECT_EQ(" TDC Streamer", device->GetProduct());
274-
EXPECT_EQ(string(piscsi_get_version_string()).substr(0, 2) + string(piscsi_get_version_string()).substr(3, 2),
275-
device->GetRevision());
255+
TestRemovableDrive(SCTP, "test.tap", "SCSI TAPE");
276256
}

‎python/web/src/drive_properties.json‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,33 @@
450450
"revision": null,
451451
"block_size": "",
452452
"size": 262144000,
453-
"name": "250 MB Cartridge",
453+
"name": "Tandberg TDC 3600",
454454
"file_type": "tap",
455-
"description": "DC 6250 Data Cartridge",
456-
"url": ""
455+
"description": "Tandberg TDC 3600 with DC6250 250 MB Data Cartridge",
456+
"url": "https://web.archive.org/web/20200325013232/http://www.bitsavers.org/pdf/tandbergData/TDC_3620_3640_3660_Reference_Manual.pdf"
457+
},
458+
{
459+
"device_type": "SCTP",
460+
"vendor": "TANDBERG",
461+
"product": " TDC 4100",
462+
"revision": null,
463+
"block_size": "",
464+
"size": 1073741824,
465+
"name": "Tandberg TDC 4100",
466+
"file_type": "tap",
467+
"description": "Tandberg TDC 4100 with DC9100 1 GB Data Cartridge",
468+
"url": "https://web.archive.org/web/20240526132933/http://bitsavers.org/pdf/tandbergData/423042_TDC_4000_Series_SCSI-2_Interface_Functional_Specifications_May97.pdf"
469+
},
470+
{
471+
"device_type": "SCTP",
472+
"vendor": "TANDBERG",
473+
"product": " TDC 4222",
474+
"revision": null,
475+
"block_size": "",
476+
"size": 2147483648,
477+
"name": "Tandberg TDC 4222",
478+
"file_type": "tap",
479+
"description": "Tandberg TDC 4222 with DC9200 2 GB Data Cartridge",
480+
"url": "https://web.archive.org/web/20240526132933/http://bitsavers.org/pdf/tandbergData/423042_TDC_4000_Series_SCSI-2_Interface_Functional_Specifications_May97.pdf"
457481
}
458482
]

0 commit comments

Comments
 (0)