From 37cfd0a105d39dadb70343f570f461fe508a3f0c Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Sun, 28 Jul 2024 20:25:09 +0000 Subject: [PATCH 01/20] implementation of raid calculator with levels 0, 1, 5, 6, and 10 need to add descriptions yet --- components.d.ts | 17 ++- src/tools/index.ts | 3 +- src/tools/raid-calculator/index.ts | 12 ++ .../raid-calculator.e2e.spec.ts | 15 +++ .../raid-calculator.service.test.ts | 6 + .../raid-calculator.service.ts | 94 +++++++++++++++ src/tools/raid-calculator/raid-calculator.vue | 107 ++++++++++++++++++ 7 files changed, 247 insertions(+), 7 deletions(-) create mode 100644 src/tools/raid-calculator/index.ts create mode 100644 src/tools/raid-calculator/raid-calculator.e2e.spec.ts create mode 100644 src/tools/raid-calculator/raid-calculator.service.test.ts create mode 100644 src/tools/raid-calculator/raid-calculator.service.ts create mode 100644 src/tools/raid-calculator/raid-calculator.vue diff --git a/components.d.ts b/components.d.ts index f2c3146f..4164caa8 100644 --- a/components.d.ts +++ b/components.d.ts @@ -89,7 +89,9 @@ declare module '@vue/runtime-core' { HttpStatusCodes: typeof import('./src/tools/http-status-codes/http-status-codes.vue')['default'] IbanValidatorAndParser: typeof import('./src/tools/iban-validator-and-parser/iban-validator-and-parser.vue')['default'] 'IconMdi:brushVariant': typeof import('~icons/mdi/brush-variant')['default'] + 'IconMdi:contentCopy': typeof import('~icons/mdi/content-copy')['default'] 'IconMdi:kettleSteamOutline': typeof import('~icons/mdi/kettle-steam-outline')['default'] + IconMdiArrowRightBottom: typeof import('~icons/mdi/arrow-right-bottom')['default'] IconMdiChevronDown: typeof import('~icons/mdi/chevron-down')['default'] IconMdiChevronRight: typeof import('~icons/mdi/chevron-right')['default'] IconMdiClose: typeof import('~icons/mdi/close')['default'] @@ -126,25 +128,27 @@ declare module '@vue/runtime-core' { MenuLayout: typeof import('./src/components/MenuLayout.vue')['default'] MetaTagGenerator: typeof import('./src/tools/meta-tag-generator/meta-tag-generator.vue')['default'] MimeTypes: typeof import('./src/tools/mime-types/mime-types.vue')['default'] + NAlert: typeof import('naive-ui')['NAlert'] NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default'] - NCode: typeof import('naive-ui')['NCode'] NCollapseTransition: typeof import('naive-ui')['NCollapseTransition'] NConfigProvider: typeof import('naive-ui')['NConfigProvider'] + NDatePicker: typeof import('naive-ui')['NDatePicker'] NDivider: typeof import('naive-ui')['NDivider'] NEllipsis: typeof import('naive-ui')['NEllipsis'] + NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] - NGi: typeof import('naive-ui')['NGi'] - NGrid: typeof import('naive-ui')['NGrid'] NH1: typeof import('naive-ui')['NH1'] NH3: typeof import('naive-ui')['NH3'] NIcon: typeof import('naive-ui')['NIcon'] + NInputGroup: typeof import('naive-ui')['NInputGroup'] + NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel'] NInputNumber: typeof import('naive-ui')['NInputNumber'] - NLabel: typeof import('naive-ui')['NLabel'] NLayout: typeof import('naive-ui')['NLayout'] NLayoutSider: typeof import('naive-ui')['NLayoutSider'] NMenu: typeof import('naive-ui')['NMenu'] - NScrollbar: typeof import('naive-ui')['NScrollbar'] - NSpin: typeof import('naive-ui')['NSpin'] + NStatistic: typeof import('naive-ui')['NStatistic'] + NSwitch: typeof import('naive-ui')['NSwitch'] + NTable: typeof import('naive-ui')['NTable'] NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default'] OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default'] PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default'] @@ -153,6 +157,7 @@ declare module '@vue/runtime-core' { PercentageCalculator: typeof import('./src/tools/percentage-calculator/percentage-calculator.vue')['default'] PhoneParserAndFormatter: typeof import('./src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue')['default'] QrCodeGenerator: typeof import('./src/tools/qr-code-generator/qr-code-generator.vue')['default'] + RaidCalculator: typeof import('./src/tools/raid-calculator/raid-calculator.vue')['default'] RandomPortGenerator: typeof import('./src/tools/random-port-generator/random-port-generator.vue')['default'] ResultRow: typeof import('./src/tools/ipv4-range-expander/result-row.vue')['default'] RomanNumeralConverter: typeof import('./src/tools/roman-numeral-converter/roman-numeral-converter.vue')['default'] diff --git a/src/tools/index.ts b/src/tools/index.ts index aa861c93..da75b7a8 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -1,6 +1,7 @@ import { tool as base64FileConverter } from './base64-file-converter'; import { tool as base64StringConverter } from './base64-string-converter'; import { tool as basicAuthGenerator } from './basic-auth-generator'; +import { tool as raidCalculator } from './raid-calculator'; import { tool as asciiTextDrawer } from './ascii-text-drawer'; @@ -156,7 +157,7 @@ export const toolsByCategory: ToolCategory[] = [ }, { name: 'Math', - components: [mathEvaluator, etaCalculator, percentageCalculator], + components: [mathEvaluator, etaCalculator, percentageCalculator, raidCalculator], }, { name: 'Measurement', diff --git a/src/tools/raid-calculator/index.ts b/src/tools/raid-calculator/index.ts new file mode 100644 index 00000000..a22dbdab --- /dev/null +++ b/src/tools/raid-calculator/index.ts @@ -0,0 +1,12 @@ +import { Database } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'RAID Calculator', + path: '/raid-calculator', + description: 'Calculate storage capacity and fault tolerance of an array based on the number of disks, size, and RAID type', + keywords: ['raid', 'calculator'], + component: () => import('./raid-calculator.vue'), + icon: Database, + createdAt: new Date('2024-07-27'), +}); diff --git a/src/tools/raid-calculator/raid-calculator.e2e.spec.ts b/src/tools/raid-calculator/raid-calculator.e2e.spec.ts new file mode 100644 index 00000000..4838d0e1 --- /dev/null +++ b/src/tools/raid-calculator/raid-calculator.e2e.spec.ts @@ -0,0 +1,15 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Tool - RAID Calculator', () => { + test.beforeEach(async ({ page }) => { + await page.goto('/raid-calculator'); + }); + + test('Has correct title', async ({ page }) => { + await expect(page).toHaveTitle('RAID Calculator - IT Tools'); + }); + + test('', async ({ page }) => { + + }); +}); diff --git a/src/tools/raid-calculator/raid-calculator.service.test.ts b/src/tools/raid-calculator/raid-calculator.service.test.ts new file mode 100644 index 00000000..46812611 --- /dev/null +++ b/src/tools/raid-calculator/raid-calculator.service.test.ts @@ -0,0 +1,6 @@ +import { expect, describe, it } from 'vitest'; +// import { } from './raid-calculator.service'; +// +// describe('raid-calculator', () => { +// +// }) \ No newline at end of file diff --git a/src/tools/raid-calculator/raid-calculator.service.ts b/src/tools/raid-calculator/raid-calculator.service.ts new file mode 100644 index 00000000..b57b350d --- /dev/null +++ b/src/tools/raid-calculator/raid-calculator.service.ts @@ -0,0 +1,94 @@ +export { raidCalculations }; + +const raidCalculations = { + raid_0: { + about: 'RAID 0 splits data evenly across 2 or more disks with redunancy or fault tolerance. More info: Wikipedia', + requirements: 'RAID 0 requires at least 1 disk', + validate: function(num, size){ + return num > 1 + }, + capacity: function(num, size, unit){ + // total disks * size + return (num * size) * unit; + }, + speed: function(num, size, unit){ + return `${num}x read and ${num}x write speed gain`; + }, + fault: function(num, size, unit){ + return "None"; + } + }, + raid_1: { + about: 'RAID 1 consists of an exact copy of the data across two or moe disks. The array will operate as long as at least one drive is operational. More info: Wikipedia', + requirements: 'RAID 1 requires at least 1 disk', + validate: function(num, size){ + return num > 1 + }, + capacity: function(num, size, unit){ + // total size is size of a single drive + return size * unit; + }, + speed: function(num, size, unit){ + // potential for all drives read at once + return `Potential ${num}x read and no write speed gain`; + }, + fault: function(num, size, unit){ + // FT = total - 1 + return `${num -1} drive failures`; + } + }, + raid_5: { + about: 'This is RAID 5', + requirements: 'RAID 5 requires at least 3 disks', + validate: function(num, size){ + return num >= 3 + }, + capacity: function(num, size, unit){ + // (N-1) * S (one drive for parity) + return ((num - 1) * size) * unit; + }, + speed: function(num, size, unit){ + return `${num - 1}x read speed gain and write speed penalty (due to parity calculations)`; + }, + fault: function(num, size, unit){ + // always 1 failure + return "1 drive failure"; + } + }, + raid_6: { + about: 'This is RAID 6', + requirements: 'RAID 6 requires at least 4 disks', + validate: function(num, size){ + return num >= 4 + }, + capacity: function(num, size, unit){ + // (N-2) * S (2 parity) + return ((num - 2) * size) * unit; + }, + speed: function(num, size, unit){ + return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`; + }, + fault: function(num, size, unit){ + // always 2 drive failures + return "2 drive failures"; + } + }, + raid_10: { + about: 'RAID 10 is generally recognized as a stripe of mirrors (RAID 1 + RAID 2). Each set of drives is mirrored and striped together so that each drive in the set is fault tolerant within the group. More info: Wikipedia', + requirements: 'RAID 10 requires an even number of at least 4 disks', + validate: function(num, size){ + return num >= 4 && num % 2 == 0 + }, + capacity: function(num, size, unit){ + // Total disks (stripe)/2 (mirror) + return ((num * size) / 2) * unit; + }, + speed: function(num, size, unit){ + return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`; + }, + fault: function(num, size, unit){ + // always 2 drive failures + return "At least 1 drive failure per mirrored set"; + } + } +} diff --git a/src/tools/raid-calculator/raid-calculator.vue b/src/tools/raid-calculator/raid-calculator.vue new file mode 100644 index 00000000..6be056ff --- /dev/null +++ b/src/tools/raid-calculator/raid-calculator.vue @@ -0,0 +1,107 @@ + + + + + From 23b17f4e4771bf1641a145d37314da5ff24cee3d Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Mon, 29 Jul 2024 13:06:42 +0000 Subject: [PATCH 02/20] spacing --- src/tools/raid-calculator/raid-calculator.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/raid-calculator/raid-calculator.vue b/src/tools/raid-calculator/raid-calculator.vue index 6be056ff..c4a0c01f 100644 --- a/src/tools/raid-calculator/raid-calculator.vue +++ b/src/tools/raid-calculator/raid-calculator.vue @@ -64,6 +64,7 @@ function formatBytes(bytes: number, decimals = 2) { Wikipedia', + about: 'RAID 0 the splits data evenly across 2 or more disks without redunancy or fault tolerance creating one large storage space. More info: Wikipedia', requirements: 'RAID 0 requires at least 1 disk', validate: function(num, size){ return num > 1 @@ -19,7 +19,7 @@ const raidCalculations = { } }, raid_1: { - about: 'RAID 1 consists of an exact copy of the data across two or moe disks. The array will operate as long as at least one drive is operational. More info: Wikipedia', + about: 'RAID 1 consists of an exact copy of the data (mirror) across two or more disks. The array will operate as long as at least one drive is operational. More info: Wikipedia', requirements: 'RAID 1 requires at least 1 disk', validate: function(num, size){ return num > 1 @@ -38,7 +38,7 @@ const raidCalculations = { } }, raid_5: { - about: 'This is RAID 5', + about: 'RAID 5 uses block level striping with parity. This allows for fault tolerance with a storage reduction equal to one drive for the parity information. More info: Wikipedia', requirements: 'RAID 5 requires at least 3 disks', validate: function(num, size){ return num >= 3 @@ -56,7 +56,7 @@ const raidCalculations = { } }, raid_6: { - about: 'This is RAID 6', + about: 'RAID 6 is similiar to RAID 5 but with an additional parity block. This allows for an additional disk failure at the cost of storage reduction equal to two drives. More info: Wikipedia', requirements: 'RAID 6 requires at least 4 disks', validate: function(num, size){ return num >= 4 @@ -74,7 +74,7 @@ const raidCalculations = { } }, raid_10: { - about: 'RAID 10 is generally recognized as a stripe of mirrors (RAID 1 + RAID 2). Each set of drives is mirrored and striped together so that each drive in the set is fault tolerant within the group. More info: Wikipedia', + about: 'RAID 10 is generally recognized as a stripe of mirrors (RAID 1 + RAID 0). Each set of drives is mirrored and striped together so that each drive in the set is fault tolerant within the group. More info: Wikipedia', requirements: 'RAID 10 requires an even number of at least 4 disks', validate: function(num, size){ return num >= 4 && num % 2 == 0 @@ -87,8 +87,8 @@ const raidCalculations = { return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`; }, fault: function(num, size, unit){ - // always 2 drive failures - return "At least 1 drive failure per mirrored set"; + // one per mirror + return "1 drive failure per mirrored set"; } } } From 43da51fa76ed562b6eb219512a1285ddeb282664 Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Mon, 29 Jul 2024 13:20:05 +0000 Subject: [PATCH 04/20] removed speed - not used --- .../raid-calculator/raid-calculator.service.ts | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/tools/raid-calculator/raid-calculator.service.ts b/src/tools/raid-calculator/raid-calculator.service.ts index acf398b3..162029ae 100644 --- a/src/tools/raid-calculator/raid-calculator.service.ts +++ b/src/tools/raid-calculator/raid-calculator.service.ts @@ -11,9 +11,6 @@ const raidCalculations = { // total disks * size return (num * size) * unit; }, - speed: function(num, size, unit){ - return `${num}x read and ${num}x write speed gain`; - }, fault: function(num, size, unit){ return "None"; } @@ -28,10 +25,6 @@ const raidCalculations = { // total size is size of a single drive return size * unit; }, - speed: function(num, size, unit){ - // potential for all drives read at once - return `Potential ${num}x read and no write speed gain`; - }, fault: function(num, size, unit){ // FT = total - 1 return `${num -1} drive failures`; @@ -47,9 +40,6 @@ const raidCalculations = { // (N-1) * S (one drive for parity) return ((num - 1) * size) * unit; }, - speed: function(num, size, unit){ - return `${num - 1}x read speed gain and write speed penalty (due to parity calculations)`; - }, fault: function(num, size, unit){ // always 1 failure return "1 drive failure"; @@ -65,9 +55,6 @@ const raidCalculations = { // (N-2) * S (2 parity) return ((num - 2) * size) * unit; }, - speed: function(num, size, unit){ - return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`; - }, fault: function(num, size, unit){ // always 2 drive failures return "2 drive failures"; @@ -83,9 +70,6 @@ const raidCalculations = { // Total disks (stripe)/2 (mirror) return ((num * size) / 2) * unit; }, - speed: function(num, size, unit){ - return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`; - }, fault: function(num, size, unit){ // one per mirror return "1 drive failure per mirrored set"; From 54d9351a4250884c5af773fbae8d1cbbe76fda21 Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Mon, 29 Jul 2024 13:21:35 +0000 Subject: [PATCH 05/20] always show description --- src/tools/raid-calculator/raid-calculator.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/raid-calculator/raid-calculator.vue b/src/tools/raid-calculator/raid-calculator.vue index c4a0c01f..d244074b 100644 --- a/src/tools/raid-calculator/raid-calculator.vue +++ b/src/tools/raid-calculator/raid-calculator.vue @@ -88,7 +88,7 @@ function formatBytes(bytes: number, decimals = 2) { />

