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

Commit

Permalink
Merge pull request #168 from threefoldtech/development_remove_cli_fun…
Browse files Browse the repository at this point in the history
…ctions

Remove cli functions
  • Loading branch information
rawdaGastan committed Apr 11, 2023
2 parents 2e151eb + 2dee7d0 commit 7d4743a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 210 deletions.
45 changes: 0 additions & 45 deletions deployer/tf_plugin_client_projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@
package deployer

import (
"context"
"encoding/json"
"fmt"
"strconv"

"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/grid3-go/workloads"
"github.com/threefoldtech/zos/pkg/gridtypes"
)

// CancelByProjectName cancels a deployed project
Expand All @@ -36,43 +31,3 @@ func (t *TFPluginClient) CancelByProjectName(projectName string) error {
log.Info().Msgf("%s canceled", projectName)
return nil
}

func (t *TFPluginClient) getProjectWorkload(projectName, workload string) (gridtypes.Workload, gridtypes.Deployment, uint32, error) {
contracts, err := t.ContractsGetter.ListContractsOfProjectName(projectName)
if err != nil {
return gridtypes.Workload{}, gridtypes.Deployment{}, 0, errors.Wrapf(err, "could not load contracts for project %s", projectName)
}
var contractID uint64
var nodeID uint32

for _, contract := range contracts.NodeContracts {
var deploymentData workloads.DeploymentData
err := json.Unmarshal([]byte(contract.DeploymentData), &deploymentData)
if err != nil {
return gridtypes.Workload{}, gridtypes.Deployment{}, 0, errors.Wrapf(err, "failed to unmarshal deployment data %s", contract.DeploymentData)
}
if deploymentData.Type != workload || deploymentData.ProjectName != projectName {
continue
}
contractID, err = strconv.ParseUint(contract.ContractID, 0, 64)
if err != nil {
return gridtypes.Workload{}, gridtypes.Deployment{}, 0, errors.Wrapf(err, "could not parse contract %s into uint64", contract.ContractID)
}
nodeID = contract.NodeID
nodeClient, err := t.NcPool.GetNodeClient(t.SubstrateConn, nodeID)
if err != nil {
return gridtypes.Workload{}, gridtypes.Deployment{}, 0, errors.Wrapf(err, "failed to get node client for node %d", nodeID)
}
dl, err := nodeClient.DeploymentGet(context.Background(), contractID)
if err != nil {
return gridtypes.Workload{}, gridtypes.Deployment{}, 0, errors.Wrapf(err, "failed to get deployment %d from node %d", contractID, nodeID)
}
for _, workload := range dl.Workloads {
if workload.Name == gridtypes.Name(projectName) {
return workload, dl, nodeID, nil
}
}

}
return gridtypes.Workload{}, gridtypes.Deployment{}, 0, fmt.Errorf("failed to get workload of type %s and name %s", workload, projectName)
}
165 changes: 0 additions & 165 deletions deployer/tf_plugin_client_workloads.go

This file was deleted.

0 comments on commit 7d4743a

Please sign in to comment.