Supporting deployments on zos4 nodes #3497

maayarosama · 2024-10-03T05:28:53Z

Description

Supporting deployments on zos4 nodes from grid client and dashboard

Changes

Added a network light and machine light workloads
Adjusted workload types to contain the two newly added workloads
Added unit tests for the two new workload types
Added a ZNetworkLight primitive class to handle the creation of network light workload
Added a VMLightPrimitive primitive class to handle the creation of zmachine light workload
Updated the _createDeployment and create method to support zos4 deployments according to the node's features
Updated deployMerge and saveNetworks methods in TwinDeploymentHandler
Added getFeaturesFromFilters method in nodes and capacity module to set node's features according to the filters chosen by the user
Added extra filters in the FilterOptions class
Adjusted automated and manual node selection to consider features in filters
Added planetary, mycelium and wireguard filters to all solutions
Added a single_vm_zos4.ts script to deploy on a zos4 node
Added deployment_flow.md

Related Issues

Support zos4 deployments #3462

Tested Scenarios

Deployed two vms with single_vm_mycelium script

Node 168 which is a zos3 node
Node 255 which is a zos4 node

Go to Dashboard
1. In the deploy section, select any solution
2. In the automated node selection:
3. Adjust your filters to include only the Mycelium network
4. Reload the nodes.
5. Observe that both zos4 and zos3 nodes are listed.
6. Deploy on any node and it will pass (note: zos4 node used is 255)
7. Observe Deployment list
8. Navigate to Contracts list

Go to Dashboard
1. In the deploy section, select any solution
2. In the manual node selection:
3. Adjust your filters to include only the Mycelium network
4. Enter any node id
5. If the node has Mycelium as a feature no validation error will be shown
6. If the node doesn't have Mycelium as a feature validation error will be shown
Go to Dashboard
1. In the deploy section, select any solution
2. In the automated node selection:
3. Adjust your filters to include the Mycelium and wireguard networks
4. Enter node id == 259 and observe
5. Validation error will be shown stating the the node doesn't support wireguard

Checklist

…ode selection

…m and wireguard to filters in all solutions

…ethods to support zos4 deployments

…ork light primitive

…yment, removing unnecessary comments and adding descriptive ones

0oM4R

partial review will continue tmw

packages/playground/src/utils/deploy_vm.ts

packages/playground/src/components/node_selector/TfManualNodeSelector.vue

0oM4R · 2024-11-19T14:33:38Z

packages/grid_client/src/zos/zmachine_light.ts

