Merge branch 'development' of github.com:threefoldtech/tfgrid-sdk-ts into development_rewriteProfileManager

Author: 0oM4R

packages/grid_client/docs/network/mycelium_network.md

@@ -16,7 +16,7 @@ This configuration is set on [workload data](../../src/zos/zmachine.ts) and [net
 
 In case user needs to support mycelium:
 
-- flag `mycelium` field in workload with true, also the `planetary` field should be flagged with true.
+- flag `mycelium` field in workload with true.
 - User can support hex seed which ip will be generated from or they'll be generated automatically.
 - providing seeds, that's what makes ip fixed from anywhere.
   > Note user can't use same network seed in multiple nodes.

packages/grid_client/src/clients/tf-grid/contracts.ts

@@ -79,6 +79,9 @@ export interface GqlContracts {
 export interface GqlConsumption extends GqlContracts {
   contractBillReports: GqlContractBillReports[];
 }
+export interface GqlDiscountPackage {
+  contractBillReports: GqlContractBillReports[];
+}
 
 export interface GqlContractBillReports {
   id: string;
@@ -107,6 +110,11 @@ export interface GetConsumptionOptions {
   id: number;
 }
 
+export interface GetDiscountPackageOptions {
+  graphqlURL: string;
+  id: number;
+}
+
 export interface CancelMyContractOptions {
   graphqlURL: string;
 }
@@ -251,7 +259,37 @@ class TFContracts extends Contracts {
       throw err;
     }
   }
+  /**
+   * Get contract discount package
+   * @param {GetDiscountPackageOptions} options
+   * @returns {Promie<DiscountLevel>}
+   */
+  async getDiscountPackage(options: GetDiscountPackageOptions): Promise<DiscountLevel> {
+    const gqlClient = new Graphql(options.graphqlURL);
+
+    const body = `query getConsumption($contractId: BigInt!){
+            contractBillReports(where: {contractID_eq: $contractId} , orderBy: timestamp_DESC) {
+                discountReceived
+
+            }
+          }`;
+
+    try {
+      const response = await gqlClient.query(body, { contractId: options.id });
 
+      const gqlDiscountPackage: GqlDiscountPackage = response["data"] as GqlDiscountPackage;
+      const billReports = gqlDiscountPackage.contractBillReports;
+      if (billReports.length === 0) {
+        return "None";
+      } else {
+        const discountPackage = billReports[billReports.length - 1].discountReceived;
+        return discountPackage;
+      }
+    } catch (err) {
+      (err as Error).message = formatErrorMessage(`Error getting discount package for contract ${options.id}.`, err);
+      throw err;
+    }
+  }
   /**
    * Get contract consumption per hour in TFT.
    *

packages/grid_client/src/modules/contracts.ts

@@ -11,6 +11,7 @@ import * as PATH from "path";
 
 import {
   ContractsOverdue,
+  type DiscountLevel,
   GqlContracts,
   GqlNameContract,
   GqlNodeContract,
@@ -31,6 +32,7 @@ import {
   BatchCancelContractsModel,
   ContractCancelModel,
   ContractConsumption,
+  ContractDiscountPackage,
   ContractGetByNodeIdAndHashModel,
   ContractGetModel,
   ContractLockModel,
@@ -523,7 +525,19 @@ class Contracts {
   async setDedicatedNodeExtraFee(options: SetDedicatedNodeExtraFeesModel) {
     return (await this.client.contracts.setDedicatedNodeExtraFee(options)).apply();
   }
-
+  /**
+   * Get contract discount package
+   * @param {ContractDiscountPackage} options
+   * @returns {Promie<DiscountLevel>}
+   * @decorators
+   * - `@expose`: Exposes the method for external use.
+   * - `@validateInput`: Validates the input options.
+   */
+  @expose
+  @validateInput
+  async getDiscountPackage(options: ContractDiscountPackage): Promise<DiscountLevel> {
+    return this.client.contracts.getDiscountPackage({ id: options.id, graphqlURL: this.config.graphqlURL });
+  }
   /**
    * Get contract consumption per hour in TFT.
    *

packages/grid_client/src/modules/models.ts

@@ -390,6 +390,10 @@ class ContractConsumption {
   @Expose() @IsInt() @Min(1) id: number;
 }
 
+class ContractDiscountPackage {
+  @Expose() @IsInt() @Min(1) id: number;
+}
+
 class ContractLockModel extends ContractConsumption {}
 
 class TwinCreateModel {
@@ -635,6 +639,7 @@ class FilterOptions {
   @Expose() @IsOptional() @Transform(({ value }) => NodeStatus[value]) @IsEnum(NodeStatus) status?: NodeStatus;
   @Expose() @IsOptional() @IsString() region?: string;
   @Expose() @IsOptional() @IsBoolean() healthy?: boolean;
+  @Expose() @IsOptional() @IsInt() rentableOrRentedBy?: number;
   @Expose() @IsOptional() @IsBoolean() planetary?: boolean;
   @Expose() @IsOptional() @IsBoolean() mycelium?: boolean;
   @Expose() @IsOptional() @IsBoolean() wireguard?: boolean;
@@ -974,6 +979,7 @@ export {
   ContractsByTwinId,
   ContractsByAddress,
   ContractConsumption,
+  ContractDiscountPackage,
   ContractLockModel,
   TwinCreateModel,
   TwinGetModel,

packages/grid_client/src/primitives/nodes.ts

@@ -460,6 +460,7 @@ class Nodes {
       healthy: options.healthy,
       sort_by: SortBy.FreeCRU,
       sort_order: SortOrder.Desc,
+      rentable_or_rented_by: options.rentableOrRentedBy,
       features: options.features,
     };
 

packages/grid_client/src/zos/znet.ts

@@ -55,4 +55,4 @@ class Znet extends WorkloadData {
   }
 }
 
-export { Znet, Peer };
+export { Znet, Peer, Mycelium };

packages/grid_client/tests/modules/vm.test.ts

@@ -69,6 +69,7 @@ test("TC1228 - VM: Deploy a VM", async () => {
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
       features: [Features.wireguard],
+      nodeExclude: [11],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -88,6 +89,7 @@ test("TC1228 - VM: Deploy a VM", async () => {
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
       features: [Features.wireguard],
+      nodeExclude: [11],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -234,6 +236,7 @@ test("TC2847 - VM: Deploy a VM With Mycelium", async () => {
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
       features: [Features.wireguard],
+      nodeExclude: [11],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -253,6 +256,7 @@ test("TC2847 - VM: Deploy a VM With Mycelium", async () => {
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
       features: [Features.wireguard],
+      nodeExclude: [11],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -403,6 +407,7 @@ test("TC1229 - VM: Deploy a VM With a Disk", async () => {
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
       features: [Features.wireguard],
+      nodeExclude: [11],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -423,6 +428,7 @@ test("TC1229 - VM: Deploy a VM With a Disk", async () => {
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
       features: [Features.wireguard],
+      nodeExclude: [11],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -499,9 +505,9 @@ test("TC1229 - VM: Deploy a VM With a Disk", async () => {
     //Verify that the disk was added successfully.
     await ssh.execCommand("df -h").then(async function (result) {
       const splittedRes = result.stdout.split("\n");
-      log(splittedRes[4]);
-      expect(splittedRes[4]).toContain(mountPoint);
-      expect(splittedRes[4]).toContain(diskSize.toString());
+      log(splittedRes[5]);
+      expect(splittedRes[5]).toContain(mountPoint);
+      expect(splittedRes[5]).toContain(diskSize.toString());
     });
   } finally {
     //Disconnect from the machine
@@ -727,7 +733,11 @@ test("TC1230 - VM: Deploy Multiple VMs on Different Nodes", async () => {
         log(result.stdout);
         expect(result.stdout).toContain(vmEnvVarValue[maxIterations]);
       });
-
+      await ssh.execCommand("apk add util-linux").then(function (result) {
+        if (result.stderr) {
+          throw new Error("Failed to install util-linux");
+        }
+      });
       //Verify VM Resources(CPU)
       await ssh.execCommand("lscpu").then(async function (result) {
         const splittedRes = result.stdout.split("\n");