-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(test) add tests for custom fields on instances, profiles, projec…
…ts, networks, storage pools and storage volumes WD-9656 Signed-off-by: David Edler <david.edler@canonical.com>
- Loading branch information
Showing
11 changed files
with
344 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import { getInstanceEditValues, getInstancePayload } from "./instanceEdit"; | ||
| import { LxdInstance } from "types/instance"; | ||
|
|
||
| describe("conversion to form values and back with getInstanceEditValues and getInstancePayload", () => { | ||
| it("preserves custom main level field", () => { | ||
| type CustomPayload = LxdInstance & { "custom-key": string }; | ||
| const instance = { | ||
| config: {}, | ||
| devices: {}, | ||
| "custom-key": "custom-value", | ||
| } as unknown as LxdInstance; | ||
|
|
||
| const formValues = getInstanceEditValues(instance); | ||
| const payload = getInstancePayload(instance, formValues) as CustomPayload; | ||
|
|
||
| expect(payload["custom-key"]).toBe("custom-value"); | ||
| }); | ||
|
|
||
| it("preserves custom config field", () => { | ||
| const instance = { | ||
| devices: {}, | ||
| config: { | ||
| "custom-config-key": "custom-config-value", | ||
| }, | ||
| } as unknown as LxdInstance; | ||
|
|
||
| const formValues = getInstanceEditValues(instance); | ||
| const payload = getInstancePayload(instance, formValues); | ||
|
|
||
| expect(payload.config["custom-config-key"]).toBe("custom-config-value"); | ||
| }); | ||
|
|
||
| it("preserves limits", () => { | ||
| const instance = { | ||
| devices: {}, | ||
| config: { | ||
| "limits.memory": "2GB", | ||
| "limits.cpu": "2-3", | ||
| }, | ||
| } as unknown as LxdInstance; | ||
|
|
||
| const formValues = getInstanceEditValues(instance); | ||
| const payload = getInstancePayload(instance, formValues); | ||
|
|
||
| expect(payload.config["limits.cpu"]).toBe("2-3"); | ||
| expect(payload.config["limits.memory"]).toBe("2GB"); | ||
| }); | ||
|
|
||
| it("preserves custom devices", () => { | ||
| type DevicePayload = LxdInstance & { | ||
| devices: { grafananat: { connect: string } }; | ||
| }; | ||
| const instance = { | ||
| config: {}, | ||
| devices: { | ||
| grafananat: { | ||
| connect: "tcp:1.2.3.4:3000", | ||
| }, | ||
| }, | ||
| } as unknown as LxdInstance; | ||
|
|
||
| const formValues = getInstanceEditValues(instance); | ||
| const payload = getInstancePayload(instance, formValues) as DevicePayload; | ||
|
|
||
| expect(payload.devices.grafananat.connect).toBe("tcp:1.2.3.4:3000"); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import { toNetwork } from "pages/networks/forms/NetworkForm"; | ||
| import { LxdNetwork } from "types/network"; | ||
| import { toNetworkFormValues } from "util/networkForm"; | ||
|
|
||
| describe("conversion to form values and back with toNetworkFormValues and toNetwork", () => { | ||
| it("preserves custom main level field", () => { | ||
| type CustomPayload = LxdNetwork & { "custom-key": string }; | ||
| const network = { | ||
| config: {}, | ||
| "custom-key": "custom-value", | ||
| } as unknown as LxdNetwork; | ||
|
|
||
| const formValues = toNetworkFormValues(network); | ||
| const payload = toNetwork(formValues) as CustomPayload; | ||
|
|
||
| expect(payload["custom-key"]).toBe("custom-value"); | ||
| }); | ||
|
|
||
| it("preserves custom config field", () => { | ||
| const network = { | ||
| devices: {}, | ||
| config: { | ||
| "user.key": "custom-config-value", | ||
| }, | ||
| } as unknown as LxdNetwork; | ||
|
|
||
| const formValues = toNetworkFormValues(network); | ||
| const payload = toNetwork(formValues); | ||
|
|
||
| expect(payload.config?.["user.key"]).toBe("custom-config-value"); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import { getProfileEditValues } from "./instanceEdit"; | ||
| import { getProfilePayload } from "util/profileEdit"; | ||
| import { LxdProfile } from "types/profile"; | ||
|
|
||
| describe("conversion to form values and back with getProfileEditValues and getProfilePayload", () => { | ||
| it("preserves custom main level field", () => { | ||
| type CustomPayload = LxdProfile & { "custom-key": string }; | ||
| const profile = { | ||
| config: {}, | ||
| devices: {}, | ||
| "custom-key": "custom-value", | ||
| } as unknown as LxdProfile; | ||
|
|
||
| const formValues = getProfileEditValues(profile); | ||
| const payload = getProfilePayload(profile, formValues) as CustomPayload; | ||
|
|
||
| expect(payload["custom-key"]).toBe("custom-value"); | ||
| }); | ||
|
|
||
| it("preserves custom config field", () => { | ||
| const Profile = { | ||
| devices: {}, | ||
| config: { | ||
| "custom-config-key": "custom-config-value", | ||
| }, | ||
| } as unknown as LxdProfile; | ||
|
|
||
| const formValues = getProfileEditValues(Profile); | ||
| const payload = getProfilePayload(Profile, formValues); | ||
|
|
||
| expect(payload.config["custom-config-key"]).toBe("custom-config-value"); | ||
| }); | ||
|
|
||
| it("preserves limits", () => { | ||
| const Profile = { | ||
| devices: {}, | ||
| config: { | ||
| "limits.memory": "2GB", | ||
| "limits.cpu": "2-3", | ||
| }, | ||
| } as unknown as LxdProfile; | ||
|
|
||
| const formValues = getProfileEditValues(Profile); | ||
| const payload = getProfilePayload(Profile, formValues); | ||
|
|
||
| expect(payload.config["limits.cpu"]).toBe("2-3"); | ||
| expect(payload.config["limits.memory"]).toBe("2GB"); | ||
| }); | ||
|
|
||
| it("preserves custom devices", () => { | ||
| type DevicePayload = LxdProfile & { | ||
| devices: { grafananat: { connect: string } }; | ||
| }; | ||
| const Profile = { | ||
| config: {}, | ||
| devices: { | ||
| grafananat: { | ||
| connect: "tcp:1.2.3.4:3000", | ||
| }, | ||
| }, | ||
| } as unknown as LxdProfile; | ||
|
|
||
| const formValues = getProfileEditValues(Profile); | ||
| const payload = getProfilePayload(Profile, formValues) as DevicePayload; | ||
|
|
||
| expect(payload.devices.grafananat.connect).toBe("tcp:1.2.3.4:3000"); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { getProfileConfigKeys } from "util/instanceConfigFields"; | ||
| import { profileDetailPayload } from "pages/profiles/forms/ProfileDetailsForm"; | ||
| import { formDeviceToPayload } from "util/formDevices"; | ||
| import { resourceLimitsPayload } from "components/forms/ResourceLimitsForm"; | ||
| import { securityPoliciesPayload } from "components/forms/SecurityPoliciesForm"; | ||
| import { snapshotsPayload } from "components/forms/InstanceSnapshotsForm"; | ||
| import { cloudInitPayload } from "components/forms/CloudInitForm"; | ||
| import { getUnhandledKeyValues } from "util/formFields"; | ||
| import { EditProfileFormValues } from "pages/profiles/EditProfile"; | ||
| import { LxdProfile } from "types/profile"; | ||
|
|
||
| export const getProfilePayload = ( | ||
| profile: LxdProfile, | ||
| values: EditProfileFormValues, | ||
| ) => { | ||
| const handledConfigKeys = getProfileConfigKeys(); | ||
| const handledKeys = new Set(["name", "description", "devices", "config"]); | ||
|
|
||
| return { | ||
| ...profileDetailPayload(values), | ||
| devices: formDeviceToPayload(values.devices), | ||
| config: { | ||
| ...resourceLimitsPayload(values), | ||
| ...securityPoliciesPayload(values), | ||
| ...snapshotsPayload(values), | ||
| ...cloudInitPayload(values), | ||
| ...getUnhandledKeyValues(profile.config, handledConfigKeys), | ||
| }, | ||
| ...getUnhandledKeyValues(profile, handledKeys), | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { LxdProject } from "types/project"; | ||
| import { getProjectEditValues, getProjectPayload } from "util/projectEdit"; | ||
|
|
||
| describe("conversion to form values and back with getProjectEditValues and getProjectPayload", () => { | ||
| it("preserves custom main level field", () => { | ||
| type CustomPayload = LxdProject & { "custom-key": string }; | ||
| const project = { | ||
| config: {}, | ||
| "custom-key": "custom-value", | ||
| } as unknown as LxdProject; | ||
|
|
||
| const formValues = getProjectEditValues(project); | ||
| const payload = getProjectPayload(project, formValues) as CustomPayload; | ||
|
|
||
| expect(payload["custom-key"]).toBe("custom-value"); | ||
| }); | ||
|
|
||
| it("preserves custom config field", () => { | ||
| const project = { | ||
| devices: {}, | ||
| config: { | ||
| "user.key": "custom-config-value", | ||
| }, | ||
| } as unknown as LxdProject; | ||
|
|
||
| const formValues = getProjectEditValues(project); | ||
| const payload = getProjectPayload(project, formValues); | ||
|
|
||
| expect(payload.config?.["user.key"]).toBe("custom-config-value"); | ||
| }); | ||
| }); |
Oops, something went wrong.