+}
+
+class ZmachineLightNetwork {
+  //what is ValidateNested


please remove this comment

packages/grid_client/src/primitives/nodes.ts

packages/grid_client/src/modules/models.ts

0oM4R · 2024-11-19T14:45:05Z

packages/grid_client/src/modules/models.ts

@@ -142,6 +142,7 @@ class MachineModel {
  @Expose() @IsInt() @IsOptional() solutionProviderId?: number;
  @Expose() @IsString() @IsOptional() zlogsOutput?: string;
  @Expose() @IsString({ each: true }) @IsOptional() gpus?: string[];
+  @Expose() @IsString({ each: true }) @IsOptional() features?: string[];


do we need this ?

yes we do as it might be used like this

As I mentioned before, I think we should have an enum for the possible values inside the array

can we use the feature type here instead of the string ?

…n AddMachine filters and moving getFeatures method to utils

…ight

amiraabouhadid · 2024-12-10T10:17:22Z

was able to deploy micro vm with mycelium on node 168 , could not find other zos4 nodes

was able to successfully delete contract

amiraabouhadid · 2024-12-10T10:25:43Z

node 259 doesn't always disappear from the node selector when i add wireguard
node 168 is still visible even when i select wireguard

amiraabouhadid · 2024-12-10T11:40:26Z

Description

Supporting deployments on zos4 nodes from grid client and dashboard

Changes

Added a network light and machine light workloads

Adjusted workload types to contain the two newly added workloads

Added unit tests for the two new workload types

Added a ZNetworkLight primitive class to handle the creation of network light workload

Added a VMLightPrimitive primitive class to handle the creation of zmachine light workload

Updated the _createDeployment and create method to support zos4 deployments according to the node's features

Updated deployMerge and saveNetworks methods in TwinDeploymentHandler

Added getFeaturesFromFilters method in nodes and capacity module to set node's features according to the filters chosen by the user

Added extra filters in the FilterOptions class

Adjusted automated and manual node selection to consider features in filters

Added planetary, mycelium and wireguard filters to all solutions

Added a single_vm_zos4.ts script to deploy on a zos4 node

Added deployment_flow.md

Related Issues

Support zos4 deployments #3462

Tested Scenarios

Deployed two vms with single_vm_mycelium script

Node 168 which is a zos3 node

Node 255 which is a zos4 node

Go to Dashboard

In the deploy section, select any solution

In the automated node selection:

Adjust your filters to include only the Mycelium network

Reload the nodes.

Observe that both zos4 and zos3 nodes are listed.

Deploy on any node and it will pass (note: zos4 node used is 255)

Observe Deployment list

Navigate to Contracts list

Go to Dashboard

In the deploy section, select any solution

In the manual node selection:

Adjust your filters to include only the Mycelium network

Enter any node id and observe

Go to Dashboard

In the deploy section, select any solution

In the automated node selection:

Adjust your filters to include the Mycelium and wireguard networks

Enter node id == 259 and observe

Checklist

Tests included

Build pass

Documentation

Code format and docstrings

Screenshots/Video attached (needed for UI changes)

observe what ? in the tested scenarios please specify expected result

0oM4R

partial review will continue reviewing the other files

packages/grid_client/docs/deployment_flow.md

packages/grid_client/scripts/single_vm_zos4.ts

packages/grid_client/src/high_level/base.ts

packages/grid_client/src/helpers/types.ts

packages/grid_client/src/high_level/base.ts

packages/grid_client/src/high_level/machine.ts

packages/grid_client/src/modules/capacity.ts

0oM4R · 2024-12-10T11:52:09Z

packages/grid_client/src/modules/k8s.ts

i don't think that we are handling the case if the worker or master has unsupported features; we need to test this case

0oM4R · 2024-12-10T11:54:55Z

packages/grid_client/src/modules/models.ts

@@ -142,6 +142,7 @@ class MachineModel {
  @Expose() @IsInt() @IsOptional() solutionProviderId?: number;
  @Expose() @IsString() @IsOptional() zlogsOutput?: string;
  @Expose() @IsString({ each: true }) @IsOptional() gpus?: string[];
+  @Expose() @IsString({ each: true }) @IsOptional() features?: string[];


As I mentioned before, I think we should have an enum for the possible values inside the array

packages/grid_client/src/modules/models.ts

maayarosama · 2024-12-11T11:13:46Z

node 259 doesn't always disappear from the node selector when i add wireguard node 168 is still visible even when i select wireguard

node 168 isn't a zos4 node and it supports wireguard, please check its features here
As for node 259, I couldn't reproduce on automated nor manual filter, please give some more info
Find zos4 nodes here

maayarosama · 2024-12-11T11:18:20Z

Description

Supporting deployments on zos4 nodes from grid client and dashboard

Changes

Added a network light and machine light workloads

Adjusted workload types to contain the two newly added workloads

Added unit tests for the two new workload types

Added a ZNetworkLight primitive class to handle the creation of network light workload

Added a VMLightPrimitive primitive class to handle the creation of zmachine light workload

Updated the _createDeployment and create method to support zos4 deployments according to the node's features

Updated deployMerge and saveNetworks methods in TwinDeploymentHandler

Added getFeaturesFromFilters method in nodes and capacity module to set node's features according to the filters chosen by the user

Added extra filters in the FilterOptions class

Adjusted automated and manual node selection to consider features in filters

Added planetary, mycelium and wireguard filters to all solutions

Added a single_vm_zos4.ts script to deploy on a zos4 node

Added deployment_flow.md

Related Issues

Support zos4 deployments #3462

Tested Scenarios

Deployed two vms with single_vm_mycelium script

Node 168 which is a zos3 node

Node 255 which is a zos4 node

Go to Dashboard

In the deploy section, select any solution

In the automated node selection:

Adjust your filters to include only the Mycelium network

Reload the nodes.

Observe that both zos4 and zos3 nodes are listed.

Deploy on any node and it will pass (note: zos4 node used is 255)

Observe Deployment list

Navigate to Contracts list

Go to Dashboard

In the deploy section, select any solution

In the manual node selection:

Adjust your filters to include only the Mycelium network

Enter any node id and observe

Go to Dashboard

In the deploy section, select any solution

In the automated node selection:

Adjust your filters to include the Mycelium and wireguard networks

Enter node id == 259 and observe

Checklist

Tests included

Build pass

Documentation

Code format and docstrings

Screenshots/Video attached (needed for UI changes)

observe what ? in the tested scenarios please specify expected result

Adjusted test scenarios with expected result

packages/grid_client/scripts/applications/nodepilot.ts

…zmachine light in one condition to get rid of redundant code

packages/grid_client/scripts/single_vm_zos4.ts

packages/grid_client/src/primitives/nodes.ts

packages/grid_client/src/primitives/networklight.ts

packages/playground/src/components/manage_gateway_dialog.vue

packages/grid_client/src/high_level/base.ts

packages/grid_client/src/primitives/networklight.ts

…hineData, some updates in networklight primitive

packages/grid_client/src/modules/models.ts

packages/grid_client/src/high_level/base.ts

packages/grid_client/src/primitives/nodes.ts

packages/grid_client/src/primitives/vm.ts

packages/grid_client/src/primitives/nodes.ts

…ons and fixing scripts

0oM4R

node 249 is not listed in the node auto selector but it is valid on manual

packages/grid_client/docs/deployment_flow.md

maayarosama · 2024-12-18T10:40:36Z

node 249 is not listed in the node auto selector but it is valid on manual

Node 249 isn't a valid node as it has zero vcores, so the automated selection is right. After some debugging, I figured out that the manual selection doesn't validate cru, mru and sru. For some reason this switch isn't entered. As This's not related to my pr please open a new issue

maayarosama added 18 commits October 3, 2024 08:27

Supporting deployments on zos4 nodes

aa5ae9b

Fixing tests, adding vmlight primitive and adding a match method

2503bf6

Adding networklight class in primitives

2f61d6b

Merge branch 'development' into development_zos4

de4bab1

Updating networklight class in primitives

a9cdb25

Adjusting FilterOptions to support features in automatic and manual n…

84002ac

…ode selection

Merge branch 'development' into development_zos4

70c99cb

Adding wiregaurd to filters

212441e

Merge branch 'development' into development_zos4

8f3f19b

Adjusting getFeaturesFromFilters method and adding planetary, myceliu…

880c0fd

…m and wireguard to filters in all solutions

Updating networklight primitive class, create deployment and create m…

8419d9b

…ethods to support zos4 deployments

Adjusting load, NodeExists, addNode and getFreeSubnet methods in netw…

90a353d

…ork light primitive

Merge branch 'development' into development_zos4

391fedf

Updating getFeaturesFromFilters method

496aa5a

Fixing reservation network error, updating k8s to support zos4 deplo…

0b31535

…yment, removing unnecessary comments and adding descriptive ones

Merge branch 'development' into development_zos4

b25d63b

Added a script to deploy on a zos4 node

bab3ca6

Adding deployment flow doc

23d742a

maayarosama marked this pull request as ready for review November 17, 2024 15:23

maayarosama requested review from AhmedHanafy725, zaelgohary, MohamedElmdary, Mahmoud-Emad, amiraabouhadid, AlaaElattar, 0oM4R and samaradel as code owners November 17, 2024 15:23

xmonader requested a review from ramezsaeed November 18, 2024 11:38

0oM4R reviewed Nov 19, 2024

View reviewed changes

Resolving comments: removing unnecessary comments, adding wiregaurd i…

17c3ec9

…n AddMachine filters and moving getFeatures method to utils

maayarosama added 3 commits December 8, 2024 14:33

Merge branch 'development' into development_zos4

061df42

Added the required features in all scripts' filters

a80242c

Adjusting Supported interface in manage domains in case of zmachine-l…

4dc4508

…ight

0oM4R reviewed Dec 10, 2024

View reviewed changes

0oM4R reviewed Dec 11, 2024

View reviewed changes

packages/grid_client/scripts/applications/nodepilot.ts Outdated Show resolved Hide resolved

Adjust zos4 script and merging functionalites of delete zmachine and …

af39e90

…zmachine light in one condition to get rid of redundant code

0oM4R reviewed Dec 12, 2024

View reviewed changes

packages/grid_client/scripts/single_vm_zos4.ts Outdated Show resolved Hide resolved

0oM4R reviewed Dec 12, 2024

View reviewed changes

packages/grid_client/src/primitives/networklight.ts Outdated Show resolved Hide resolved

maayarosama added 2 commits December 15, 2024 10:30

Merge branch 'development' into development_zos4

b4778f9

Resolving comments: Addinf Features enum, using WorkloadTypes in Zmac…

af97202

…hineData, some updates in networklight primitive

maayarosama requested a review from 0oM4R December 15, 2024 09:42

0oM4R reviewed Dec 15, 2024

View reviewed changes

packages/grid_client/src/modules/models.ts Outdated Show resolved Hide resolved

0oM4R reviewed Dec 15, 2024

View reviewed changes

packages/grid_client/src/high_level/base.ts Outdated Show resolved Hide resolved

0oM4R reviewed Dec 15, 2024

View reviewed changes

packages/grid_client/src/primitives/nodes.ts Outdated Show resolved Hide resolved

packages/grid_client/src/primitives/vm.ts Outdated Show resolved Hide resolved

0oM4R reviewed Dec 15, 2024

View reviewed changes

packages/grid_client/src/primitives/nodes.ts Outdated Show resolved Hide resolved

maayarosama added 2 commits December 16, 2024 11:24

Merge branch 'development' into development_zos4

68f0c7b

Refactoring vm primitive file, adjusting features type in filtersOpti…

c553325

…ons and fixing scripts

maayarosama requested a review from 0oM4R December 16, 2024 12:16

0oM4R reviewed Dec 16, 2024

View reviewed changes

amiraabouhadid reviewed Dec 16, 2024

View reviewed changes

packages/grid_client/docs/deployment_flow.md Outdated Show resolved Hide resolved

maayarosama requested a review from 0oM4R December 18, 2024 10:41

Fixing typo in deployment flow readme file

0609f41

maayarosama requested a review from amiraabouhadid December 18, 2024 10:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Supporting deployments on zos4 nodes #3497

Supporting deployments on zos4 nodes #3497

maayarosama commented Oct 3, 2024 •

edited

Loading

0oM4R left a comment

0oM4R Nov 19, 2024

0oM4R Nov 19, 2024

maayarosama Nov 20, 2024

0oM4R Dec 10, 2024

0oM4R Dec 15, 2024

amiraabouhadid commented Dec 10, 2024 •

edited

Loading

amiraabouhadid commented Dec 10, 2024 •

edited

Loading

amiraabouhadid commented Dec 10, 2024

Description

Changes

Related Issues

Tested Scenarios

Checklist

0oM4R left a comment

0oM4R Dec 10, 2024

0oM4R Dec 10, 2024

maayarosama commented Dec 11, 2024

maayarosama commented Dec 11, 2024

Description

Changes

Related Issues

Tested Scenarios

Checklist

0oM4R left a comment

maayarosama commented Dec 18, 2024

Supporting deployments on zos4 nodes #3497

Are you sure you want to change the base?

Supporting deployments on zos4 nodes #3497

Conversation

maayarosama commented Oct 3, 2024 • edited Loading

Description

Changes

Related Issues

Tested Scenarios

Checklist

0oM4R left a comment

Choose a reason for hiding this comment

0oM4R Nov 19, 2024

Choose a reason for hiding this comment

0oM4R Nov 19, 2024

Choose a reason for hiding this comment

maayarosama Nov 20, 2024

Choose a reason for hiding this comment

0oM4R Dec 10, 2024

Choose a reason for hiding this comment

0oM4R Dec 15, 2024

Choose a reason for hiding this comment

amiraabouhadid commented Dec 10, 2024 • edited Loading

amiraabouhadid commented Dec 10, 2024 • edited Loading

amiraabouhadid commented Dec 10, 2024

Description

Changes

Related Issues

Tested Scenarios

Checklist

0oM4R left a comment

Choose a reason for hiding this comment

0oM4R Dec 10, 2024

Choose a reason for hiding this comment

0oM4R Dec 10, 2024

Choose a reason for hiding this comment

maayarosama commented Dec 11, 2024

maayarosama commented Dec 11, 2024

Description

Changes

Related Issues

Tested Scenarios

Checklist

0oM4R left a comment

Choose a reason for hiding this comment

maayarosama commented Dec 18, 2024

maayarosama commented Oct 3, 2024 •

edited

Loading

amiraabouhadid commented Dec 10, 2024 •

edited

Loading

amiraabouhadid commented Dec 10, 2024 •

edited

Loading