diff --git a/examples/threefold/grid/deploy/create_update_deployments.vsh b/examples/threefold/grid/deploy/create_update_deployments.vsh index d35693a0..b9776617 100755 --- a/examples/threefold/grid/deploy/create_update_deployments.vsh +++ b/examples/threefold/grid/deploy/create_update_deployments.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import json import log diff --git a/examples/threefold/grid/deploy/deploy_gw_fqdn.vsh b/examples/threefold/grid/deploy/deploy_gw_fqdn.vsh index 1c0994a8..0737bedf 100755 --- a/examples/threefold/grid/deploy/deploy_gw_fqdn.vsh +++ b/examples/threefold/grid/deploy/deploy_gw_fqdn.vsh @@ -1,7 +1,7 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run import freeflowuniverse.herolib.threefold.grid as tfgrid -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import log fn main() { diff --git a/examples/threefold/grid/deploy/deploy_gw_name.vsh b/examples/threefold/grid/deploy/deploy_gw_name.vsh index 64675c82..4b2e9a5d 100755 --- a/examples/threefold/grid/deploy/deploy_gw_name.vsh +++ b/examples/threefold/grid/deploy/deploy_gw_name.vsh @@ -1,7 +1,7 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run import freeflowuniverse.herolib.threefold.grid as tfgrid -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import log fn main() { diff --git a/examples/threefold/grid/deploy/deploy_vm.vsh b/examples/threefold/grid/deploy/deploy_vm.vsh index 93b37c0f..1ffc1b69 100755 --- a/examples/threefold/grid/deploy/deploy_vm.vsh +++ b/examples/threefold/grid/deploy/deploy_vm.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import json import log diff --git a/examples/threefold/grid/deploy/deploy_vm_high_level.vsh b/examples/threefold/grid/deploy/deploy_vm_high_level.vsh index df37cadf..e5dda2af 100755 --- a/examples/threefold/grid/deploy/deploy_vm_high_level.vsh +++ b/examples/threefold/grid/deploy/deploy_vm_high_level.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import log import os diff --git a/examples/threefold/grid/deploy/deploy_zdb.vsh b/examples/threefold/grid/deploy/deploy_zdb.vsh index 1a408407..b841bc58 100755 --- a/examples/threefold/grid/deploy/deploy_zdb.vsh +++ b/examples/threefold/grid/deploy/deploy_zdb.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import log diff --git a/examples/threefold/grid/deploy/holochain_vm.vsh b/examples/threefold/grid/deploy/holochain_vm.vsh index d27bd700..3b4cc7ed 100755 --- a/examples/threefold/grid/deploy/holochain_vm.vsh +++ b/examples/threefold/grid/deploy/holochain_vm.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import freeflowuniverse.herolib.threefold.grid3.gridproxy import flag diff --git a/examples/threefold/grid/deploy/vm_with_gw_name.vsh b/examples/threefold/grid/deploy/vm_with_gw_name.vsh index c514ba72..5d439489 100755 --- a/examples/threefold/grid/deploy/vm_with_gw_name.vsh +++ b/examples/threefold/grid/deploy/vm_with_gw_name.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import freeflowuniverse.herolib.threefold.grid3.gridproxy import freeflowuniverse.herolib.threefold.grid3.gridproxy.model { NodeFilter } diff --git a/examples/threefold/solana/seahorse_vm.vsh b/examples/threefold/solana/seahorse_vm.vsh index e844df93..558afe93 100755 --- a/examples/threefold/solana/seahorse_vm.vsh +++ b/examples/threefold/solana/seahorse_vm.vsh @@ -1,6 +1,6 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.grid as tfgrid import freeflowuniverse.herolib.threefold.grid3.gridproxy import time diff --git a/examples/threefold/tfgrid3deployer/gw_over_wireguard/gw_over_wireguard.vsh b/examples/threefold/tfgrid3deployer/gw_over_wireguard/gw_over_wireguard.vsh index 0f61eb3d..c4d76216 100755 --- a/examples/threefold/tfgrid3deployer/gw_over_wireguard/gw_over_wireguard.vsh +++ b/examples/threefold/tfgrid3deployer/gw_over_wireguard/gw_over_wireguard.vsh @@ -1,7 +1,7 @@ #!/usr/bin/env -S v -gc none -no-retry-compilation -d use_openssl -enable-globals -cg run import freeflowuniverse.herolib.threefold.grid3.gridproxy -import freeflowuniverse.herolib.threefold.tfgrid3deployer +import freeflowuniverse.herolib.threefold.grid3.deployer import freeflowuniverse.herolib.installers.threefold.griddriver import os import time diff --git a/examples/threefold/tfgrid3deployer/hetzner/hetzner.vsh b/examples/threefold/tfgrid3deployer/hetzner/hetzner.vsh index 4ff742d9..47380ba1 100644 --- a/examples/threefold/tfgrid3deployer/hetzner/hetzner.vsh +++ b/examples/threefold/tfgrid3deployer/hetzner/hetzner.vsh @@ -2,7 +2,7 @@ //#!/usr/bin/env -S v -gc none -cc tcc -d use_openssl -enable-globals -cg run import freeflowuniverse.herolib.threefold.grid3.gridproxy -import freeflowuniverse.herolib.threefold.tfgrid3deployer +import freeflowuniverse.herolib.threefold.grid3.deployer import freeflowuniverse.herolib.installers.threefold.griddriver import os import time diff --git a/examples/threefold/tfgrid3deployer/open_webui_gw/open_webui_gw.vsh b/examples/threefold/tfgrid3deployer/open_webui_gw/open_webui_gw.vsh index 0a123581..0f604257 100755 --- a/examples/threefold/tfgrid3deployer/open_webui_gw/open_webui_gw.vsh +++ b/examples/threefold/tfgrid3deployer/open_webui_gw/open_webui_gw.vsh @@ -2,7 +2,7 @@ //#!/usr/bin/env -S v -gc none -no-retry-compilation -cc tcc -d use_openssl -enable-globals -cg run import freeflowuniverse.herolib.threefold.grid3.gridproxy -import freeflowuniverse.herolib.threefold.tfgrid3deployer +import freeflowuniverse.herolib.threefold.grid3.deployer import freeflowuniverse.herolib.installers.threefold.griddriver import os import time diff --git a/examples/threefold/tfgrid3deployer/open_webui_gw/readme.md b/examples/threefold/tfgrid3deployer/open_webui_gw/readme.md index eae4560d..9b746d6d 100644 --- a/examples/threefold/tfgrid3deployer/open_webui_gw/readme.md +++ b/examples/threefold/tfgrid3deployer/open_webui_gw/readme.md @@ -8,7 +8,7 @@ This script automates the deployment of an OpenWebUI instance on the ThreeFold G - OpenSSL support enabled - herolib dependencies: - `freeflowuniverse.herolib.threefold.grid3.gridproxy` - - `freeflowuniverse.herolib.threefold.tfgrid3deployer` + - `freeflowuniverse.herolib.threefold.grid3.deployer` - `freeflowuniverse.herolib.installers.threefold.griddriver` ## Installation diff --git a/examples/threefold/tfgrid3deployer/tfgrid3deployer_example.vsh b/examples/threefold/tfgrid3deployer/tfgrid3deployer_example.vsh index 2167b143..e5102be1 100755 --- a/examples/threefold/tfgrid3deployer/tfgrid3deployer_example.vsh +++ b/examples/threefold/tfgrid3deployer/tfgrid3deployer_example.vsh @@ -1,7 +1,7 @@ #!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run import freeflowuniverse.herolib.threefold.grid3.gridproxy -import freeflowuniverse.herolib.threefold.tfgrid3deployer +import freeflowuniverse.herolib.threefold.grid3.deployer import freeflowuniverse.herolib.ui.console fn main() { diff --git a/examples/threefold/tfgrid3deployer/vm_gw_caddy/delete.vsh b/examples/threefold/tfgrid3deployer/vm_gw_caddy/delete.vsh index 8559a81d..1178ca99 100755 --- a/examples/threefold/tfgrid3deployer/vm_gw_caddy/delete.vsh +++ b/examples/threefold/tfgrid3deployer/vm_gw_caddy/delete.vsh @@ -1,7 +1,7 @@ #!/usr/bin/env -S v -gc none -cc tcc -d use_openssl -enable-globals -cg run import freeflowuniverse.herolib.threefold.grid3.gridproxy -import freeflowuniverse.herolib.threefold.tfgrid3deployer +import freeflowuniverse.herolib.threefold.grid3.deployer import freeflowuniverse.herolib.installers.threefold.griddriver import os import time diff --git a/examples/threefold/tfgrid3deployer/vm_gw_caddy/vm_gw_caddy.vsh b/examples/threefold/tfgrid3deployer/vm_gw_caddy/vm_gw_caddy.vsh index 8717b69d..70fad06b 100755 --- a/examples/threefold/tfgrid3deployer/vm_gw_caddy/vm_gw_caddy.vsh +++ b/examples/threefold/tfgrid3deployer/vm_gw_caddy/vm_gw_caddy.vsh @@ -2,7 +2,7 @@ //#!/usr/bin/env -S v -gc none -cc tcc -d use_openssl -enable-globals -cg run import freeflowuniverse.herolib.threefold.grid3.gridproxy -import freeflowuniverse.herolib.threefold.tfgrid3deployer +import freeflowuniverse.herolib.threefold.grid3.deployer import freeflowuniverse.herolib.installers.threefold.griddriver import os import time diff --git a/lib/threefold/grid3/deploy_tosort/deployment.v b/lib/threefold/grid3/deploy_tosort/deployment.v index ed7f85b2..f732b937 100644 --- a/lib/threefold/grid3/deploy_tosort/deployment.v +++ b/lib/threefold/grid3/deploy_tosort/deployment.v @@ -1,6 +1,6 @@ module deploy -import freeflowuniverse.herolib.threefold.grid.models as grid_models +import freeflowuniverse.herolib.threefold.grid3.models as grid_models import freeflowuniverse.herolib.data.paramsparser import freeflowuniverse.herolib.threefold.grid import freeflowuniverse.herolib.data.encoder diff --git a/lib/threefold/grid3/deployer/deployment.v b/lib/threefold/grid3/deployer/deployment.v index 4f85bfb6..a4353450 100644 --- a/lib/threefold/grid3/deployer/deployment.v +++ b/lib/threefold/grid3/deployer/deployment.v @@ -1,6 +1,6 @@ module deployer -import freeflowuniverse.herolib.threefold.grid.models as grid_models +import freeflowuniverse.herolib.threefold.grid3.models as grid_models import freeflowuniverse.herolib.threefold.grid import freeflowuniverse.herolib.ui.console import compress.zlib diff --git a/lib/threefold/grid3/deployer/deployment_setup.v b/lib/threefold/grid3/deployer/deployment_setup.v index 59e94462..f22e5155 100644 --- a/lib/threefold/grid3/deployer/deployment_setup.v +++ b/lib/threefold/grid3/deployer/deployment_setup.v @@ -1,7 +1,7 @@ // This file should only contains any functions, helpers that related to the deployment setup. module deployer -import freeflowuniverse.herolib.threefold.grid.models as grid_models +import freeflowuniverse.herolib.threefold.grid3.models as grid_models import freeflowuniverse.herolib.threefold.grid import freeflowuniverse.herolib.ui.console import rand diff --git a/lib/threefold/grid3/deployer/network.v b/lib/threefold/grid3/deployer/network.v index c7e315be..9bca92e9 100644 --- a/lib/threefold/grid3/deployer/network.v +++ b/lib/threefold/grid3/deployer/network.v @@ -1,6 +1,6 @@ module deployer -import freeflowuniverse.herolib.threefold.grid.models as grid_models +import freeflowuniverse.herolib.threefold.grid3.models as grid_models import freeflowuniverse.herolib.threefold.grid import freeflowuniverse.herolib.ui.console import json diff --git a/lib/threefold/grid3/deployer/utils.v b/lib/threefold/grid3/deployer/utils.v index 3deb5e5c..584e1aae 100644 --- a/lib/threefold/grid3/deployer/utils.v +++ b/lib/threefold/grid3/deployer/utils.v @@ -2,7 +2,7 @@ module deployer import freeflowuniverse.herolib.threefold.grid3.gridproxy import freeflowuniverse.herolib.threefold.grid -import freeflowuniverse.herolib.threefold.grid.models as grid_models +import freeflowuniverse.herolib.threefold.grid3.models as grid_models import freeflowuniverse.herolib.threefold.grid3.gridproxy.model as gridproxy_models import rand import freeflowuniverse.herolib.ui.console diff --git a/lib/threefold/grid3/deployer/zdbs.v b/lib/threefold/grid3/deployer/zdbs.v index 5ca672a7..695e3426 100644 --- a/lib/threefold/grid3/deployer/zdbs.v +++ b/lib/threefold/grid3/deployer/zdbs.v @@ -1,6 +1,6 @@ module deployer -import freeflowuniverse.herolib.threefold.grid.models as grid_models +import freeflowuniverse.herolib.threefold.grid3.models as grid_models // import freeflowuniverse.herolib.ui.console import json diff --git a/lib/threefold/grid3/deployer2_sort/deployer.v b/lib/threefold/grid3/deployer2_sort/deployer.v index b1218e36..c279df9d 100644 --- a/lib/threefold/grid3/deployer2_sort/deployer.v +++ b/lib/threefold/grid3/deployer2_sort/deployer.v @@ -4,7 +4,7 @@ import os import json import time import log -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models import freeflowuniverse.herolib.threefold.griddriver import freeflowuniverse.herolib.ui.console diff --git a/lib/threefold/grid3/deployer2_sort/graphql.v b/lib/threefold/grid3/deployer2_sort/graphql.v index 72a3b1d2..7d8c9713 100644 --- a/lib/threefold/grid3/deployer2_sort/graphql.v +++ b/lib/threefold/grid3/deployer2_sort/graphql.v @@ -4,7 +4,7 @@ import net.http import json import x.json2 import log -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models pub struct GraphQl { url string diff --git a/lib/threefold/grid3/deployer2_sort/rmb.v b/lib/threefold/grid3/deployer2_sort/rmb.v index 72e8b97a..32a26975 100644 --- a/lib/threefold/grid3/deployer2_sort/rmb.v +++ b/lib/threefold/grid3/deployer2_sort/rmb.v @@ -1,7 +1,7 @@ module deployer2 import json -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models // TODO: decode/encode the params/result here pub fn (mut d Deployer) rmb_deployment_changes(dst u32, contract_id u64) !string { diff --git a/lib/threefold/grid3/deployer2_sort/vm.v b/lib/threefold/grid3/deployer2_sort/vm.v index 0526cc43..1dc4ff79 100644 --- a/lib/threefold/grid3/deployer2_sort/vm.v +++ b/lib/threefold/grid3/deployer2_sort/vm.v @@ -3,7 +3,7 @@ module deployer2 import json import log import freeflowuniverse.herolib.builder -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models struct VMSpecs { deployment_name string diff --git a/lib/threefold/grid3/griddriver/utils.v b/lib/threefold/grid3/griddriver/utils.v index 167261c8..b7a163b3 100644 --- a/lib/threefold/grid3/griddriver/utils.v +++ b/lib/threefold/grid3/griddriver/utils.v @@ -1,7 +1,7 @@ module griddriver import os -import freeflowuniverse.herolib.threefold.grid.models +import freeflowuniverse.herolib.threefold.grid3.models pub fn (mut c Client) sign_deployment(hash string) !string { res := os.execute("griddriver sign --substrate \"${c.substrate}\" --mnemonics \"${c.mnemonic}\" --hash \"${hash}\"")