Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

adding private network to vm & fullvm #1181

Merged
merged 4 commits into from
Dec 27, 2022
Merged

adding private network to vm & fullvm #1181

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbd4436
adding private network to vm & fullvm
zaelgohary Dec 25, 2022
8a91b54
Merge branch 'development' of https://github.com/threefoldtech/grid_w…
zaelgohary Dec 26, 2022
12555d3
Propagate the network fields to the deployment
AhmedHanafy725 Dec 27, 2022
ab1f7b6
Merge branch 'development' into development_VM_network
AhmedHanafy725 Dec 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/elements/fullvm/Fullvm.wc.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@
validateFlistvalue,
validateMemory,
validateDisk,
validatePrivateIPRange,
} from "../../utils/validateName";
import { noActiveProfile } from "../../utils/message";
import isInvalidFlist from "../../utils/isInvalidFlist";

const tabs: ITab[] = [
{ label: "Config", value: "config" },
{ label: "Disks", value: "disks" },
{ label: "Advanced", value: "advanced" },
];

let data = new Fullvm();
Expand All @@ -48,6 +50,12 @@

const nameField: IFormField = { label: "Name", placeholder: "Virtual Machine Name", symbol: "name", type: "text", validator: validateName, invalid: false }; // prettier-ignore

// prettier-ignore
const networkFields: IFormField[] = [
{ label: "Network Name", symbol: "name", placeholder: "Network Name", type: "text", validator: validateName , invalid: false},
{ label: "Network IP Range", symbol: "ipRange", placeholder: "xxx.xxx.0.0/16", type: "text", validator: validatePrivateIPRange, invalid: false },
];

// prettier-ignore
const flists: IFlist[] = [
{ name: "Ubuntu-18.04", url: "https://hub.grid.tf/tf-official-vms/ubuntu-18.04-lts.flist", entryPoint: "/init.sh" },
Expand Down Expand Up @@ -88,7 +96,7 @@
let failed = false;
let profile: IProfile;
let message: string;
let modalData: object;
let modalData: Record<string, unknown>;
let status: "valid" | "invalid";

data.disks = [new DiskFullVm(undefined, undefined, data.diskSize, "/"), ...data.disks];
Expand All @@ -108,7 +116,8 @@
if (value > 10000) return "Maximum allowed disk size is 10000 GB.";
}

$: disabled = ((loading || !data.valid) && !(success || failed)) || !profile || status !== "valid" || validateFlist.invalid || nameField.invalid || isInvalid([...baseFields]) || _isInvalidDisks(); // prettier-ignore
$: disabled = ((loading || !data.valid) && !(success || failed)) || !profile || status !== "valid" || validateFlist.invalid || nameField.invalid || isInvalid([...baseFields, ...networkFields]) || _isInvalidDisks(); // prettier-ignore

const currentDeployment = window.configs?.currentDeploymentStore;
const validateFlist = {
loading: false,
Expand Down Expand Up @@ -286,6 +295,10 @@
{/if}
{/each}
</div>
{:else if active === "advanced"}
{#each networkFields as field (field.symbol)}
<Input bind:data={data.network[field.symbol]} {field} />
{/each}
{/if}
{/if}

Expand Down
16 changes: 14 additions & 2 deletions src/elements/vm/Vm.wc.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
validateKey,
validateKeyValue,
validateMemory,
validatePrivateIPRange,
} from "../../utils/validateName";
import { noActiveProfile } from "../../utils/message";
import isInvalidFlist from "../../utils/isInvalidFlist";
Expand All @@ -34,6 +35,7 @@
{ label: "Config", value: "config" },
{ label: "Environment Variables", value: "env" },
{ label: "Disks", value: "disks" },
{ label: "Advanced", value: "advanced" },
];

let data = new VM();
Expand All @@ -49,6 +51,12 @@

const nameField: IFormField = { label: "Name", placeholder: "Virtual Machine Name", symbol: "name", type: "text", validator: validateName, invalid: false }; // prettier-ignore

// prettier-ignore
const networkFields: IFormField[] = [
{ label: "Network Name", symbol: "name", placeholder: "Network Name", type: "text", validator: validateName , invalid: false},
{ label: "Network IP Range", symbol: "ipRange", placeholder: "xxx.xxx.0.0/16", type: "text", validator: validatePrivateIPRange, invalid: false },
];

// prettier-ignore
const flists: IFlist[] = [
{ name: "Ubuntu-22.04", url: "https://hub.grid.tf/tf-official-apps/threefoldtech-ubuntu-22.04.flist", entryPoint: "/sbin/zinit init" },
Expand Down Expand Up @@ -95,7 +103,7 @@
let failed = false;
let profile: IProfile;
let message: string;
let modalData: object;
let modalData: Record<string, unknown>;
let status: "valid" | "invalid";

function _isInvalidDisks() {
Expand All @@ -107,7 +115,7 @@
return mounts.length !== mountSet.size || names.length !== nameSet.size;
}

$: disabled = ((loading || !data.valid) && !(success || failed)) || !profile || status !== "valid" || validateFlist.invalid || nameField.invalid || isInvalid([...baseFields,...envFields]) || _isInvalidDisks() || !(data.planetary || data.publicIp || data.publicIp6); // prettier-ignore
$: disabled = ((loading || !data.valid) && !(success || failed)) || !profile || status !== "valid" || validateFlist.invalid || nameField.invalid || isInvalid([...baseFields,...envFields, ...networkFields]) || _isInvalidDisks() || !(data.planetary || data.publicIp || data.publicIp6); // prettier-ignore
const currentDeployment = window.configs?.currentDeploymentStore;
const validateFlist = {
loading: false,
Expand Down Expand Up @@ -320,6 +328,10 @@
</div>
{/each}
</div>
{:else if active === "advanced"}
{#each networkFields as field (field.symbol)}
<Input bind:data={data.network[field.symbol]} {field} />
{/each}
{/if}
{/if}

Expand Down
5 changes: 3 additions & 2 deletions src/types/fullvm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class FullVM extends VM {
public rootFs = 0;
public diskSize = 50;
public get valid(): boolean {
const { name, diskSize, flist, entrypoint, envs, disks } = this;
const { network, name, diskSize, flist, entrypoint, envs, disks } = this;
return (
name !== "" &&
flist !== "" &&
Expand All @@ -23,7 +23,8 @@ export default class FullVM extends VM {
validateFlistvalue(flist) === undefined &&
validateEntryPoint(entrypoint) === undefined &&
envs.reduce((res, env) => res && env.valid, true) &&
disks.slice(1).reduce((res, disk) => res && disk.valid, true)
disks.slice(1).reduce((res, disk) => res && disk.valid, true) &&
network.valid
);
}
}
Expand Down