{{ raidRequirements }}

-

+

From c5ba4f356fba0adcb5355e1eb528399dfdac97a7 Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Mon, 29 Jul 2024 13:32:13 +0000 Subject: [PATCH 06/20] use table for display --- src/tools/raid-calculator/raid-calculator.vue | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/tools/raid-calculator/raid-calculator.vue b/src/tools/raid-calculator/raid-calculator.vue index d244074b..ef60166b 100644 --- a/src/tools/raid-calculator/raid-calculator.vue +++ b/src/tools/raid-calculator/raid-calculator.vue @@ -91,12 +91,20 @@ function formatBytes(bytes: number, decimals = 2) {

- - {{ calculatedCapacity }} - - - {{ calculatedFaultTolerance }} - + + + + Capacity + {{ calculatedCapacity }} + + + Fault Tolerance + + {{ calculatedFaultTolerance }} + + + + From ea6b3d0c3885d5a14349333c74b05ee4b4c5dff3 Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Mon, 29 Jul 2024 13:52:05 +0000 Subject: [PATCH 07/20] added enum to use base 2 or base 10 for calcs --- src/utils/convert.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/utils/convert.ts b/src/utils/convert.ts index 9eac1921..f834a1c3 100644 --- a/src/utils/convert.ts +++ b/src/utils/convert.ts @@ -1,9 +1,14 @@ -export function formatBytes(bytes: number, decimals = 2) { +export enum UNIT_BASE { + BASE_2 = 1024, + BASE_10 = 1000 +} + +export function formatBytes(bytes: number, decimals = 2, base: UNIT_BASE = UNIT_BASE.BASE_2) { if (bytes === 0) { return '0 Bytes'; } - const k = 1024; + const k = base; const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; const i = Math.floor(Math.log(bytes) / Math.log(k)); From d2554a7bc34b5bd22a746df3fee774307781b156 Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Mon, 29 Jul 2024 13:52:23 +0000 Subject: [PATCH 08/20] use built in converter --- src/tools/raid-calculator/raid-calculator.vue | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/tools/raid-calculator/raid-calculator.vue b/src/tools/raid-calculator/raid-calculator.vue index ef60166b..7cdea8ef 100644 --- a/src/tools/raid-calculator/raid-calculator.vue +++ b/src/tools/raid-calculator/raid-calculator.vue @@ -1,5 +1,5 @@