Listing deployments from contracts instead of kvstore

packages/grid_client/scripts/add_worker.ts

@@ -26,7 +26,8 @@ async function deleteWorker(client, worker) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "testk8s";
+  const grid3 = await getClient(`kubernetes/${name}`);
 
   const workerQueryOptions: FilterOptions = {
     cru: 2,
@@ -36,7 +37,7 @@ async function main() {
   };
 
   const worker: AddWorkerModel = {
-    deployment_name: "testk8s",
+    deployment_name: name,
     name: "worker2",
     node_id: +(await grid3.capacity.filterNodes(workerQueryOptions))[0].nodeId,
     cpu: 2,
@@ -53,10 +54,10 @@ async function main() {
   await addWorker(grid3, worker);
 
   //Get worker information
-  await getWorker(grid3, worker.deployment_name);
+  await getWorker(grid3, name);
 
   //Uncomment the line below to delete the worker
-  // await deleteWorker(grid3, { name: worker.name, deployment_name: worker.deployment_name });
+  // await deleteWorker(grid3, { name: worker.name, deployment_name: name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/caprover_leader.ts

@@ -25,7 +25,8 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "newVMS5";
+  const grid3 = await getClient(`caprover/${name}`);
 
   const vmQueryOptions: FilterOptions = {
     cru: 4,
@@ -35,7 +36,7 @@ async function main() {
   };
 
   const vms: MachinesModel = {
-    name: "newVMS5",
+    name,
     network: {
       name: "wedtest",
       ip_range: "10.249.0.0/16",
@@ -77,10 +78,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/caprover_worker.ts

@@ -24,7 +24,8 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "newVMS5";
+  const grid3 = await getClient(`caprover/${name}`);
 
   const vmQueryOptions: FilterOptions = {
     cru: 4,
@@ -34,7 +35,7 @@ async function main() {
   };
 
   const vms: MachinesModel = {
-    name: "newVMS6",
+    name,
     network: {
       name: "wedtest",
       ip_range: "10.249.0.0/16",
@@ -76,10 +77,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/client_loader.ts

@@ -23,11 +23,12 @@ if (network === undefined || mnemonic === undefined || ssh_key === undefined) {
   };
 }
 
-async function getClient(): Promise<GridClient> {
+async function getClient(projectName = ""): Promise<GridClient> {
   const gridClient = new GridClient({
     network: config.network,
     mnemonic: config.mnemonic,
     storeSecret: config.storeSecret,
+    projectName,
   });
   await gridClient.connect();
   return gridClient;

packages/grid_client/scripts/dynamic_single_vm.ts

@@ -24,7 +24,8 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "dynamicVMS";
+  const grid3 = await getClient(`vm/${name}`);
 
   const vmQueryOptions: FilterOptions = {
     cru: 1,
@@ -35,7 +36,7 @@ async function main() {
   };
 
   const vms: MachinesModel = {
-    name: "dynamicVMS",
+    name,
     network: {
       name: "dynamictest",
       ip_range: "10.249.0.0/16",
@@ -73,10 +74,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/kubernetes.ts

@@ -24,7 +24,8 @@ async function cancel(client, k8s) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "testk8s";
+  const grid3 = await getClient(`kubernetes/${name}`);
 
   const masterQueryOptions: FilterOptions = {
     cru: 2,
@@ -43,7 +44,7 @@ async function main() {
   };
 
   const k: K8SModel = {
-    name: "testk8s",
+    name,
     secret: "secret",
     network: {
       name: "monNetwork",
@@ -87,10 +88,10 @@ async function main() {
   await deploy(grid3, k);
 
   //Get the deployment
-  await getDeployment(grid3, k.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: k.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/kubernetes_mycelium.ts

@@ -24,10 +24,11 @@ async function cancel(client, k8s) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "testk8sMy";
+  const grid3 = await getClient(`kubernetes/${name}`);
 
   const k: K8SModel = {
-    name: "testk8sMy",
+    name,
     secret: "secret",
     network: {
       name: "monNetwork",
@@ -100,10 +101,10 @@ async function main() {
   await deploy(grid3, k);
 
   //Get the deployment
-  await getDeployment(grid3, k.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: k.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/kubernetes_with_qsfs.ts

@@ -38,7 +38,8 @@ async function deleteQsfs(client, qsfs) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "testk8sqsfs";
+  const grid3 = await getClient(`kubernetes/${name}`);
 
   const qsfs_name = "testQsfsK8sq1";
 
@@ -64,7 +65,7 @@ async function main() {
     farmId: 1,
   };
 
-  const qsfsNodes = [];
+  const qsfsNodes: number[] = [];
 
   const allNodes = await grid3.capacity.filterNodes(qsfsQueryOptions);
   if (allNodes.length >= 2) {
@@ -85,7 +86,7 @@ async function main() {
   };
 
   const k: K8SModel = {
-    name: "testk8sqsfs",
+    name,
     secret: "secret",
     network: {
       name: "k8sqsfsNetwork",
@@ -143,7 +144,7 @@ async function main() {
   await deploy(grid3, k);
 
   //Get the deployment
-  await getDeployment(grid3, k.name);
+  await getDeployment(grid3, name);
 
   // //Uncomment the line below to cancel the deployment
   // await cancel(grid3, { name: k.name });

packages/grid_client/scripts/multiple_vms.ts

@@ -24,7 +24,8 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "monVMS2";
+  const grid3 = await getClient(`vm/${name}`);
 
   const vmQueryOptions: FilterOptions = {
     cru: 1,
@@ -35,7 +36,7 @@ async function main() {
   };
 
   const vms: MachinesModel = {
-    name: "monVMS2",
+    name,
     network: {
       name: "monNetwork",
       ip_range: "10.238.0.0/16",
@@ -96,10 +97,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   // //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/single_vm.ts

@@ -24,10 +24,11 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "newVMS";
+  const grid3 = await getClient(`vm/${name}`);
 
   const vms: MachinesModel = {
-    name: "newVMS",
+    name,
     network: {
       name: "wedtest",
       ip_range: "10.249.0.0/16",
@@ -65,10 +66,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/single_vm_mycelium.ts

@@ -24,10 +24,11 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "newMY";
+  const grid3 = await getClient(`vm/${name}`);
 
   const vms: MachinesModel = {
-    name: "newMY",
+    name,
     network: {
       name: "hellotest",
       ip_range: "10.249.0.0/16",
@@ -72,10 +73,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }

packages/grid_client/scripts/vm_with_gpu.ts

@@ -24,7 +24,8 @@ async function cancel(client, vms) {
 }
 
 async function main() {
-  const grid3 = await getClient();
+  const name = "vmgpu";
+  const grid3 = await getClient(`vm/${name}`);
 
   const vmQueryOptions: FilterOptions = {
     cru: 8,
@@ -48,7 +49,7 @@ async function main() {
   }
 
   const vms: MachinesModel = {
-    name: "vmgpu",
+    name,
     network: {
       name: "vmgpuNetwork",
       ip_range: "10.249.0.0/16",
@@ -76,7 +77,7 @@ async function main() {
         env: {
           SSH_KEY: config.ssh_key,
         },
-        gpus: gpuList[0].id,
+        gpus: [gpuList[0].id],
       },
     ],
     metadata: "",
@@ -87,10 +88,10 @@ async function main() {
   await deploy(grid3, vms);
 
   //Get the deployment
-  await getDeployment(grid3, vms.name);
+  await getDeployment(grid3, name);
 
   //Uncomment the line below to cancel the deployment
-  // await cancel(grid3, { name: vms.name });
+  // await cancel(grid3, { name });
 
   await grid3.disconnect();
 }