From 1008cc7bc6bba3d67b9d516bce0df809d68a73aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 7 Mar 2022 18:07:12 -0500 Subject: [PATCH 01/12] lxd/instance/qemu: Set spawn=allow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit spawn=allow is required when QEMU is asked to daemonize. Previous QEMU versions would incorrectly block `fork` when spawn=deny was passed while allowing clone to succeed. This was then making it possible for us to use daemnize thanks to most Linux distributions using the clone syscall to implement fork. Current QEMU has fixed their seccomp profile to block both fork and clone, preventing -daemonize when spawn=deny is passed. Signed-off-by: Stéphane Graber Signed-off-by: Simon Deziel --- lxd/instance/drivers/driver_qemu.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go index d6a934960d51..aeb9f8427627 100644 --- a/lxd/instance/drivers/driver_qemu.go +++ b/lxd/instance/drivers/driver_qemu.go @@ -1286,7 +1286,7 @@ func (d *qemu) Start(stateful bool) error { "-serial", "chardev:console", "-nodefaults", "-no-user-config", - "-sandbox", "on,obsolete=deny,elevateprivileges=allow,spawn=deny,resourcecontrol=deny", + "-sandbox", "on,obsolete=deny,elevateprivileges=allow,spawn=allow,resourcecontrol=deny", "-readconfig", confFile, "-spice", d.spiceCmdlineConfig(), "-pidfile", d.pidFilePath(), From 06888e27b6f0a298b704b063978cf64805944868 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 14:30:08 -0400 Subject: [PATCH 02/12] *: mass rename github.com/lxc/lxd -> github.com/canonical/lxd Signed-off-by: Simon Deziel --- client/connection.go | 6 +- client/events.go | 2 +- client/interfaces.go | 6 +- client/lxd.go | 6 +- client/lxd_certificates.go | 2 +- client/lxd_cluster.go | 2 +- client/lxd_containers.go | 10 +- client/lxd_events.go | 4 +- client/lxd_images.go | 10 +- client/lxd_instances.go | 12 +- client/lxd_network_acls.go | 2 +- client/lxd_network_forwards.go | 2 +- client/lxd_network_peer.go | 2 +- client/lxd_network_zones.go | 2 +- client/lxd_networks.go | 2 +- client/lxd_operations.go | 2 +- client/lxd_profiles.go | 2 +- client/lxd_projects.go | 2 +- client/lxd_server.go | 4 +- client/lxd_storage_pools.go | 2 +- client/lxd_storage_volumes.go | 10 +- client/lxd_warnings.go | 2 +- client/operations.go | 2 +- client/simplestreams.go | 2 +- client/simplestreams_images.go | 4 +- client/util.go | 2 +- doc/database.md | 2 +- doc/rest-api.yaml | 320 +++++++++--------- doc/security.md | 2 +- fuidshift/main.go | 2 +- fuidshift/main_shift.go | 2 +- go.mod | 2 +- lxc-to-lxd/config.go | 2 +- lxc-to-lxd/main.go | 2 +- lxc-to-lxd/main_migrate.go | 12 +- lxc-to-lxd/main_netcat.go | 2 +- lxc-to-lxd/transfer.go | 6 +- lxc-to-lxd/utils.go | 4 +- lxc/action.go | 12 +- lxc/alias.go | 6 +- lxc/cluster.go | 12 +- lxc/config.go | 12 +- lxc/config/cert.go | 2 +- lxc/config/file.go | 2 +- lxc/config/remote.go | 4 +- lxc/config_device.go | 4 +- lxc/config_metadata.go | 10 +- lxc/config_template.go | 10 +- lxc/config_trust.go | 10 +- lxc/console.go | 14 +- lxc/console_unix.go | 2 +- lxc/copy.go | 14 +- lxc/delete.go | 10 +- lxc/exec.go | 12 +- lxc/exec_unix.go | 4 +- lxc/exec_windows.go | 4 +- lxc/export.go | 12 +- lxc/file.go | 18 +- lxc/image.go | 14 +- lxc/image_alias.go | 8 +- lxc/import.go | 14 +- lxc/info.go | 14 +- lxc/init.go | 14 +- lxc/launch.go | 8 +- lxc/list.go | 18 +- lxc/list_test.go | 4 +- lxc/main.go | 16 +- lxc/main_aliases.go | 6 +- lxc/main_test.go | 2 +- lxc/manpage.go | 6 +- lxc/monitor.go | 12 +- lxc/move.go | 10 +- lxc/network.go | 14 +- lxc/operation.go | 6 +- lxc/profile.go | 12 +- lxc/project.go | 12 +- lxc/publish.go | 12 +- lxc/query.go | 6 +- lxc/remote.go | 14 +- lxc/rename.go | 4 +- lxc/restore.go | 8 +- lxc/snapshot.go | 8 +- lxc/storage.go | 14 +- lxc/storage_volume.go | 14 +- lxc/utils.go | 8 +- lxc/utils/cancel.go | 4 +- lxc/utils/progress.go | 6 +- lxc/utils/table.go | 2 +- lxc/utils_test.go | 2 +- lxc/version.go | 6 +- lxd-agent/api.go | 2 +- lxd-agent/api_1.0.go | 8 +- lxd-agent/daemon.go | 2 +- lxd-agent/devlxd.go | 10 +- lxd-agent/events.go | 6 +- lxd-agent/exec.go | 16 +- lxd-agent/main.go | 2 +- lxd-agent/main_agent.go | 12 +- lxd-agent/network.go | 4 +- lxd-agent/operations.go | 10 +- lxd-agent/server.go | 8 +- lxd-agent/sftp.go | 2 +- lxd-agent/state.go | 6 +- lxd-agent/templates.go | 4 +- lxd-benchmark/benchmark/benchmark.go | 8 +- lxd-benchmark/benchmark/operation.go | 4 +- lxd-benchmark/main.go | 8 +- lxd-benchmark/main_delete.go | 2 +- lxd-benchmark/main_init.go | 2 +- lxd-benchmark/main_launch.go | 2 +- lxd-benchmark/main_start.go | 2 +- lxd-benchmark/main_stop.go | 2 +- lxd-p2c/main.go | 2 +- lxd-p2c/main_migrate.go | 6 +- lxd-p2c/main_netcat.go | 2 +- lxd-p2c/transfer.go | 6 +- lxd-p2c/utils.go | 10 +- lxd/api.go | 14 +- lxd/api_1.0.go | 34 +- lxd/api_cluster.go | 34 +- lxd/api_cluster_test.go | 8 +- lxd/api_internal.go | 38 +-- lxd/api_internal_recover.go | 30 +- lxd/api_internal_test.go | 2 +- lxd/api_networks_test.go | 2 +- lxd/api_project.go | 26 +- lxd/api_storage_pools_test.go | 2 +- lxd/apparmor/apparmor.go | 6 +- lxd/apparmor/archive.go | 4 +- lxd/apparmor/instance.go | 12 +- lxd/apparmor/instance_forkproxy.go | 10 +- lxd/apparmor/network.go | 2 +- lxd/apparmor/network_dnsmasq.go | 4 +- lxd/apparmor/network_forkdns.go | 6 +- lxd/archive/archive.go | 12 +- lxd/backup.go | 40 +-- lxd/backup/backup_common.go | 2 +- lxd/backup/backup_config.go | 12 +- lxd/backup/backup_info.go | 4 +- lxd/backup/backup_instance.go | 12 +- lxd/backup/backup_utils.go | 6 +- lxd/certificates.go | 32 +- lxd/cgroup/abstraction.go | 2 +- lxd/cgroup/file.go | 2 +- lxd/cgroup/init.go | 4 +- lxd/cluster/config.go | 6 +- lxd/cluster/config_test.go | 4 +- lxd/cluster/connect.go | 20 +- lxd/cluster/events.go | 14 +- lxd/cluster/gateway.go | 14 +- lxd/cluster/gateway_export_test.go | 4 +- lxd/cluster/gateway_test.go | 8 +- lxd/cluster/heartbeat.go | 14 +- lxd/cluster/heartbeat_test.go | 12 +- lxd/cluster/info.go | 8 +- lxd/cluster/membership.go | 16 +- lxd/cluster/membership_test.go | 12 +- lxd/cluster/migrate.go | 4 +- lxd/cluster/migrate_test.go | 4 +- lxd/cluster/notify.go | 12 +- lxd/cluster/notify_test.go | 16 +- lxd/cluster/raft_test.go | 6 +- lxd/cluster/recover.go | 4 +- lxd/cluster/resolve.go | 2 +- lxd/cluster/tls.go | 8 +- lxd/cluster/upgrade.go | 10 +- lxd/cluster/upgrade_test.go | 8 +- lxd/config/map.go | 2 +- lxd/config/map_test.go | 2 +- lxd/config/safe.go | 2 +- lxd/config/safe_test.go | 2 +- lxd/config/schema.go | 2 +- lxd/config/schema_test.go | 2 +- lxd/config/validators_test.go | 2 +- lxd/daemon.go | 60 ++-- lxd/daemon_config.go | 10 +- lxd/daemon_images.go | 30 +- lxd/daemon_integration_test.go | 8 +- lxd/daemon_storage.go | 16 +- lxd/db/backups.go | 2 +- lxd/db/certificates.go | 4 +- lxd/db/certificates.mapper.go | 6 +- lxd/db/certificates_test.go | 2 +- lxd/db/cluster/constants.go | 2 +- lxd/db/cluster/open.go | 14 +- lxd/db/cluster/open_test.go | 8 +- lxd/db/cluster/query.go | 2 +- lxd/db/cluster/update.go | 10 +- lxd/db/cluster/update_test.go | 6 +- lxd/db/config.go | 2 +- lxd/db/config.mapper.go | 4 +- lxd/db/config_test.go | 2 +- lxd/db/db.go | 10 +- lxd/db/db_internal_test.go | 6 +- lxd/db/db_test.go | 4 +- lxd/db/devices.mapper.go | 4 +- lxd/db/generate/db.go | 6 +- lxd/db/generate/db/constants.go | 6 +- lxd/db/generate/db/lex.go | 2 +- lxd/db/generate/db/mapping.go | 4 +- lxd/db/generate/db/method.go | 4 +- lxd/db/generate/db/parse.go | 4 +- lxd/db/generate/db/parse_test.go | 2 +- lxd/db/generate/db/schema.go | 4 +- lxd/db/generate/db/stmt.go | 4 +- lxd/db/generate/lex/parse.go | 2 +- lxd/db/generate/lex/parse_test.go | 2 +- lxd/db/images.go | 8 +- lxd/db/images.mapper.go | 8 +- lxd/db/images_test.go | 2 +- lxd/db/instance_profiles.mapper.go | 6 +- lxd/db/instances.go | 10 +- lxd/db/instances.mapper.go | 8 +- lxd/db/instances_test.go | 8 +- lxd/db/legacy.go | 2 +- lxd/db/migration.go | 6 +- lxd/db/migration_test.go | 4 +- lxd/db/networks.go | 8 +- lxd/db/networks_test.go | 2 +- lxd/db/node.go | 14 +- lxd/db/node/open.go | 6 +- lxd/db/node/open_test.go | 2 +- lxd/db/node/update.go | 10 +- lxd/db/node/update_test.go | 6 +- lxd/db/node_test.go | 8 +- lxd/db/operations.go | 2 +- lxd/db/operations.mapper.go | 6 +- lxd/db/operations_test.go | 2 +- lxd/db/patches.go | 2 +- lxd/db/profiles.go | 4 +- lxd/db/profiles.mapper.go | 8 +- lxd/db/projects.go | 6 +- lxd/db/projects.mapper.go | 8 +- lxd/db/projects_test.go | 2 +- lxd/db/query/config_test.go | 2 +- lxd/db/query/count_test.go | 2 +- lxd/db/query/dump_test.go | 2 +- lxd/db/query/objects_test.go | 2 +- lxd/db/query/retry.go | 2 +- lxd/db/query/slices_test.go | 2 +- lxd/db/query/transaction.go | 2 +- lxd/db/query/transaction_test.go | 2 +- lxd/db/raft.go | 2 +- lxd/db/raft_test.go | 2 +- lxd/db/schema/query.go | 4 +- lxd/db/schema/schema.go | 4 +- lxd/db/schema/schema_test.go | 6 +- lxd/db/schema/update_test.go | 4 +- lxd/db/snapshots.go | 2 +- lxd/db/snapshots.mapper.go | 6 +- lxd/db/snapshots_test.go | 4 +- lxd/db/storage_pools.go | 6 +- lxd/db/storage_pools_export_test.go | 2 +- lxd/db/storage_pools_test.go | 2 +- lxd/db/storage_volume_snapshots.go | 4 +- lxd/db/storage_volumes.go | 8 +- lxd/db/storage_volumes_test.go | 2 +- lxd/device/config/device_runconfig.go | 2 +- lxd/device/device_common.go | 12 +- lxd/device/device_interface.go | 8 +- lxd/device/device_load.go | 10 +- lxd/device/device_utils_disk.go | 14 +- lxd/device/device_utils_generic.go | 2 +- lxd/device/device_utils_gpu.go | 2 +- lxd/device/device_utils_infiniband.go | 6 +- lxd/device/device_utils_instance.go | 2 +- lxd/device/device_utils_network.go | 22 +- lxd/device/device_utils_proxy.go | 8 +- lxd/device/device_utils_unix.go | 12 +- lxd/device/device_utils_unix_events.go | 10 +- .../device_utils_unix_hotplug_events.go | 8 +- lxd/device/device_utils_usb_events.go | 8 +- lxd/device/disk.go | 32 +- lxd/device/gpu.go | 2 +- lxd/device/gpu_mdev.go | 14 +- lxd/device/gpu_mig.go | 14 +- lxd/device/gpu_physical.go | 14 +- lxd/device/gpu_sriov.go | 16 +- lxd/device/infiniband_physical.go | 12 +- lxd/device/infiniband_sriov.go | 16 +- lxd/device/nic.go | 6 +- lxd/device/nic_bridged.go | 30 +- lxd/device/nic_ipvlan.go | 16 +- lxd/device/nic_macvlan.go | 14 +- lxd/device/nic_p2p.go | 12 +- lxd/device/nic_physical.go | 18 +- lxd/device/nic_routed.go | 18 +- lxd/device/nic_sriov.go | 12 +- lxd/device/nictype/nictype.go | 4 +- lxd/device/none.go | 4 +- lxd/device/pci/pci.go | 4 +- lxd/device/pci/pci_test.go | 2 +- lxd/device/proxy.go | 26 +- lxd/device/unix_common.go | 14 +- lxd/device/unix_hotplug.go | 10 +- lxd/device/usb.go | 12 +- lxd/devices.go | 20 +- lxd/devlxd.go | 22 +- lxd/devlxd_test.go | 4 +- lxd/dnsmasq/dhcpalloc/dhcpalloc.go | 8 +- lxd/dnsmasq/dnsmasq.go | 10 +- lxd/endpoints/cluster.go | 8 +- lxd/endpoints/devlxd_test.go | 2 +- lxd/endpoints/endpoints.go | 8 +- lxd/endpoints/endpoints_exported_test.go | 4 +- lxd/endpoints/endpoints_test.go | 10 +- lxd/endpoints/listeners/fancytls.go | 4 +- lxd/endpoints/listeners/starttls.go | 4 +- lxd/endpoints/local_test.go | 2 +- lxd/endpoints/network.go | 8 +- lxd/endpoints/network_test.go | 2 +- lxd/endpoints/network_util.go | 2 +- lxd/endpoints/pprof.go | 6 +- lxd/endpoints/socket.go | 6 +- lxd/events.go | 12 +- lxd/events/common.go | 4 +- lxd/events/devlxdEvents.go | 4 +- lxd/events/events.go | 6 +- lxd/events/logging.go | 2 +- lxd/filter/clause.go | 2 +- lxd/filter/clause_test.go | 2 +- lxd/filter/match_test.go | 4 +- lxd/filter/value_test.go | 4 +- lxd/firewall/drivers/drivers_nftables.go | 6 +- lxd/firewall/drivers/drivers_xtables.go | 10 +- lxd/firewall/firewall_interface.go | 2 +- lxd/firewall/firewall_load.go | 4 +- lxd/fsmonitor/drivers/common.go | 2 +- lxd/fsmonitor/drivers/driver_fsnotify.go | 2 +- lxd/fsmonitor/drivers/interface.go | 2 +- lxd/fsmonitor/drivers/load.go | 2 +- lxd/fsmonitor/fsmonitor.go | 4 +- lxd/fsmonitor/load.go | 8 +- lxd/images.go | 46 +-- lxd/init.go | 8 +- lxd/instance.go | 24 +- lxd/instance/drivers/driver_common.go | 36 +- lxd/instance/drivers/driver_lxc.go | 60 ++-- lxd/instance/drivers/driver_lxc_cmd.go | 4 +- lxd/instance/drivers/driver_qemu.go | 64 ++-- lxd/instance/drivers/driver_qemu_cmd.go | 6 +- lxd/instance/drivers/load.go | 20 +- lxd/instance/drivers/qmp/commands.go | 4 +- lxd/instance/drivers/qmp/monitor.go | 2 +- lxd/instance/drivers/test_util.go | 4 +- lxd/instance/filter.go | 4 +- lxd/instance/instance_interface.go | 16 +- lxd/instance/instance_utils.go | 36 +- lxd/instance/instancetype/instance_type.go | 2 +- lxd/instance/operationlock/operationlock.go | 4 +- lxd/instance_backup.go | 22 +- lxd/instance_console.go | 20 +- lxd/instance_delete.go | 10 +- lxd/instance_exec.go | 26 +- lxd/instance_file.go | 12 +- lxd/instance_get.go | 4 +- lxd/instance_instance_types.go | 14 +- lxd/instance_logs.go | 14 +- lxd/instance_metadata.go | 16 +- lxd/instance_patch.go | 18 +- lxd/instance_post.go | 26 +- lxd/instance_put.go | 24 +- lxd/instance_snapshot.go | 26 +- lxd/instance_state.go | 12 +- lxd/instance_test.go | 20 +- lxd/instances.go | 16 +- lxd/instances_get.go | 24 +- lxd/instances_post.go | 34 +- lxd/ip/addr.go | 2 +- lxd/ip/class.go | 2 +- lxd/ip/filter.go | 2 +- lxd/ip/link.go | 2 +- lxd/ip/neigh.go | 4 +- lxd/ip/neigh_proxy.go | 4 +- lxd/ip/qdisc.go | 2 +- lxd/ip/route.go | 2 +- lxd/ip/tuntap.go | 2 +- lxd/lifecycle/certificate.go | 2 +- lxd/lifecycle/cluster.go | 2 +- lxd/lifecycle/cluster_member.go | 2 +- lxd/lifecycle/config.go | 2 +- lxd/lifecycle/image.go | 4 +- lxd/lifecycle/image_alias.go | 4 +- lxd/lifecycle/instance.go | 6 +- lxd/lifecycle/instance_backup.go | 6 +- lxd/lifecycle/instance_log.go | 4 +- lxd/lifecycle/instance_metadata.go | 4 +- lxd/lifecycle/instance_metadata_template.go | 4 +- lxd/lifecycle/instance_snapshot.go | 6 +- lxd/lifecycle/network.go | 4 +- lxd/lifecycle/operation.go | 2 +- lxd/lifecycle/profile.go | 4 +- lxd/lifecycle/project.go | 2 +- lxd/lifecycle/storage_pool.go | 4 +- lxd/lifecycle/storage_volume.go | 6 +- lxd/lifecycle/storage_volume_snapshot.go | 8 +- lxd/logging.go | 18 +- lxd/maas/controller.go | 2 +- lxd/main.go | 16 +- lxd/main_activateifneeded.go | 16 +- lxd/main_callhook.go | 2 +- lxd/main_checkfeature.go | 6 +- lxd/main_cluster.go | 18 +- lxd/main_daemon.go | 4 +- lxd/main_forkcoresched.go | 2 +- lxd/main_forkdns.go | 10 +- lxd/main_forkexec.go | 2 +- lxd/main_forkmount.go | 2 +- lxd/main_forknet.go | 6 +- lxd/main_forkproxy.go | 12 +- lxd/main_forkproxy_test.go | 4 +- lxd/main_forkstart.go | 2 +- lxd/main_forksyscall.go | 2 +- lxd/main_forkusernsexec.go | 2 +- lxd/main_forkzfs.go | 2 +- lxd/main_init.go | 10 +- lxd/main_init_auto.go | 10 +- lxd/main_init_dump.go | 4 +- lxd/main_init_interactive.go | 22 +- lxd/main_init_preseed.go | 2 +- lxd/main_manpage.go | 2 +- lxd/main_migratedumpsuccess.go | 4 +- lxd/main_netcat.go | 4 +- lxd/main_nsexec.go | 2 +- lxd/main_recover.go | 8 +- lxd/main_shutdown.go | 2 +- lxd/main_sql.go | 4 +- lxd/main_test.go | 8 +- lxd/main_version.go | 4 +- lxd/main_waitready.go | 4 +- lxd/migrate.go | 18 +- lxd/migrate_instance.go | 28 +- lxd/migrate_storage_volumes.go | 18 +- lxd/migration/migration_volumes.go | 8 +- lxd/migration/wsproto.go | 2 +- lxd/network/driver_bridge.go | 42 +-- lxd/network/driver_common.go | 24 +- lxd/network/network_interface.go | 12 +- lxd/network/network_load.go | 2 +- lxd/network/network_utils.go | 30 +- lxd/network/network_utils_bridge.go | 6 +- lxd/network/network_utils_sriov.go | 14 +- lxd/network/openvswitch/ovs.go | 2 +- lxd/networks.go | 36 +- lxd/networks_utils.go | 10 +- lxd/node/config.go | 10 +- lxd/node/config_test.go | 4 +- lxd/node/raft.go | 2 +- lxd/node/raft_test.go | 4 +- lxd/operations.go | 26 +- lxd/operations/linux.go | 2 +- lxd/operations/notlinux.go | 2 +- lxd/operations/operations.go | 20 +- lxd/operations/response.go | 12 +- lxd/operations/websocket.go | 4 +- lxd/patches.go | 36 +- lxd/patches_utils.go | 12 +- lxd/profiles.go | 28 +- lxd/profiles_utils.go | 14 +- lxd/project/permissions.go | 14 +- lxd/project/permissions_test.go | 8 +- lxd/project/project.go | 4 +- lxd/project/project_test.go | 2 +- lxd/rbac/requests.go | 4 +- lxd/rbac/server.go | 4 +- lxd/request/request.go | 2 +- lxd/resources.go | 8 +- lxd/resources/cpu.go | 2 +- lxd/resources/gpu.go | 2 +- lxd/resources/memory.go | 4 +- lxd/resources/network.go | 2 +- lxd/resources/network_ethtool.go | 2 +- lxd/resources/pci.go | 2 +- lxd/resources/resources.go | 2 +- lxd/resources/storage.go | 2 +- lxd/resources/system.go | 2 +- lxd/resources/usb.go | 4 +- lxd/response.go | 6 +- lxd/response/response.go | 10 +- lxd/response/smart.go | 4 +- lxd/revert/revert_test.go | 2 +- lxd/rsync/rsync.go | 8 +- lxd/seccomp/seccomp.go | 24 +- lxd/snapshot_common.go | 2 +- lxd/snapshot_common_test.go | 8 +- lxd/state/notlinux.go | 2 +- lxd/state/state.go | 18 +- lxd/state/testing.go | 6 +- lxd/storage.go | 20 +- lxd/storage/backend_lxd.go | 44 +-- lxd/storage/backend_lxd_patches.go | 16 +- lxd/storage/backend_mock.go | 22 +- lxd/storage/drivers/driver_btrfs.go | 16 +- lxd/storage/drivers/driver_btrfs_utils.go | 8 +- lxd/storage/drivers/driver_btrfs_volumes.go | 20 +- lxd/storage/drivers/driver_ceph.go | 14 +- lxd/storage/drivers/driver_ceph_utils.go | 10 +- lxd/storage/drivers/driver_ceph_volumes.go | 22 +- lxd/storage/drivers/driver_cephfs.go | 12 +- lxd/storage/drivers/driver_cephfs_utils.go | 2 +- lxd/storage/drivers/driver_cephfs_volumes.go | 18 +- lxd/storage/drivers/driver_common.go | 8 +- lxd/storage/drivers/driver_dir.go | 6 +- lxd/storage/drivers/driver_dir_utils.go | 6 +- lxd/storage/drivers/driver_dir_volumes.go | 18 +- lxd/storage/drivers/driver_lvm.go | 14 +- lxd/storage/drivers/driver_lvm_patches.go | 4 +- lxd/storage/drivers/driver_lvm_utils.go | 12 +- lxd/storage/drivers/driver_lvm_volumes.go | 18 +- lxd/storage/drivers/driver_mock.go | 12 +- lxd/storage/drivers/driver_zfs.go | 16 +- lxd/storage/drivers/driver_zfs_patches.go | 2 +- lxd/storage/drivers/driver_zfs_utils.go | 8 +- lxd/storage/drivers/driver_zfs_volumes.go | 24 +- lxd/storage/drivers/generic_vfs.go | 26 +- lxd/storage/drivers/interface.go | 16 +- lxd/storage/drivers/load.go | 4 +- lxd/storage/drivers/utils.go | 8 +- lxd/storage/drivers/utils_cgo.go | 2 +- lxd/storage/drivers/volume.go | 14 +- lxd/storage/filesystem/fs.go | 2 +- lxd/storage/load.go | 18 +- lxd/storage/pool_interface.go | 18 +- lxd/storage/quota/projectquota.go | 2 +- lxd/storage/storage.go | 6 +- lxd/storage/utils.go | 40 +-- lxd/storage_migration.go | 10 +- lxd/storage_pools.go | 28 +- lxd/storage_pools_config.go | 8 +- lxd/storage_pools_utils.go | 16 +- lxd/storage_volumes.go | 26 +- lxd/storage_volumes_snapshot.go | 26 +- lxd/storage_volumes_utils.go | 16 +- lxd/swagger.go | 4 +- lxd/sys/apparmor.go | 6 +- lxd/sys/os.go | 12 +- lxd/task/group_test.go | 2 +- lxd/task/task_test.go | 2 +- lxd/ucred/ucred.go | 4 +- lxd/util/config.go | 2 +- lxd/util/config_test.go | 2 +- lxd/util/encryption.go | 2 +- lxd/util/http.go | 4 +- lxd/util/kernel.go | 2 +- lxd/util/net.go | 4 +- lxd/util/net_test.go | 4 +- lxd/util/storage.go | 6 +- lxd/util/sys.go | 2 +- lxd/vsock/vsock.go | 2 +- shared/cert.go | 2 +- shared/cert_test.go | 2 +- shared/cmd/ask.go | 2 +- shared/eagain/file_unix.go | 2 +- shared/idmap/idmapset_linux.go | 4 +- shared/idmap/shift_linux.go | 6 +- shared/instance.go | 6 +- shared/instancewriter/instance_tar_writer.go | 6 +- shared/logging/log.go | 2 +- shared/netutils/network_linux.go | 4 +- shared/netutils/network_linux_cgo.go | 2 +- shared/network.go | 2 +- shared/simplestreams/products.go | 6 +- shared/simplestreams/simplestreams.go | 6 +- shared/simplestreams/sort.go | 4 +- shared/subprocess/proc.go | 2 +- shared/util.go | 6 +- shared/util_linux.go | 4 +- shared/util_linux_cgo.go | 2 +- shared/validate/validate.go | 4 +- shared/validate/validate_test.go | 2 +- shared/version/platform_linux.go | 4 +- shared/version/useragent.go | 2 +- test/godeps.list | 18 +- 573 files changed, 2604 insertions(+), 2604 deletions(-) diff --git a/client/connection.go b/client/connection.go index fea30801ba4d..bd8ef7cb06b4 100644 --- a/client/connection.go +++ b/client/connection.go @@ -15,9 +15,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/macaroon-bakery.v2/httpbakery" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/simplestreams" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/simplestreams" ) // ConnectionArgs represents a set of common connection properties diff --git a/client/events.go b/client/events.go index 3ccdf6d8a27c..33466e8aeeb5 100644 --- a/client/events.go +++ b/client/events.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // The EventListener struct is used to interact with a LXD event stream diff --git a/client/interfaces.go b/client/interfaces.go index 57a06ce4efd9..6af34159841f 100644 --- a/client/interfaces.go +++ b/client/interfaces.go @@ -8,9 +8,9 @@ import ( "github.com/gorilla/websocket" "github.com/pkg/sftp" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" ) // The Operation type represents a currently running operation. diff --git a/client/lxd.go b/client/lxd.go index a34458ca2743..e3f7bda2d82e 100644 --- a/client/lxd.go +++ b/client/lxd.go @@ -14,9 +14,9 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery" "gopkg.in/macaroon-bakery.v2/httpbakery" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" neturl "net/url" ) diff --git a/client/lxd_certificates.go b/client/lxd_certificates.go index 2ec516fded20..6b1e98e3914f 100644 --- a/client/lxd_certificates.go +++ b/client/lxd_certificates.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Certificate handling functions diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go index bc6e70bebc4c..d9106798f620 100644 --- a/client/lxd_cluster.go +++ b/client/lxd_cluster.go @@ -3,7 +3,7 @@ package lxd import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetCluster returns information about a cluster diff --git a/client/lxd_containers.go b/client/lxd_containers.go index 8db498963b9d..96e58e797e04 100644 --- a/client/lxd_containers.go +++ b/client/lxd_containers.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Container handling functions diff --git a/client/lxd_events.go b/client/lxd_events.go index a5280db75ceb..e9e2e6d4c041 100644 --- a/client/lxd_events.go +++ b/client/lxd_events.go @@ -7,8 +7,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Event handling functions diff --git a/client/lxd_images.go b/client/lxd_images.go index 3524cdb478b7..549eb5382418 100644 --- a/client/lxd_images.go +++ b/client/lxd_images.go @@ -12,11 +12,11 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Image handling functions diff --git a/client/lxd_instances.go b/client/lxd_instances.go index 6f16ce0cf4be..63cc63ba6abb 100644 --- a/client/lxd_instances.go +++ b/client/lxd_instances.go @@ -14,12 +14,12 @@ import ( "github.com/gorilla/websocket" "github.com/pkg/sftp" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/tcp" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/tcp" + "github.com/canonical/lxd/shared/units" ) // Instance handling functions. diff --git a/client/lxd_network_acls.go b/client/lxd_network_acls.go index 20075613503c..06cb2f0cec26 100644 --- a/client/lxd_network_acls.go +++ b/client/lxd_network_acls.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkACLNames returns a list of network ACL names. diff --git a/client/lxd_network_forwards.go b/client/lxd_network_forwards.go index 22f1f8fce459..5efa7098885a 100644 --- a/client/lxd_network_forwards.go +++ b/client/lxd_network_forwards.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkForwardAddresses returns a list of network forward listen addresses. diff --git a/client/lxd_network_peer.go b/client/lxd_network_peer.go index 804236834b3f..386bab464c3f 100644 --- a/client/lxd_network_peer.go +++ b/client/lxd_network_peer.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkPeerNames returns a list of network peer names. diff --git a/client/lxd_network_zones.go b/client/lxd_network_zones.go index 50a62b2d5da7..708ea046b05c 100644 --- a/client/lxd_network_zones.go +++ b/client/lxd_network_zones.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkZoneNames returns a list of network zone names. diff --git a/client/lxd_networks.go b/client/lxd_networks.go index 193eef8c8bfb..0961cb6098b4 100644 --- a/client/lxd_networks.go +++ b/client/lxd_networks.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkNames returns a list of network names diff --git a/client/lxd_operations.go b/client/lxd_operations.go index 62c810837af4..a0ad065853fb 100644 --- a/client/lxd_operations.go +++ b/client/lxd_operations.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetOperationUUIDs returns a list of operation uuids diff --git a/client/lxd_profiles.go b/client/lxd_profiles.go index 4d9efcc05a27..270fdfe388dc 100644 --- a/client/lxd_profiles.go +++ b/client/lxd_profiles.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Profile handling functions diff --git a/client/lxd_projects.go b/client/lxd_projects.go index e9a499bc889d..b2a7d248e3b5 100644 --- a/client/lxd_projects.go +++ b/client/lxd_projects.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Project handling functions diff --git a/client/lxd_server.go b/client/lxd_server.go index 73f9d7322547..e8090c4699c1 100644 --- a/client/lxd_server.go +++ b/client/lxd_server.go @@ -5,8 +5,8 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Server handling functions diff --git a/client/lxd_storage_pools.go b/client/lxd_storage_pools.go index 4bc5cd4ade53..ddad3c20216f 100644 --- a/client/lxd_storage_pools.go +++ b/client/lxd_storage_pools.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Storage pool handling functions diff --git a/client/lxd_storage_volumes.go b/client/lxd_storage_volumes.go index 648352a406c5..7df434527a99 100644 --- a/client/lxd_storage_volumes.go +++ b/client/lxd_storage_volumes.go @@ -6,11 +6,11 @@ import ( "net/http" "net/url" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Storage volumes handling function diff --git a/client/lxd_warnings.go b/client/lxd_warnings.go index 93bfe8b98527..052bb5cf2da1 100644 --- a/client/lxd_warnings.go +++ b/client/lxd_warnings.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Warning handling functions diff --git a/client/operations.go b/client/operations.go index c7d7dbca6795..46ef572c089e 100644 --- a/client/operations.go +++ b/client/operations.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // The Operation type represents an ongoing LXD operation (asynchronous processing) diff --git a/client/simplestreams.go b/client/simplestreams.go index 0423af6090a3..6ed7fdb05e8e 100644 --- a/client/simplestreams.go +++ b/client/simplestreams.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/lxc/lxd/shared/simplestreams" + "github.com/canonical/lxd/shared/simplestreams" ) // ProtocolSimpleStreams implements a SimpleStreams API client diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go index 6a1d2eaad98e..b62ef6e2acaf 100644 --- a/client/simplestreams_images.go +++ b/client/simplestreams_images.go @@ -10,8 +10,8 @@ import ( "os/exec" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Image handling functions diff --git a/client/util.go b/client/util.go index 593ad31d992c..6925862c733a 100644 --- a/client/util.go +++ b/client/util.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) func tlsHTTPClient(client *http.Client, tlsClientCert string, tlsClientKey string, tlsCA string, tlsServerCert string, insecureSkipVerify bool, proxy func(req *http.Request) (*url.URL, error)) (*http.Client, error) { diff --git a/doc/database.md b/doc/database.md index 3b4212dd4a66..2c288d47a4d8 100644 --- a/doc/database.md +++ b/doc/database.md @@ -56,7 +56,7 @@ against the local or global database, you can use the ``lxd sql`` command (run You should only need to do that in order to recover from broken updates or bugs. Please consult the LXD team first (creating a [GitHub -issue](https://github.com/lxc/lxd/issues/new) or +issue](https://github.com/canonical/lxd/issues/new) or [forum](https://discuss.linuxcontainers.org/) post). ## Running custom queries at LXD daemon startup diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml index 2162e58f5495..e2653794dde7 100644 --- a/doc/rest-api.yaml +++ b/doc/rest-api.yaml @@ -39,7 +39,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api CertificateAddToken: properties: addresses: @@ -68,7 +68,7 @@ definitions: title: CertificateAddToken represents the fields contained within an encoded certificate add token. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api CertificatePut: description: CertificatePut represents the modifiable fields of a LXD certificate properties: @@ -103,7 +103,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api CertificatesPost: description: CertificatesPost represents the fields of a new LXD certificate properties: @@ -148,7 +148,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Cluster: properties: enabled: @@ -170,7 +170,7 @@ definitions: x-go-name: ServerName title: Cluster represents high-level information about a LXD cluster. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterCertificatePut: description: ClusterCertificatePut represents the certificate and key pair for all members in a LXD Cluster @@ -186,7 +186,7 @@ definitions: type: string x-go-name: ClusterCertificateKey type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroup: properties: description: @@ -210,7 +210,7 @@ definitions: x-go-name: Name title: ClusterGroup represents a cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroupPost: properties: name: @@ -220,7 +220,7 @@ definitions: x-go-name: Name title: ClusterGroupPost represents the fields required to rename a cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroupPut: properties: description: @@ -239,7 +239,7 @@ definitions: x-go-name: Members title: ClusterGroupPut represents the modifiable fields of a cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroupsPost: properties: description: @@ -263,7 +263,7 @@ definitions: x-go-name: Name title: ClusterGroupsPost represents the fields available for a new cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMember: properties: architecture: @@ -333,7 +333,7 @@ definitions: x-go-name: URL title: ClusterMember represents the a LXD node in the cluster. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberConfigKey: description: |- The Value field is empty when getting clustering information with GET @@ -369,7 +369,7 @@ definitions: ClusterMemberConfigKey represents a single config key that a new member of the cluster is required to provide when joining. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberJoinToken: properties: addresses: @@ -398,7 +398,7 @@ definitions: title: ClusterMemberJoinToken represents the fields contained within an encoded cluster member join token. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberPost: properties: server_name: @@ -408,7 +408,7 @@ definitions: x-go-name: ServerName title: ClusterMemberPost represents the fields required to rename a LXD node. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberPut: description: ClusterMemberPut represents the the modifiable fields of a LXD cluster member @@ -449,7 +449,7 @@ definitions: type: array x-go-name: Roles type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberStatePost: properties: action: @@ -461,7 +461,7 @@ definitions: title: ClusterMemberStatePost represents the fields required to evacuate a cluster member. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMembersPost: properties: server_name: @@ -472,7 +472,7 @@ definitions: title: ClusterMembersPost represents the fields required to request a join token to add a member to the cluster. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterPut: description: |- ClusterPut represents the fields required to bootstrap or join a LXD @@ -516,7 +516,7 @@ definitions: type: string x-go-name: ServerName type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Event: description: Event represents an event entry (over websocket) properties: @@ -550,7 +550,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Image: description: Image represents a LXD image properties: @@ -647,7 +647,7 @@ definitions: type: string x-go-name: UploadedAt type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAlias: description: ImageAlias represents an alias from the alias list of a LXD image properties: @@ -662,7 +662,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesEntry: description: ImageAliasesEntry represents a LXD image alias properties: @@ -687,7 +687,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesEntryPost: description: ImageAliasesEntryPost represents the required fields to rename a LXD image alias @@ -698,7 +698,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesEntryPut: description: ImageAliasesEntryPut represents the modifiable fields of a LXD image alias @@ -714,7 +714,7 @@ definitions: type: string x-go-name: Target type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesPost: description: ImageAliasesPost represents a new LXD image alias properties: @@ -739,7 +739,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageExportPost: description: ImageExportPost represents the fields required to export a LXD image properties: @@ -765,7 +765,7 @@ definitions: type: string x-go-name: Target type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageMetadata: description: ImageMetadata represents LXD image metadata (used in image tarball) properties: @@ -803,7 +803,7 @@ definitions: type: object x-go-name: Templates type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageMetadataTemplate: description: ImageMetadataTemplate represents a template entry in image metadata (used in image tarball) @@ -834,7 +834,7 @@ definitions: type: array x-go-name: When type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImagePut: description: ImagePut represents the modifiable fields of a LXD image properties: @@ -874,7 +874,7 @@ definitions: type: boolean x-go-name: Public type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageSource: description: ImageSource represents the source of a LXD image properties: @@ -904,7 +904,7 @@ definitions: type: string x-go-name: Server type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImagesPost: description: ImagesPost represents the fields available for a new LXD image properties: @@ -966,7 +966,7 @@ definitions: source: $ref: '#/definitions/ImagesPostSource' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImagesPostSource: description: ImagesPostSource represents the source of a new LXD image properties: @@ -1031,7 +1031,7 @@ definitions: type: string x-go-name: URL type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Instance: properties: architecture: @@ -1150,7 +1150,7 @@ definitions: x-go-name: Type title: Instance represents a LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceBackup: properties: container_only: @@ -1188,7 +1188,7 @@ definitions: x-go-name: OptimizedStorage title: InstanceBackup represents a LXD instance backup. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceBackupPost: properties: name: @@ -1199,7 +1199,7 @@ definitions: title: InstanceBackupPost represents the fields available for the renaming of a instance backup. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceBackupsPost: properties: compression_algorithm: @@ -1237,7 +1237,7 @@ definitions: title: InstanceBackupsPost represents the fields available for a new LXD instance backup. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceConsolePost: properties: height: @@ -1259,7 +1259,7 @@ definitions: x-go-name: Width title: InstanceConsolePost represents a LXD instance console request. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceExecPost: properties: command: @@ -1325,7 +1325,7 @@ definitions: x-go-name: Width title: InstanceExecPost represents a LXD instance exec request. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceFull: properties: architecture: @@ -1459,7 +1459,7 @@ definitions: title: InstanceFull is a combination of Instance, InstanceBackup, InstanceState and InstanceSnapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancePost: properties: container_only: @@ -1502,7 +1502,7 @@ definitions: $ref: '#/definitions/InstancePostTarget' title: InstancePost represents the fields required to rename/move a LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancePostTarget: properties: certificate: @@ -1526,7 +1526,7 @@ definitions: x-go-name: Websockets title: InstancePostTarget represents the migration target host and operation. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancePut: properties: architecture: @@ -1585,7 +1585,7 @@ definitions: x-go-name: Stateful title: InstancePut represents the modifiable fields of a LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshot: properties: architecture: @@ -1684,7 +1684,7 @@ definitions: x-go-name: Stateful title: InstanceSnapshot represents a LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshotPost: properties: live: @@ -1707,7 +1707,7 @@ definitions: title: InstanceSnapshotPost represents the fields required to rename/move a LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshotPut: properties: expires_at: @@ -1719,7 +1719,7 @@ definitions: title: InstanceSnapshotPut represents the modifiable fields of a LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshotsPost: properties: expires_at: @@ -1741,7 +1741,7 @@ definitions: title: InstanceSnapshotsPost represents the fields available for a new LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSource: properties: alias: @@ -1852,7 +1852,7 @@ definitions: x-go-name: Type title: InstanceSource represents the creation source for a new instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceState: properties: cpu: @@ -1892,7 +1892,7 @@ definitions: $ref: '#/definitions/StatusCode' title: InstanceState represents a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateCPU: properties: usage: @@ -1904,7 +1904,7 @@ definitions: title: InstanceStateCPU represents the cpu information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateDisk: properties: usage: @@ -1916,7 +1916,7 @@ definitions: title: InstanceStateDisk represents the disk information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateMemory: properties: swap_usage: @@ -1946,7 +1946,7 @@ definitions: title: InstanceStateMemory represents the memory information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateNetwork: properties: addresses: @@ -1986,7 +1986,7 @@ definitions: title: InstanceStateNetwork represents the network information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateNetworkAddress: description: |- InstanceStateNetworkAddress represents a network address as part of the network section of a LXD @@ -2013,7 +2013,7 @@ definitions: type: string x-go-name: Scope type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateNetworkCounters: description: |- InstanceStateNetworkCounters represents packet counters as part of the network section of a LXD @@ -2068,7 +2068,7 @@ definitions: type: integer x-go-name: PacketsSent type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStatePut: properties: action: @@ -2094,12 +2094,12 @@ definitions: x-go-name: Timeout title: InstanceStatePut represents the modifiable fields of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceType: title: InstanceType represents the type if instance being returned or requested via the API. type: string - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancesPost: properties: architecture: @@ -2172,14 +2172,14 @@ definitions: $ref: '#/definitions/InstanceType' title: InstancesPost represents the fields available for a new LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancesPut: properties: state: $ref: '#/definitions/InstanceStatePut' title: InstancesPut represents the fields available for a mass update. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Network: description: Network represents a LXD network properties: @@ -2244,7 +2244,7 @@ definitions: type: array x-go-name: UsedBy type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACL: properties: config: @@ -2290,7 +2290,7 @@ definitions: x-go-name: UsedBy title: NetworkACL used for displaying an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLPost: properties: name: @@ -2300,7 +2300,7 @@ definitions: x-go-name: Name title: NetworkACLPost used for renaming an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLPut: properties: config: @@ -2330,7 +2330,7 @@ definitions: x-go-name: Ingress title: NetworkACLPut used for updating an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLRule: description: Refer to doc/network-acls.md for details. properties: @@ -2386,7 +2386,7 @@ definitions: x-go-name: State title: NetworkACLRule represents a single rule in an ACL ruleset. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLsPost: properties: config: @@ -2421,7 +2421,7 @@ definitions: x-go-name: Name title: NetworkACLsPost used for creating an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForward: properties: config: @@ -2455,7 +2455,7 @@ definitions: x-go-name: Ports title: NetworkForward used for displaying an network address forward. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForwardPort: description: NetworkForwardPort represents a port specification in a network address forward @@ -2486,7 +2486,7 @@ definitions: type: string x-go-name: TargetPort type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForwardPut: description: NetworkForwardPut represents the modifiable fields of a LXD network address forward @@ -2511,7 +2511,7 @@ definitions: type: array x-go-name: Ports type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForwardsPost: description: NetworkForwardsPost represents the fields of a new LXD network address forward @@ -2541,7 +2541,7 @@ definitions: type: array x-go-name: Ports type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkLease: description: NetworkLease represents a DHCP lease properties: @@ -2571,7 +2571,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPeer: properties: config: @@ -2623,7 +2623,7 @@ definitions: x-go-name: UsedBy title: NetworkPeer used for displaying a LXD network peering. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPeerPut: description: NetworkPeerPut represents the modifiable fields of a LXD network peering @@ -2642,7 +2642,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPeersPost: description: NetworkPeersPost represents the fields of a new LXD network peering properties: @@ -2675,7 +2675,7 @@ definitions: type: string x-go-name: TargetProject type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPost: description: NetworkPost represents the fields required to rename a LXD network properties: @@ -2685,7 +2685,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPut: description: NetworkPut represents the modifiable fields of a LXD network properties: @@ -2705,7 +2705,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkState: description: NetworkState represents the network state properties: @@ -2747,7 +2747,7 @@ definitions: vlan: $ref: '#/definitions/NetworkStateVLAN' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateAddress: description: NetworkStateAddress represents a network address properties: @@ -2772,7 +2772,7 @@ definitions: type: string x-go-name: Scope type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateBond: description: NetworkStateBond represents bond specific state properties: @@ -2819,7 +2819,7 @@ definitions: type: integer x-go-name: UpDelay type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateBridge: description: NetworkStateBridge represents bridge specific state properties: @@ -2860,7 +2860,7 @@ definitions: type: boolean x-go-name: VLANFiltering type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateCounters: description: NetworkStateCounters represents packet counters properties: @@ -2889,7 +2889,7 @@ definitions: type: integer x-go-name: PacketsSent type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateOVN: description: NetworkStateOVN represents OVN specific state properties: @@ -2898,7 +2898,7 @@ definitions: type: string x-go-name: Chassis type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateVLAN: description: NetworkStateVLAN represents VLAN specific state properties: @@ -2914,7 +2914,7 @@ definitions: type: integer x-go-name: VID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZone: properties: config: @@ -2947,7 +2947,7 @@ definitions: x-go-name: UsedBy title: NetworkZone represents a network zone (DNS). type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZonePut: description: NetworkZonePut represents the modifiable fields of a LXD network zone @@ -2966,7 +2966,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecord: properties: config: @@ -2995,7 +2995,7 @@ definitions: x-go-name: Name title: NetworkZoneRecord represents a network zone (DNS) record. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecordEntry: description: NetworkZoneRecordEntry represents the fields in a record entry properties: @@ -3016,7 +3016,7 @@ definitions: type: string x-go-name: Value type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecordPut: description: NetworkZoneRecordPut represents the modifiable fields of a LXD network zone record @@ -3041,7 +3041,7 @@ definitions: type: array x-go-name: Entries type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecordsPost: description: NetworkZoneRecordsPost represents the fields of a new LXD network zone record @@ -3071,7 +3071,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZonesPost: description: NetworkZonesPost represents the fields of a new LXD network zone properties: @@ -3094,7 +3094,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworksPost: description: NetworksPost represents the fields of a new LXD network properties: @@ -3124,7 +3124,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Operation: description: Operation represents a LXD background operation properties: @@ -3210,7 +3210,7 @@ definitions: type: string x-go-name: UpdatedAt type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Profile: description: Profile represents a LXD profile properties: @@ -3262,7 +3262,7 @@ definitions: type: array x-go-name: UsedBy type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProfilePost: description: ProfilePost represents the fields required to rename a LXD profile properties: @@ -3272,7 +3272,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProfilePut: description: ProfilePut represents the modifiable fields of a LXD profile properties: @@ -3308,7 +3308,7 @@ definitions: type: object x-go-name: Devices type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProfilesPost: description: ProfilesPost represents the fields of a new LXD profile properties: @@ -3349,7 +3349,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Project: description: Project represents a LXD project properties: @@ -3387,7 +3387,7 @@ definitions: type: array x-go-name: UsedBy type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectPost: description: ProjectPost represents the fields required to rename a LXD project properties: @@ -3397,7 +3397,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectPut: description: ProjectPut represents the modifiable fields of a LXD project properties: @@ -3416,7 +3416,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectState: description: ProjectState represents the current running state of a LXD project properties: @@ -3435,7 +3435,7 @@ definitions: type: object x-go-name: Resources type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectStateResource: description: ProjectStateResource represents the state of a particular resource in a LXD project @@ -3451,7 +3451,7 @@ definitions: format: int64 type: integer type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectsPost: description: ProjectsPost represents the fields of a new LXD project properties: @@ -3475,7 +3475,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Resources: description: Resources represents the system resources available for LXD properties: @@ -3496,7 +3496,7 @@ definitions: usb: $ref: '#/definitions/ResourcesUSB' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPU: description: ResourcesCPU represents the cpu resources available on the system properties: @@ -3518,7 +3518,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUCache: description: ResourcesCPUCache represents a CPU cache properties: @@ -3540,7 +3540,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUCore: description: ResourcesCPUCore represents a CPU core on the system properties: @@ -3569,7 +3569,7 @@ definitions: type: array x-go-name: Threads type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUSocket: description: ResourcesCPUSocket represents a CPU socket on the system properties: @@ -3620,7 +3620,7 @@ definitions: type: string x-go-name: Vendor type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUThread: description: ResourcesCPUThread represents a CPU thread on the system properties: @@ -3653,7 +3653,7 @@ definitions: type: integer x-go-name: Thread type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPU: description: ResourcesGPU represents the GPU resources available on the system properties: @@ -3670,7 +3670,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCard: description: ResourcesGPUCard represents a GPU card on the system properties: @@ -3734,7 +3734,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardDRM: description: ResourcesGPUCardDRM represents the Linux DRM configuration of the GPU @@ -3776,7 +3776,7 @@ definitions: type: string x-go-name: RenderName type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardMdev: description: ResourcesGPUCardMdev represents the mediated devices configuration of the GPU @@ -3813,7 +3813,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardNvidia: description: ResourcesGPUCardNvidia represents additional information for NVIDIA GPUs @@ -3859,7 +3859,7 @@ definitions: type: string x-go-name: UUID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardSRIOV: description: ResourcesGPUCardSRIOV represents the SRIOV configuration of the GPU properties: @@ -3883,7 +3883,7 @@ definitions: type: array x-go-name: VFs type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesMemory: description: ResourcesMemory represents the memory resources available on the system @@ -3926,7 +3926,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesMemoryNode: description: ResourcesMemoryNode represents the node-specific memory resources available on the system @@ -3962,7 +3962,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetwork: description: ResourcesNetwork represents the network cards available on the system properties: @@ -3979,7 +3979,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCard: description: ResourcesNetworkCard represents a network card on the system properties: @@ -4043,7 +4043,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCardPort: description: ResourcesNetworkCardPort represents a network port on the system properties: @@ -4122,7 +4122,7 @@ definitions: type: string x-go-name: TransceiverType type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCardPortInfiniband: description: ResourcesNetworkCardPortInfiniband represents the Linux Infiniband configuration for the port @@ -4158,7 +4158,7 @@ definitions: type: string x-go-name: VerbName type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCardSRIOV: description: ResourcesNetworkCardSRIOV represents the SRIOV configuration of the network card @@ -4183,7 +4183,7 @@ definitions: type: array x-go-name: VFs type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesPCI: description: ResourcesPCI represents the PCI devices available on the system properties: @@ -4200,7 +4200,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesPCIDevice: description: ResourcesPCIDevice represents a PCI device properties: @@ -4252,7 +4252,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStorage: description: ResourcesStorage represents the local storage properties: @@ -4269,7 +4269,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStorageDisk: description: ResourcesStorageDisk represents a disk properties: @@ -4369,7 +4369,7 @@ definitions: type: string x-go-name: WWN type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStorageDiskPartition: description: ResourcesStorageDiskPartition represents a partition on a disk properties: @@ -4401,7 +4401,7 @@ definitions: type: integer x-go-name: Size type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStoragePool: description: ResourcesStoragePool represents the resources available to a given storage pool @@ -4411,7 +4411,7 @@ definitions: space: $ref: '#/definitions/ResourcesStoragePoolSpace' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStoragePoolInodes: description: ResourcesStoragePoolInodes represents the inodes available to a given storage pool @@ -4429,7 +4429,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStoragePoolSpace: description: ResourcesStoragePoolSpace represents the space available to a given storage pool @@ -4447,7 +4447,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystem: description: ResourcesSystem represents the system properties: @@ -4499,7 +4499,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystemChassis: description: ResourcesSystemChassis represents the system chassis properties: @@ -4524,7 +4524,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystemFirmware: description: ResourcesSystemFirmware represents the system firmware properties: @@ -4544,7 +4544,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystemMotherboard: description: ResourcesSystemMotherboard represents the motherboard properties: @@ -4569,7 +4569,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesUSB: description: ResourcesUSB represents the USB devices available on the system properties: @@ -4586,7 +4586,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesUSBDevice: description: ResourcesUSBDevice represents a USB device properties: @@ -4635,7 +4635,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesUSBDeviceInterface: description: ResourcesUSBDeviceInterface represents a USB device interface properties: @@ -4678,7 +4678,7 @@ definitions: type: integer x-go-name: SubClassID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Server: description: Server represents a LXD server properties: @@ -4742,7 +4742,7 @@ definitions: type: boolean x-go-name: Public type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerEnvironment: description: ServerEnvironment represents the read-only environment fields of a LXD server @@ -4888,7 +4888,7 @@ definitions: type: string x-go-name: StorageVersion type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerPut: description: ServerPut represents the modifiable fields of a LXD server configuration properties: @@ -4902,7 +4902,7 @@ definitions: type: object x-go-name: Config type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerStorageDriverInfo: description: ServerStorageDriverInfo represents the read-only info about a storage driver @@ -4920,7 +4920,7 @@ definitions: example: 0.8.4-1ubuntu11 type: string type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerUntrusted: description: ServerUntrusted represents a LXD server for an untrusted client properties: @@ -4973,12 +4973,12 @@ definitions: type: boolean x-go-name: Public type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StatusCode: description: StatusCode represents a valid LXD operation and container status format: int64 type: integer - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePool: properties: config: @@ -5033,7 +5033,7 @@ definitions: x-go-name: UsedBy title: StoragePool represents the fields of a LXD storage pool. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolPut: properties: config: @@ -5052,7 +5052,7 @@ definitions: x-go-name: Description title: StoragePoolPut represents the modifiable fields of a LXD storage pool. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolVolumeBackup: description: StoragePoolVolumeBackup represents a LXD volume backup properties: @@ -5085,7 +5085,7 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolVolumeBackupPost: description: StoragePoolVolumeBackupPost represents the fields available for the renaming of a volume backup @@ -5096,7 +5096,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolVolumeBackupsPost: description: StoragePoolVolumeBackupsPost represents the fields available for a new LXD volume backup @@ -5129,7 +5129,7 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolsPost: description: StoragePoolsPost represents the fields of a new LXD storage pool properties: @@ -5158,7 +5158,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolume: properties: config: @@ -5210,7 +5210,7 @@ definitions: x-go-name: UsedBy title: StorageVolume represents the fields of a LXD storage volume. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumePost: description: StorageVolumePost represents the fields required to rename a LXD storage pool volume @@ -5243,7 +5243,7 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumePostTarget: description: StorageVolumePostTarget represents the migration target host and operation @@ -5267,7 +5267,7 @@ definitions: type: object x-go-name: Websockets type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumePut: description: StorageVolumePut represents the modifiable fields of a LXD storage volume @@ -5292,7 +5292,7 @@ definitions: type: string x-go-name: Restore type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshot: description: StorageVolumeSnapshot represents a LXD storage volume snapshot properties: @@ -5327,7 +5327,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshotPost: description: StorageVolumeSnapshotPost represents the fields required to rename/move a LXD storage volume snapshot @@ -5338,7 +5338,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshotPut: description: StorageVolumeSnapshotPut represents the modifiable fields of a LXD storage volume @@ -5355,7 +5355,7 @@ definitions: type: string x-go-name: ExpiresAt type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshotsPost: description: StorageVolumeSnapshotsPost represents the fields available for a new LXD storage volume snapshot @@ -5372,7 +5372,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSource: description: StorageVolumeSource represents the creation source for a new storage volume @@ -5431,14 +5431,14 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeState: description: StorageVolumeState represents the live state of the volume properties: usage: $ref: '#/definitions/StorageVolumeStateUsage' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeStateUsage: description: StorageVolumeStateUsage represents the disk usage of a volume properties: @@ -5449,7 +5449,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumesPost: description: StorageVolumesPost represents the fields of a new LXD storage pool volume @@ -5491,7 +5491,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Warning: properties: count: @@ -5554,7 +5554,7 @@ definitions: x-go-name: UUID title: Warning represents a warning entry. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api WarningPut: properties: status: @@ -5564,7 +5564,7 @@ definitions: x-go-name: Status title: WarningPut represents the modifiable fields of a warning. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api info: contact: email: lxd@lists.canonical.com diff --git a/doc/security.md b/doc/security.md index b118ea4dd459..1519d22d1793 100644 --- a/doc/security.md +++ b/doc/security.md @@ -8,7 +8,7 @@ See the following sections for detailed information. -If you discover a security issue, see the [LXD security policy](https://github.com/lxc/lxd/blob/master/SECURITY.md) for information on how to report the issue. +If you discover a security issue, see the [LXD security policy](https://github.com/canonical/lxd/blob/master/SECURITY.md) for information on how to report the issue. ## Supported versions diff --git a/fuidshift/main.go b/fuidshift/main.go index 5c24a90686e6..5e9110213f2c 100644 --- a/fuidshift/main.go +++ b/fuidshift/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/fuidshift/main_shift.go b/fuidshift/main_shift.go index bcab6faf36ea..cda970480fab 100644 --- a/fuidshift/main_shift.go +++ b/fuidshift/main_shift.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/shared/idmap" ) type cmdShift struct { diff --git a/go.mod b/go.mod index 93901a170ebe..00cba623d5c1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/lxc/lxd +module github.com/canonical/lxd go 1.17 diff --git a/lxc-to-lxd/config.go b/lxc-to-lxd/config.go index ce4f76328732..89fc4cebc0bf 100644 --- a/lxc-to-lxd/config.go +++ b/lxc-to-lxd/config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) var checkedKeys = []string{ diff --git a/lxc-to-lxd/main.go b/lxc-to-lxd/main.go index 5f20fdb4fb9a..fc73b3001869 100644 --- a/lxc-to-lxd/main.go +++ b/lxc-to-lxd/main.go @@ -47,7 +47,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxc-to-lxd/main_migrate.go b/lxc-to-lxd/main_migrate.go index 6e8c68b9f172..6f526479760f 100644 --- a/lxc-to-lxd/main_migrate.go +++ b/lxc-to-lxd/main_migrate.go @@ -11,12 +11,12 @@ import ( "github.com/spf13/cobra" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/osarch" ) type cmdMigrate struct { diff --git a/lxc-to-lxd/main_netcat.go b/lxc-to-lxd/main_netcat.go index db21bed71acb..e1a515ef3109 100644 --- a/lxc-to-lxd/main_netcat.go +++ b/lxc-to-lxd/main_netcat.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/eagain" + "github.com/canonical/lxd/shared/eagain" ) type cmdNetcat struct { diff --git a/lxc-to-lxd/transfer.go b/lxc-to-lxd/transfer.go index 98878a731027..95606dc83293 100644 --- a/lxc-to-lxd/transfer.go +++ b/lxc-to-lxd/transfer.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared" ) // Send an rsync stream of a path over a websocket diff --git a/lxc-to-lxd/utils.go b/lxc-to-lxd/utils.go index 53655492510e..0b4a8da1a58c 100644 --- a/lxc-to-lxd/utils.go +++ b/lxc-to-lxd/utils.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/migration" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/migration" ) func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error { diff --git a/lxc/action.go b/lxc/action.go index 53100f6b856b..4e3bfb48c25c 100644 --- a/lxc/action.go +++ b/lxc/action.go @@ -7,12 +7,12 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) // Start diff --git a/lxc/alias.go b/lxc/alias.go index 16ce0bbd02ab..3d549c67a7ff 100644 --- a/lxc/alias.go +++ b/lxc/alias.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdAlias struct { diff --git a/lxc/cluster.go b/lxc/cluster.go index 72e706b4913e..fe7c617e3da5 100644 --- a/lxc/cluster.go +++ b/lxc/cluster.go @@ -11,12 +11,12 @@ import ( "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdCluster struct { diff --git a/lxc/config.go b/lxc/config.go index 3f52922a282c..ce280f4db67f 100644 --- a/lxc/config.go +++ b/lxc/config.go @@ -9,12 +9,12 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdConfig struct { diff --git a/lxc/config/cert.go b/lxc/config/cert.go index 42ccf8312af6..2527d31b3547 100644 --- a/lxc/config/cert.go +++ b/lxc/config/cert.go @@ -1,7 +1,7 @@ package config import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // HasClientCertificate will return true if a client certificate has already been generated diff --git a/lxc/config/file.go b/lxc/config/file.go index 9cdec919dac2..00ba52cbbfc9 100644 --- a/lxc/config/file.go +++ b/lxc/config/file.go @@ -8,7 +8,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // LoadConfig reads the configuration from the config path; if the path does diff --git a/lxc/config/remote.go b/lxc/config/remote.go index 92ad7bac1d38..e3a31d466e7f 100644 --- a/lxc/config/remote.go +++ b/lxc/config/remote.go @@ -15,8 +15,8 @@ import ( "gopkg.in/macaroon-bakery.v2/httpbakery" "gopkg.in/macaroon-bakery.v2/httpbakery/form" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" ) // Remote holds details for communication with a remote daemon diff --git a/lxc/config_device.go b/lxc/config_device.go index d50f6f9c86a9..76a9abb4f9b9 100644 --- a/lxc/config_device.go +++ b/lxc/config_device.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdConfigDevice struct { diff --git a/lxc/config_metadata.go b/lxc/config_metadata.go index 1af5b4d5930e..b7694f7995eb 100644 --- a/lxc/config_metadata.go +++ b/lxc/config_metadata.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdConfigMetadata struct { diff --git a/lxc/config_template.go b/lxc/config_template.go index 9e9538a8f197..b1a338f9452e 100644 --- a/lxc/config_template.go +++ b/lxc/config_template.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdConfigTemplate struct { diff --git a/lxc/config_trust.go b/lxc/config_trust.go index ff073c99394b..527b8f511831 100644 --- a/lxc/config_trust.go +++ b/lxc/config_trust.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdConfigTrust struct { diff --git a/lxc/console.go b/lxc/console.go index 30427f741b93..8379b1a6582a 100644 --- a/lxc/console.go +++ b/lxc/console.go @@ -14,13 +14,13 @@ import ( "github.com/gorilla/websocket" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" ) type cmdConsole struct { diff --git a/lxc/console_unix.go b/lxc/console_unix.go index 54301f4bcf95..3386da2bd492 100644 --- a/lxc/console_unix.go +++ b/lxc/console_unix.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/websocket" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) func (c *cmdConsole) controlSocketHandler(control *websocket.Conn) { diff --git a/lxc/copy.go b/lxc/copy.go index 47f3d56c76fe..a632c86b2420 100644 --- a/lxc/copy.go +++ b/lxc/copy.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdCopy struct { diff --git a/lxc/delete.go b/lxc/delete.go index e47f51d44e20..0555240a103f 100644 --- a/lxc/delete.go +++ b/lxc/delete.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdDelete struct { diff --git a/lxc/exec.go b/lxc/exec.go index ab100276de68..b0d7654325bf 100644 --- a/lxc/exec.go +++ b/lxc/exec.go @@ -12,12 +12,12 @@ import ( "github.com/gorilla/websocket" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" ) type cmdExec struct { diff --git a/lxc/exec_unix.go b/lxc/exec_unix.go index 6bbf8de89f38..c5617d78be68 100644 --- a/lxc/exec_unix.go +++ b/lxc/exec_unix.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/websocket" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) func (c *cmdExec) getTERM() (string, bool) { diff --git a/lxc/exec_windows.go b/lxc/exec_windows.go index 849b82d7298c..f9f8276068e7 100644 --- a/lxc/exec_windows.go +++ b/lxc/exec_windows.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/websocket" "golang.org/x/sys/windows" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Windows doesn't process ANSI sequences natively, so we wrap diff --git a/lxc/export.go b/lxc/export.go index 93ff75071d7f..919734c0d0be 100644 --- a/lxc/export.go +++ b/lxc/export.go @@ -9,12 +9,12 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdExport struct { diff --git a/lxc/file.go b/lxc/file.go index e22cdd04bb98..f6cb3beeca49 100644 --- a/lxc/file.go +++ b/lxc/file.go @@ -14,15 +14,15 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" + "github.com/canonical/lxd/shared/units" ) // DirMode represents the file mode for creating dirs on `lxc file pull/push` diff --git a/lxc/image.go b/lxc/image.go index 8e64ccdaad2b..d88b85031a48 100644 --- a/lxc/image.go +++ b/lxc/image.go @@ -13,13 +13,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type imageColumn struct { diff --git a/lxc/image_alias.go b/lxc/image_alias.go index 07ae48f3da22..59fda0fc32b7 100644 --- a/lxc/image_alias.go +++ b/lxc/image_alias.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdImageAlias struct { diff --git a/lxc/import.go b/lxc/import.go index e2563d840b4e..062c5a3716f3 100644 --- a/lxc/import.go +++ b/lxc/import.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) type cmdImport struct { diff --git a/lxc/info.go b/lxc/info.go index c41a858d96ce..da9f7aeb5797 100644 --- a/lxc/info.go +++ b/lxc/info.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/units" ) type cmdInfo struct { diff --git a/lxc/init.go b/lxc/init.go index 12a3d0f39a08..4d9d4fa6fdbb 100644 --- a/lxc/init.go +++ b/lxc/init.go @@ -9,13 +9,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdInit struct { diff --git a/lxc/launch.go b/lxc/launch.go index cd0b3c653dc3..b2d641f09276 100644 --- a/lxc/launch.go +++ b/lxc/launch.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdLaunch struct { diff --git a/lxc/list.go b/lxc/list.go index 93518af384e9..71159c0849b6 100644 --- a/lxc/list.go +++ b/lxc/list.go @@ -10,15 +10,15 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/units" ) type column struct { diff --git a/lxc/list_test.go b/lxc/list_test.go index 24e06fc2b51a..c25d9c6caa11 100644 --- a/lxc/list_test.go +++ b/lxc/list_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func TestDotPrefixMatch(t *testing.T) { diff --git a/lxc/main.go b/lxc/main.go index d8b3ee28b110..b6449023d26b 100644 --- a/lxc/main.go +++ b/lxc/main.go @@ -9,14 +9,14 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxc/main_aliases.go b/lxc/main_aliases.go index 299889b97ab9..8314a4c2b115 100644 --- a/lxc/main_aliases.go +++ b/lxc/main_aliases.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/i18n" ) var numberedArgRegex = regexp.MustCompile(`@ARG(\d+)@`) diff --git a/lxc/main_test.go b/lxc/main_test.go index 6c686874744c..73b1d51fceed 100644 --- a/lxc/main_test.go +++ b/lxc/main_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/lxc/lxd/lxc/config" + "github.com/canonical/lxd/lxc/config" ) type aliasTestcase struct { diff --git a/lxc/manpage.go b/lxc/manpage.go index 3f2964b31ca4..862fa6ce5f72 100644 --- a/lxc/manpage.go +++ b/lxc/manpage.go @@ -4,9 +4,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdManpage struct { diff --git a/lxc/monitor.go b/lxc/monitor.go index 8bfe80738558..dfbf929d9504 100644 --- a/lxc/monitor.go +++ b/lxc/monitor.go @@ -8,12 +8,12 @@ import ( "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logging" ) type cmdMonitor struct { diff --git a/lxc/move.go b/lxc/move.go index 0501c9f32bbf..de238275bad2 100644 --- a/lxc/move.go +++ b/lxc/move.go @@ -5,11 +5,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdMove struct { diff --git a/lxc/network.go b/lxc/network.go index 4d75c0c8380c..927877378112 100644 --- a/lxc/network.go +++ b/lxc/network.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" + "github.com/canonical/lxd/shared/units" ) type cmdNetwork struct { diff --git a/lxc/operation.go b/lxc/operation.go index 6fe2be845f53..db408522289c 100644 --- a/lxc/operation.go +++ b/lxc/operation.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdOperation struct { diff --git a/lxc/profile.go b/lxc/profile.go index 930f0ba46375..02044dcd93a3 100644 --- a/lxc/profile.go +++ b/lxc/profile.go @@ -10,12 +10,12 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdProfile struct { diff --git a/lxc/project.go b/lxc/project.go index 549c86332bee..faff21597b45 100644 --- a/lxc/project.go +++ b/lxc/project.go @@ -10,12 +10,12 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdProject struct { diff --git a/lxc/publish.go b/lxc/publish.go index bd0c0143bbd7..e8377e17f3d3 100644 --- a/lxc/publish.go +++ b/lxc/publish.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) type cmdPublish struct { diff --git a/lxc/query.go b/lxc/query.go index 9e18710526d0..88118e0938e3 100644 --- a/lxc/query.go +++ b/lxc/query.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdQuery struct { diff --git a/lxc/remote.go b/lxc/remote.go index 79fda4d71fa8..f03727b9aa04 100644 --- a/lxc/remote.go +++ b/lxc/remote.go @@ -13,13 +13,13 @@ import ( "github.com/spf13/cobra" "golang.org/x/term" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdRemote struct { diff --git a/lxc/rename.go b/lxc/rename.go index dee6b151c9fe..30f587ce445e 100644 --- a/lxc/rename.go +++ b/lxc/rename.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdRename struct { diff --git a/lxc/restore.go b/lxc/restore.go index d735cddbe898..80f48b202859 100644 --- a/lxc/restore.go +++ b/lxc/restore.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdRestore struct { diff --git a/lxc/snapshot.go b/lxc/snapshot.go index 5ec5bfb2b719..bbde7aa6c245 100644 --- a/lxc/snapshot.go +++ b/lxc/snapshot.go @@ -3,10 +3,10 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" "fmt" "strings" diff --git a/lxc/storage.go b/lxc/storage.go index de7cd13bba7c..1d5f1ea9ed3b 100644 --- a/lxc/storage.go +++ b/lxc/storage.go @@ -12,13 +12,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" + "github.com/canonical/lxd/shared/units" ) type cmdStorage struct { diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go index 1b370e1ef367..5c32968a7d52 100644 --- a/lxc/storage_volume.go +++ b/lxc/storage_volume.go @@ -12,13 +12,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type volumeColumn struct { diff --git a/lxc/utils.go b/lxc/utils.go index 9b9ceee51082..63d09a232290 100644 --- a/lxc/utils.go +++ b/lxc/utils.go @@ -9,10 +9,10 @@ import ( "github.com/fvbommel/sortorder" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type stringList [][]string diff --git a/lxc/utils/cancel.go b/lxc/utils/cancel.go index 5c86a49828eb..2cd9bbbe2037 100644 --- a/lxc/utils/cancel.go +++ b/lxc/utils/cancel.go @@ -6,8 +6,8 @@ import ( "os/signal" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/i18n" ) // CancelableWait waits for an operation and cancel it on SIGINT/SIGTERM diff --git a/lxc/utils/progress.go b/lxc/utils/progress.go index 9b7ef1892d87..e73194e80b93 100644 --- a/lxc/utils/progress.go +++ b/lxc/utils/progress.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/termios" ) // ProgressRenderer tracks the progress information diff --git a/lxc/utils/table.go b/lxc/utils/table.go index 4cf9ae50c3d8..9a9e68f3606c 100644 --- a/lxc/utils/table.go +++ b/lxc/utils/table.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared/i18n" "github.com/olekukonko/tablewriter" "gopkg.in/yaml.v2" ) diff --git a/lxc/utils_test.go b/lxc/utils_test.go index f8ad029e7327..6db6a99998c0 100644 --- a/lxc/utils_test.go +++ b/lxc/utils_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) type utilsTestSuite struct { diff --git a/lxc/version.go b/lxc/version.go index e0128c40e076..50721b382d6d 100644 --- a/lxc/version.go +++ b/lxc/version.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/version" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/version" ) type cmdVersion struct { diff --git a/lxd-agent/api.go b/lxd-agent/api.go index 33ed7d9722a0..46fb8b3e9fcf 100644 --- a/lxd-agent/api.go +++ b/lxd-agent/api.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/response" ) // APIEndpoint represents a URL in our API. diff --git a/lxd-agent/api_1.0.go b/lxd-agent/api_1.0.go index 26ece10259d5..063528dc84ac 100644 --- a/lxd-agent/api_1.0.go +++ b/lxd-agent/api_1.0.go @@ -4,10 +4,10 @@ import ( "net/http" "os" - "github.com/lxc/lxd/lxd/response" - lxdshared "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/response" + lxdshared "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var api10Cmd = APIEndpoint{ diff --git a/lxd-agent/daemon.go b/lxd-agent/daemon.go index 9b4844a8008f..d30c6c1d9cc5 100644 --- a/lxd-agent/daemon.go +++ b/lxd-agent/daemon.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/lxd/lxd/events" + "github.com/canonical/lxd/lxd/events" ) // A Daemon can respond to requests from a shared client. diff --git a/lxd-agent/devlxd.go b/lxd-agent/devlxd.go index 80ebe134dd8d..103c3747c328 100644 --- a/lxd-agent/devlxd.go +++ b/lxd-agent/devlxd.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // DevLxdServer creates an http.Server capable of handling requests against the diff --git a/lxd-agent/events.go b/lxd-agent/events.go index 31bf2e8a5539..e305e528950c 100644 --- a/lxd-agent/events.go +++ b/lxd-agent/events.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) var eventsCmd = APIEndpoint{ diff --git a/lxd-agent/exec.go b/lxd-agent/exec.go index 206fe0c58b08..c55074d1ce31 100644 --- a/lxd-agent/exec.go +++ b/lxd-agent/exec.go @@ -18,14 +18,14 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/netutils" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/netutils" ) const execWSControl = -1 diff --git a/lxd-agent/main.go b/lxd-agent/main.go index c6c750482f66..e89a4af1034a 100644 --- a/lxd-agent/main.go +++ b/lxd-agent/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxd-agent/main_agent.go b/lxd-agent/main_agent.go index 4d2634032991..6bc9f8f89280 100644 --- a/lxd-agent/main_agent.go +++ b/lxd-agent/main_agent.go @@ -16,12 +16,12 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/lxd/vsock" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/lxd/vsock" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) type cmdAgent struct { diff --git a/lxd-agent/network.go b/lxd-agent/network.go index e01849376479..56de95f0d2b8 100644 --- a/lxd-agent/network.go +++ b/lxd-agent/network.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // A variation of the standard tls.Listener that supports atomically swapping diff --git a/lxd-agent/operations.go b/lxd-agent/operations.go index beac610e707b..0fce34090849 100644 --- a/lxd-agent/operations.go +++ b/lxd-agent/operations.go @@ -8,11 +8,11 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) var operationCmd = APIEndpoint{ diff --git a/lxd-agent/server.go b/lxd-agent/server.go index 612c07c02164..a6739ba4f370 100644 --- a/lxd-agent/server.go +++ b/lxd-agent/server.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) func restServer(tlsConfig *tls.Config, cert *x509.Certificate, debug bool, d *Daemon) *http.Server { diff --git a/lxd-agent/sftp.go b/lxd-agent/sftp.go index 249fe6c05613..e7e4e693ea49 100644 --- a/lxd-agent/sftp.go +++ b/lxd-agent/sftp.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/sftp" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/response" ) var sftpCmd = APIEndpoint{ diff --git a/lxd-agent/state.go b/lxd-agent/state.go index ff8292e720a3..850d938b387c 100644 --- a/lxd-agent/state.go +++ b/lxd-agent/state.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var stateCmd = APIEndpoint{ diff --git a/lxd-agent/templates.go b/lxd-agent/templates.go index 621637eb2a8e..c68e5f2147b8 100644 --- a/lxd-agent/templates.go +++ b/lxd-agent/templates.go @@ -9,8 +9,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func templatesApply(path string) ([]string, error) { diff --git a/lxd-benchmark/benchmark/benchmark.go b/lxd-benchmark/benchmark/benchmark.go index 2d96f6fdb860..4be2873f47b3 100644 --- a/lxd-benchmark/benchmark/benchmark.go +++ b/lxd-benchmark/benchmark/benchmark.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) const userConfigKey = "user.lxd-benchmark" diff --git a/lxd-benchmark/benchmark/operation.go b/lxd-benchmark/benchmark/operation.go index b4f4f3cea7b9..2a0f466e504a 100644 --- a/lxd-benchmark/benchmark/operation.go +++ b/lxd-benchmark/benchmark/operation.go @@ -1,8 +1,8 @@ package benchmark import ( - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" ) func createContainer(c lxd.ContainerServer, fingerprint string, name string, privileged bool) error { diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go index 4aac4b90fcf7..b8aa1573ff34 100644 --- a/lxd-benchmark/main.go +++ b/lxd-benchmark/main.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd-benchmark/benchmark" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxd-benchmark/main_delete.go b/lxd-benchmark/main_delete.go index c9c12f177274..991fef0743d3 100644 --- a/lxd-benchmark/main_delete.go +++ b/lxd-benchmark/main_delete.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdDelete struct { diff --git a/lxd-benchmark/main_init.go b/lxd-benchmark/main_init.go index 7e2068b71d35..2cddb76b3a8d 100644 --- a/lxd-benchmark/main_init.go +++ b/lxd-benchmark/main_init.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdInit struct { diff --git a/lxd-benchmark/main_launch.go b/lxd-benchmark/main_launch.go index 1753879279e9..44c0a999f7c4 100644 --- a/lxd-benchmark/main_launch.go +++ b/lxd-benchmark/main_launch.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdLaunch struct { diff --git a/lxd-benchmark/main_start.go b/lxd-benchmark/main_start.go index c1cc0e3d5891..1f510296d827 100644 --- a/lxd-benchmark/main_start.go +++ b/lxd-benchmark/main_start.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdStart struct { diff --git a/lxd-benchmark/main_stop.go b/lxd-benchmark/main_stop.go index 056e0e179c9d..5b2c93d8737f 100644 --- a/lxd-benchmark/main_stop.go +++ b/lxd-benchmark/main_stop.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdStop struct { diff --git a/lxd-p2c/main.go b/lxd-p2c/main.go index a26f8b9ce7c8..df7253eb59ab 100644 --- a/lxd-p2c/main.go +++ b/lxd-p2c/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxd-p2c/main_migrate.go b/lxd-p2c/main_migrate.go index 50b2da07ae45..dfd28839e047 100644 --- a/lxd-p2c/main_migrate.go +++ b/lxd-p2c/main_migrate.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) type cmdMigrate struct { diff --git a/lxd-p2c/main_netcat.go b/lxd-p2c/main_netcat.go index db21bed71acb..e1a515ef3109 100644 --- a/lxd-p2c/main_netcat.go +++ b/lxd-p2c/main_netcat.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/eagain" + "github.com/canonical/lxd/shared/eagain" ) type cmdNetcat struct { diff --git a/lxd-p2c/transfer.go b/lxd-p2c/transfer.go index f3811225c6d8..67150e932b03 100644 --- a/lxd-p2c/transfer.go +++ b/lxd-p2c/transfer.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared" ) // Send an rsync stream of a path over a websocket diff --git a/lxd-p2c/utils.go b/lxd-p2c/utils.go index 5b410451b778..b9a5c1f62682 100644 --- a/lxd-p2c/utils.go +++ b/lxd-p2c/utils.go @@ -11,11 +11,11 @@ import ( "golang.org/x/sys/unix" "golang.org/x/term" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error { diff --git a/lxd/api.go b/lxd/api.go index df36293030c7..d0392f7c492b 100644 --- a/lxd/api.go +++ b/lxd/api.go @@ -8,13 +8,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - lxdRequest "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + lxdRequest "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared/logger" ) // swagger:operation GET / server api_get diff --git a/lxd/api_1.0.go b/lxd/api_1.0.go index b51e151de177..61069a9fc63c 100644 --- a/lxd/api_1.0.go +++ b/lxd/api_1.0.go @@ -7,23 +7,23 @@ import ( "os" "strings" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/config" - "github.com/lxc/lxd/lxd/db" - instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/config" + "github.com/canonical/lxd/lxd/db" + instanceDrivers "github.com/canonical/lxd/lxd/instance/drivers" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) var api10Cmd = APIEndpoint{ diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go index 14a054949443..7325e8d6cdcb 100644 --- a/lxd/api_cluster.go +++ b/lxd/api_cluster.go @@ -17,23 +17,23 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) var targetGroupPrefix = "@" diff --git a/lxd/api_cluster_test.go b/lxd/api_cluster_test.go index 90859fd3f46d..000d72514844 100644 --- a/lxd/api_cluster_test.go +++ b/lxd/api_cluster_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/api_internal.go b/lxd/api_internal.go index 3fcba51800b4..15e95ede0972 100644 --- a/lxd/api_internal.go +++ b/lxd/api_internal.go @@ -18,25 +18,25 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/node" - "github.com/lxc/lxd/lxd/db/query" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/query" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/units" ) var apiInternal = []APIEndpoint{ diff --git a/lxd/api_internal_recover.go b/lxd/api_internal_recover.go index 33b6681a0ff2..0a1aaf6c99a6 100644 --- a/lxd/api_internal_recover.go +++ b/lxd/api_internal_recover.go @@ -8,21 +8,21 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" ) // Define API endpoints for recover actions. diff --git a/lxd/api_internal_test.go b/lxd/api_internal_test.go index aedcae3c437b..48d67e95b79d 100644 --- a/lxd/api_internal_test.go +++ b/lxd/api_internal_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Test that an instance with a local root disk device just gets its pool property modified. diff --git a/lxd/api_networks_test.go b/lxd/api_networks_test.go index 4b71c4139b10..07cc338adf2a 100644 --- a/lxd/api_networks_test.go +++ b/lxd/api_networks_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/api_project.go b/lxd/api_project.go index 2a1e2c3ee0bd..7e37d121dc98 100644 --- a/lxd/api_project.go +++ b/lxd/api_project.go @@ -11,19 +11,19 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - projecthelpers "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + projecthelpers "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) var projectFeatures = []string{"features.images", "features.profiles", "features.storage.volumes"} diff --git a/lxd/api_storage_pools_test.go b/lxd/api_storage_pools_test.go index 0e291a7be242..cc47f2fe5e84 100644 --- a/lxd/api_storage_pools_test.go +++ b/lxd/api_storage_pools_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/apparmor/apparmor.go b/lxd/apparmor/apparmor.go index 3798ad647a9f..8e7462d3b040 100644 --- a/lxd/apparmor/apparmor.go +++ b/lxd/apparmor/apparmor.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) const ( diff --git a/lxd/apparmor/archive.go b/lxd/apparmor/archive.go index 4f93db0233a7..63de4731076a 100644 --- a/lxd/apparmor/archive.go +++ b/lxd/apparmor/archive.go @@ -7,8 +7,8 @@ import ( "strings" "text/template" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" ) var archiveProfileTpl = template.Must(template.New("archiveProfile").Parse(`#include diff --git a/lxd/apparmor/instance.go b/lxd/apparmor/instance.go index 3c143b328913..e38191aa3467 100644 --- a/lxd/apparmor/instance.go +++ b/lxd/apparmor/instance.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // Internal copy of the instance interface. diff --git a/lxd/apparmor/instance_forkproxy.go b/lxd/apparmor/instance_forkproxy.go index ead07e66d967..a7315f169e74 100644 --- a/lxd/apparmor/instance_forkproxy.go +++ b/lxd/apparmor/instance_forkproxy.go @@ -8,11 +8,11 @@ import ( "strings" "text/template" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // Internal copy of the device interface. diff --git a/lxd/apparmor/network.go b/lxd/apparmor/network.go index fd8714870b6d..a1801979209d 100644 --- a/lxd/apparmor/network.go +++ b/lxd/apparmor/network.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/lxc/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/sys" ) // Internal copy of the network interface. diff --git a/lxd/apparmor/network_dnsmasq.go b/lxd/apparmor/network_dnsmasq.go index 8113a3acf74d..5f1b8c75a343 100644 --- a/lxd/apparmor/network_dnsmasq.go +++ b/lxd/apparmor/network_dnsmasq.go @@ -5,8 +5,8 @@ import ( "strings" "text/template" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" ) var dnsmasqProfileTpl = template.Must(template.New("dnsmasqProfile").Parse(`#include diff --git a/lxd/apparmor/network_forkdns.go b/lxd/apparmor/network_forkdns.go index 75ec8c018fec..29ae7493e09b 100644 --- a/lxd/apparmor/network_forkdns.go +++ b/lxd/apparmor/network_forkdns.go @@ -6,9 +6,9 @@ import ( "strings" "text/template" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) var forkdnsProfileTpl = template.Must(template.New("forkdnsProfile").Parse(`#include diff --git a/lxd/archive/archive.go b/lxd/archive/archive.go index cab1af5a32d3..9c0ff2494453 100644 --- a/lxd/archive/archive.go +++ b/lxd/archive/archive.go @@ -13,12 +13,12 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/subprocess" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/subprocess" ) // ExtractWithFds runs extractor process under specifc AppArmor profile. diff --git a/lxd/backup.go b/lxd/backup.go index 127274291560..a26ad7816780 100644 --- a/lxd/backup.go +++ b/lxd/backup.go @@ -12,26 +12,26 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/units" ) // Create a new backup. diff --git a/lxd/backup/backup_common.go b/lxd/backup/backup_common.go index 6b298bcdd215..5638fd066fd7 100644 --- a/lxd/backup/backup_common.go +++ b/lxd/backup/backup_common.go @@ -3,7 +3,7 @@ package backup import ( "time" - "github.com/lxc/lxd/lxd/state" + "github.com/canonical/lxd/lxd/state" ) // WorkingDirPrefix is used when temporary working directories are needed. diff --git a/lxd/backup/backup_config.go b/lxd/backup/backup_config.go index 7a9a43859b04..59dc8e2a511e 100644 --- a/lxd/backup/backup_config.go +++ b/lxd/backup/backup_config.go @@ -8,12 +8,12 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // Config represents the config of a backup that can be stored in a backup.yaml file (or embedded in index.yaml). diff --git a/lxd/backup/backup_info.go b/lxd/backup/backup_info.go index e95dab2c6758..6c6347b22ef7 100644 --- a/lxd/backup/backup_info.go +++ b/lxd/backup/backup_info.go @@ -6,8 +6,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared/api" ) // Type indicates the type of backup. diff --git a/lxd/backup/backup_instance.go b/lxd/backup/backup_instance.go index 8eeb975a9293..1388222a88ca 100644 --- a/lxd/backup/backup_instance.go +++ b/lxd/backup/backup_instance.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Instance represents the backup relevant subset of a LXD instance. diff --git a/lxd/backup/backup_utils.go b/lxd/backup/backup_utils.go index edfefe4d0012..f5fbd25d5779 100644 --- a/lxd/backup/backup_utils.go +++ b/lxd/backup/backup_utils.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/lxc/lxd/lxd/archive" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/archive" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" ) // TarReader rewinds backup file handle r and returns new tar reader and process cleanup function. diff --git a/lxd/certificates.go b/lxd/certificates.go index 8fd7e40f14be..ea0379a9db97 100644 --- a/lxd/certificates.go +++ b/lxd/certificates.go @@ -13,22 +13,22 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) type certificateCache struct { diff --git a/lxd/cgroup/abstraction.go b/lxd/cgroup/abstraction.go index 96fda15aa810..49cf68583531 100644 --- a/lxd/cgroup/abstraction.go +++ b/lxd/cgroup/abstraction.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // CGroup represents the main cgroup abstraction. diff --git a/lxd/cgroup/file.go b/lxd/cgroup/file.go index e98fb8fcf8e6..e3efd4b01f46 100644 --- a/lxd/cgroup/file.go +++ b/lxd/cgroup/file.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // NewFileReadWriter returns a CGroup instance using the filesystem as its backend. diff --git a/lxd/cgroup/init.go b/lxd/cgroup/init.go index 42fb251711b6..8cb44ef9b4c4 100644 --- a/lxd/cgroup/init.go +++ b/lxd/cgroup/init.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) var cgControllers = map[string]Backend{} diff --git a/lxd/cluster/config.go b/lxd/cluster/config.go index dcb0ea72d58e..323ebdabc932 100644 --- a/lxd/cluster/config.go +++ b/lxd/cluster/config.go @@ -10,9 +10,9 @@ import ( "golang.org/x/crypto/scrypt" - "github.com/lxc/lxd/lxd/config" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/config" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared/validate" ) // Config holds cluster-wide configuration values. diff --git a/lxd/cluster/config_test.go b/lxd/cluster/config_test.go index b0f6d9fe169e..7c26ff5d64bd 100644 --- a/lxd/cluster/config_test.go +++ b/lxd/cluster/config_test.go @@ -3,8 +3,8 @@ package cluster_test import ( "testing" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/connect.go b/lxd/cluster/connect.go index 3e078b5635fa..dbca07a31198 100644 --- a/lxd/cluster/connect.go +++ b/lxd/cluster/connect.go @@ -11,16 +11,16 @@ import ( "net/url" "time" - "github.com/lxc/lxd/client" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // ErrCertificateExists indicates that a certificate already exists. diff --git a/lxd/cluster/events.go b/lxd/cluster/events.go index b378d5842af2..ceed15c59d04 100644 --- a/lxd/cluster/events.go +++ b/lxd/cluster/events.go @@ -7,13 +7,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var listeners = map[string]*lxd.EventListener{} diff --git a/lxd/cluster/gateway.go b/lxd/cluster/gateway.go index 26db96d5932a..fea5750d4681 100644 --- a/lxd/cluster/gateway.go +++ b/lxd/cluster/gateway.go @@ -22,13 +22,13 @@ import ( client "github.com/canonical/go-dqlite/client" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/tcp" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/tcp" ) // NewGateway creates a new Gateway for managing access to the dqlite cluster. diff --git a/lxd/cluster/gateway_export_test.go b/lxd/cluster/gateway_export_test.go index 03d246c0eff8..7bdf95650a11 100644 --- a/lxd/cluster/gateway_export_test.go +++ b/lxd/cluster/gateway_export_test.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" ) // IsLeader returns true if this node is the leader. diff --git a/lxd/cluster/gateway_test.go b/lxd/cluster/gateway_test.go index 5557bda2df68..6bfd29b9cc5f 100644 --- a/lxd/cluster/gateway_test.go +++ b/lxd/cluster/gateway_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/heartbeat.go b/lxd/cluster/heartbeat.go index f310aa42e13b..ab1711a36db4 100644 --- a/lxd/cluster/heartbeat.go +++ b/lxd/cluster/heartbeat.go @@ -13,13 +13,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) type heartbeatMode int diff --git a/lxd/cluster/heartbeat_test.go b/lxd/cluster/heartbeat_test.go index f85d79fc5b00..911416c7ba3a 100644 --- a/lxd/cluster/heartbeat_test.go +++ b/lxd/cluster/heartbeat_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/info.go b/lxd/cluster/info.go index 26b7da9e909b..c29059c7a5c4 100644 --- a/lxd/cluster/info.go +++ b/lxd/cluster/info.go @@ -7,10 +7,10 @@ import ( "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Load information about the dqlite node associated with this LXD member diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go index 8bf9248e7448..27626d7885a6 100644 --- a/lxd/cluster/membership.go +++ b/lxd/cluster/membership.go @@ -15,14 +15,14 @@ import ( "gopkg.in/inconshreveable/log15.v2" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Bootstrap turns a non-clustered LXD instance into the first (and leader) diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go index f72f8db5badc..21b422650cbb 100644 --- a/lxd/cluster/membership_test.go +++ b/lxd/cluster/membership_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/migrate.go b/lxd/cluster/migrate.go index dd228bb07a1a..d48409b89e28 100644 --- a/lxd/cluster/migrate.go +++ b/lxd/cluster/migrate.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/hashicorp/go-msgpack/codec" - "github.com/lxc/lxd/lxd/cluster/raft" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster/raft" + "github.com/canonical/lxd/shared" bolt "go.etcd.io/bbolt" ) diff --git a/lxd/cluster/migrate_test.go b/lxd/cluster/migrate_test.go index 4f1bd88d2fbb..6aaed8c60f44 100644 --- a/lxd/cluster/migrate_test.go +++ b/lxd/cluster/migrate_test.go @@ -9,8 +9,8 @@ import ( dqlite "github.com/canonical/go-dqlite" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/notify.go b/lxd/cluster/notify.go index 9009cc2621f6..730bbab38761 100644 --- a/lxd/cluster/notify.go +++ b/lxd/cluster/notify.go @@ -5,12 +5,12 @@ import ( "sync" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Notifier is a function that invokes the given function against each node in diff --git a/lxd/cluster/notify_test.go b/lxd/cluster/notify_test.go index 869877c49d84..885dabf96d1c 100644 --- a/lxd/cluster/notify_test.go +++ b/lxd/cluster/notify_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/raft_test.go b/lxd/cluster/raft_test.go index 8fe5ab3e27ba..ea5f9bc3f248 100644 --- a/lxd/cluster/raft_test.go +++ b/lxd/cluster/raft_test.go @@ -8,9 +8,9 @@ import ( "github.com/canonical/go-dqlite/client" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // Set the cluster.https_address config key to the given address, and insert the diff --git a/lxd/cluster/recover.go b/lxd/cluster/recover.go index 8b34f4949a1f..aaadb19ff36d 100644 --- a/lxd/cluster/recover.go +++ b/lxd/cluster/recover.go @@ -10,8 +10,8 @@ import ( dqlite "github.com/canonical/go-dqlite" client "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" ) // ListDatabaseNodes returns a list of database node names. diff --git a/lxd/cluster/resolve.go b/lxd/cluster/resolve.go index 084fa9db2443..f0ca21708a71 100644 --- a/lxd/cluster/resolve.go +++ b/lxd/cluster/resolve.go @@ -3,7 +3,7 @@ package cluster import ( "fmt" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) // ResolveTarget is a convenience for handling the value ?targetNode query diff --git a/lxd/cluster/tls.go b/lxd/cluster/tls.go index f19faae3c7cf..ad02b5239202 100644 --- a/lxd/cluster/tls.go +++ b/lxd/cluster/tls.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Return a TLS configuration suitable for establishing intra-member network connections using the server cert. diff --git a/lxd/cluster/upgrade.go b/lxd/cluster/upgrade.go index e4b110f0124c..79b5438ce86d 100644 --- a/lxd/cluster/upgrade.go +++ b/lxd/cluster/upgrade.go @@ -12,11 +12,11 @@ import ( "gopkg.in/inconshreveable/log15.v2" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // NotifyUpgradeCompleted sends a notification to all other nodes in the diff --git a/lxd/cluster/upgrade_test.go b/lxd/cluster/upgrade_test.go index 0ca869fb267a..0dfd5eec9041 100644 --- a/lxd/cluster/upgrade_test.go +++ b/lxd/cluster/upgrade_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" ) // A node can unblock other nodes that were waiting for a cluster upgrade to diff --git a/lxd/config/map.go b/lxd/config/map.go index 9a13a134fb09..9958ec535a42 100644 --- a/lxd/config/map.go +++ b/lxd/config/map.go @@ -6,7 +6,7 @@ import ( "sort" "strconv" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Map is a structured map of config keys to config values. diff --git a/lxd/config/map_test.go b/lxd/config/map_test.go index 25363a155d03..6b83e07fb443 100644 --- a/lxd/config/map_test.go +++ b/lxd/config/map_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/config/safe.go b/lxd/config/safe.go index a342832b22a6..5ccc37e85678 100644 --- a/lxd/config/safe.go +++ b/lxd/config/safe.go @@ -5,7 +5,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // SafeLoad is a wrapper around Load() that does not error when invalid keys diff --git a/lxd/config/safe_test.go b/lxd/config/safe_test.go index 92c79c6d6744..52f3d18922a2 100644 --- a/lxd/config/safe_test.go +++ b/lxd/config/safe_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" ) // If the givne values contain invalid keys, they are ignored. diff --git a/lxd/config/schema.go b/lxd/config/schema.go index a1bbc3edad14..6aba9d73f45c 100644 --- a/lxd/config/schema.go +++ b/lxd/config/schema.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Schema defines the available keys of a config Map, along with the types diff --git a/lxd/config/schema_test.go b/lxd/config/schema_test.go index b9a62760c470..e438f4df3a86 100644 --- a/lxd/config/schema_test.go +++ b/lxd/config/schema_test.go @@ -3,7 +3,7 @@ package config_test import ( "testing" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" "github.com/stretchr/testify/assert" ) diff --git a/lxd/config/validators_test.go b/lxd/config/validators_test.go index 44d6f3e07286..969de47eeb9c 100644 --- a/lxd/config/validators_test.go +++ b/lxd/config/validators_test.go @@ -3,7 +3,7 @@ package config_test import ( "testing" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" "github.com/stretchr/testify/assert" ) diff --git a/lxd/daemon.go b/lxd/daemon.go index 8ca91efec95b..db31d392c22d 100644 --- a/lxd/daemon.go +++ b/lxd/daemon.go @@ -31,38 +31,38 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery/identchecker" "gopkg.in/macaroon-bakery.v2/httpbakery" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/firewall" - "github.com/lxc/lxd/lxd/fsmonitor" - devmonitor "github.com/lxc/lxd/lxd/fsmonitor" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/firewall" + "github.com/canonical/lxd/lxd/fsmonitor" + devmonitor "github.com/canonical/lxd/lxd/fsmonitor" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/ucred" // Import instance/drivers without name so init() runs. - _ "github.com/lxc/lxd/lxd/instance/drivers" - instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/maas" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/seccomp" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + _ "github.com/canonical/lxd/lxd/instance/drivers" + instanceDrivers "github.com/canonical/lxd/lxd/instance/drivers" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/maas" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/seccomp" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // A Daemon can respond to requests from a shared client. diff --git a/lxd/daemon_config.go b/lxd/daemon_config.go index 57b6f04533a1..ad771b4c9d60 100644 --- a/lxd/daemon_config.go +++ b/lxd/daemon_config.go @@ -1,11 +1,11 @@ package main import ( - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" ) func daemonConfigRender(state *state.State) (map[string]interface{}, error) { diff --git a/lxd/daemon_images.go b/lxd/daemon_images.go index 58cd73cc4a23..bb48978bdd71 100644 --- a/lxd/daemon_images.go +++ b/lxd/daemon_images.go @@ -11,21 +11,21 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/version" ) // ImageDownloadArgs used with ImageDownload. diff --git a/lxd/daemon_integration_test.go b/lxd/daemon_integration_test.go index 815db3afd319..6ae1ccc3de90 100644 --- a/lxd/daemon_integration_test.go +++ b/lxd/daemon_integration_test.go @@ -7,10 +7,10 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/daemon_storage.go b/lxd/daemon_storage.go index ad0be35d6f4c..3b5c2361356a 100644 --- a/lxd/daemon_storage.go +++ b/lxd/daemon_storage.go @@ -7,14 +7,14 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" ) func daemonStorageVolumesUnmount(s *state.State) error { diff --git a/lxd/db/backups.go b/lxd/db/backups.go index f5516380c771..e5cf2c247977 100644 --- a/lxd/db/backups.go +++ b/lxd/db/backups.go @@ -10,7 +10,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // InstanceBackup is a value object holding all db-related details about an instance backup. diff --git a/lxd/db/certificates.go b/lxd/db/certificates.go index a7208a38438d..b7df8b9d399f 100644 --- a/lxd/db/certificates.go +++ b/lxd/db/certificates.go @@ -6,8 +6,8 @@ package db import ( "fmt" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) // Code generation directives. diff --git a/lxd/db/certificates.mapper.go b/lxd/db/certificates.mapper.go index 8e85ae67b681..2df2e139278d 100644 --- a/lxd/db/certificates.mapper.go +++ b/lxd/db/certificates.mapper.go @@ -9,9 +9,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/certificates_test.go b/lxd/db/certificates_test.go index 478acfd7e98e..d58801bc234d 100644 --- a/lxd/db/certificates_test.go +++ b/lxd/db/certificates_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) func TestGetCertificate(t *testing.T) { diff --git a/lxd/db/cluster/constants.go b/lxd/db/cluster/constants.go index b417d8194628..480f6c714539 100644 --- a/lxd/db/cluster/constants.go +++ b/lxd/db/cluster/constants.go @@ -1,7 +1,7 @@ package cluster import ( - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) // Numeric type codes identifying different kind of entities. diff --git a/lxd/db/cluster/open.go b/lxd/db/cluster/open.go index ef75ac103dbf..a1c58f0dec6c 100644 --- a/lxd/db/cluster/open.go +++ b/lxd/db/cluster/open.go @@ -7,13 +7,13 @@ import ( "sync/atomic" driver "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) // Open the cluster database object. diff --git a/lxd/db/cluster/open_test.go b/lxd/db/cluster/open_test.go index e2b3d2e1c3ef..16a27a2d16d9 100644 --- a/lxd/db/cluster/open_test.go +++ b/lxd/db/cluster/open_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/cluster/query.go b/lxd/db/cluster/query.go index 16b7aedf9934..17602398934b 100644 --- a/lxd/db/cluster/query.go +++ b/lxd/db/cluster/query.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // Update the schema and api_extensions columns of the row in the nodes table diff --git a/lxd/db/cluster/update.go b/lxd/db/cluster/update.go index 5c0ee173811e..b80f13f6889b 100644 --- a/lxd/db/cluster/update.go +++ b/lxd/db/cluster/update.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" ) // Schema for the cluster database. diff --git a/lxd/db/cluster/update_test.go b/lxd/db/cluster/update_test.go index 548a5636bcab..4c44939ac498 100644 --- a/lxd/db/cluster/update_test.go +++ b/lxd/db/cluster/update_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/osarch" "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/lxd/db/config.go b/lxd/db/config.go index 0c2d90e8ceac..029f73515572 100644 --- a/lxd/db/config.go +++ b/lxd/db/config.go @@ -3,7 +3,7 @@ package db -import "github.com/lxc/lxd/lxd/db/query" +import "github.com/canonical/lxd/lxd/db/query" // Code generation directives. // diff --git a/lxd/db/config.mapper.go b/lxd/db/config.mapper.go index 00cbd97434d5..0add03d4f91b 100644 --- a/lxd/db/config.mapper.go +++ b/lxd/db/config.mapper.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/config_test.go b/lxd/db/config_test.go index 0c09a61868c3..24193262b96b 100644 --- a/lxd/db/config_test.go +++ b/lxd/db/config_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/db.go b/lxd/db/db.go index 99bc82985387..a982492fc800 100644 --- a/lxd/db/db.go +++ b/lxd/db/db.go @@ -20,11 +20,11 @@ import ( "github.com/canonical/go-dqlite/driver" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/node" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Node mediates access to LXD's data stored in the node-local SQLite database. diff --git a/lxd/db/db_internal_test.go b/lxd/db/db_internal_test.go index 5b0c123d092f..b20de10a2891 100644 --- a/lxd/db/db_internal_test.go +++ b/lxd/db/db_internal_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) const fixtures string = ` diff --git a/lxd/db/db_test.go b/lxd/db/db_test.go index f604ed48f4d3..1483904b7a48 100644 --- a/lxd/db/db_test.go +++ b/lxd/db/db_test.go @@ -6,8 +6,8 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/devices.mapper.go b/lxd/db/devices.mapper.go index 9579ea31bdc8..107001ef5a35 100644 --- a/lxd/db/devices.mapper.go +++ b/lxd/db/devices.mapper.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/generate/db.go b/lxd/db/generate/db.go index 171ec72f8772..8d83fad72cb4 100644 --- a/lxd/db/generate/db.go +++ b/lxd/db/generate/db.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd/db/generate/db" - "github.com/lxc/lxd/lxd/db/generate/file" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/db" + "github.com/canonical/lxd/lxd/db/generate/file" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Return a new db command. diff --git a/lxd/db/generate/db/constants.go b/lxd/db/generate/db/constants.go index 8e03c606763c..eef3a16049ba 100644 --- a/lxd/db/generate/db/constants.go +++ b/lxd/db/generate/db/constants.go @@ -4,7 +4,7 @@ package db var Imports = []string{ "database/sql", "fmt", - "github.com/lxc/lxd/lxd/db/cluster", - "github.com/lxc/lxd/lxd/db/query", - "github.com/lxc/lxd/shared/api", + "github.com/canonical/lxd/lxd/db/cluster", + "github.com/canonical/lxd/lxd/db/query", + "github.com/canonical/lxd/shared/api", } diff --git a/lxd/db/generate/db/lex.go b/lxd/db/generate/db/lex.go index 7b435b651e09..c6c6cb60a2f1 100644 --- a/lxd/db/generate/db/lex.go +++ b/lxd/db/generate/db/lex.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Return the table name for the given database entity. diff --git a/lxd/db/generate/db/mapping.go b/lxd/db/generate/db/mapping.go index 90113875c1de..b56630ccb3a5 100644 --- a/lxd/db/generate/db/mapping.go +++ b/lxd/db/generate/db/mapping.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/lxc/lxd/lxd/db/generate/lex" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/shared" ) // Mapping holds information for mapping database tables to a Go structure. diff --git a/lxd/db/generate/db/method.go b/lxd/db/generate/db/method.go index 7a4e057f195c..2f024777ab74 100644 --- a/lxd/db/generate/db/method.go +++ b/lxd/db/generate/db/method.go @@ -5,8 +5,8 @@ import ( "go/ast" "strings" - "github.com/lxc/lxd/lxd/db/generate/file" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/file" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Method generates a code snippet for a particular database query method. diff --git a/lxd/db/generate/db/parse.go b/lxd/db/generate/db/parse.go index 551e60c8dce1..cb107003b4e1 100644 --- a/lxd/db/generate/db/parse.go +++ b/lxd/db/generate/db/parse.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "github.com/lxc/lxd/lxd/db/generate/lex" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/shared" ) // Packages returns the the AST packages in which to search for structs. diff --git a/lxd/db/generate/db/parse_test.go b/lxd/db/generate/db/parse_test.go index 2303cacacb9a..6405f30f9fc3 100644 --- a/lxd/db/generate/db/parse_test.go +++ b/lxd/db/generate/db/parse_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db/generate/db" + "github.com/canonical/lxd/lxd/db/generate/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/generate/db/schema.go b/lxd/db/generate/db/schema.go index 63ff86046f7e..f10ed9989d43 100644 --- a/lxd/db/generate/db/schema.go +++ b/lxd/db/generate/db/schema.go @@ -3,8 +3,8 @@ package db import ( "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/node" ) // UpdateSchema updates the schema.go file of the cluster and node databases. diff --git a/lxd/db/generate/db/stmt.go b/lxd/db/generate/db/stmt.go index 0b070ff7d058..e4e28b4f9a8c 100644 --- a/lxd/db/generate/db/stmt.go +++ b/lxd/db/generate/db/stmt.go @@ -5,8 +5,8 @@ import ( "go/ast" "strings" - "github.com/lxc/lxd/lxd/db/generate/file" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/file" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Stmt generates a particular database query statement. diff --git a/lxd/db/generate/lex/parse.go b/lxd/db/generate/lex/parse.go index e893eefbb7a1..38ac47c537d4 100644 --- a/lxd/db/generate/lex/parse.go +++ b/lxd/db/generate/lex/parse.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Parse runs the Go parser against the given package directory. diff --git a/lxd/db/generate/lex/parse_test.go b/lxd/db/generate/lex/parse_test.go index b59ae6e175d8..0526af1c5de4 100644 --- a/lxd/db/generate/lex/parse_test.go +++ b/lxd/db/generate/lex/parse_test.go @@ -5,7 +5,7 @@ import ( "runtime" "testing" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/lex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/images.go b/lxd/db/images.go index fad9018ae133..9bd04004062a 100644 --- a/lxd/db/images.go +++ b/lxd/db/images.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // Code generation directives. diff --git a/lxd/db/images.mapper.go b/lxd/db/images.mapper.go index 02c538ceea89..d1ac57217a9d 100644 --- a/lxd/db/images.mapper.go +++ b/lxd/db/images.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/images_test.go b/lxd/db/images_test.go index 344d7366980e..1e6d0c75b989 100644 --- a/lxd/db/images_test.go +++ b/lxd/db/images_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/instance_profiles.mapper.go b/lxd/db/instance_profiles.mapper.go index 262968ec85b1..e4b2c5cde801 100644 --- a/lxd/db/instance_profiles.mapper.go +++ b/lxd/db/instance_profiles.mapper.go @@ -8,9 +8,9 @@ package db import ( "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/instances.go b/lxd/db/instances.go index a7c70e4b4861..2d1192a080c6 100644 --- a/lxd/db/instances.go +++ b/lxd/db/instances.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Code generation directives. diff --git a/lxd/db/instances.mapper.go b/lxd/db/instances.mapper.go index 870d12ea8ce6..22fbc70f060a 100644 --- a/lxd/db/instances.mapper.go +++ b/lxd/db/instances.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/instances_test.go b/lxd/db/instances_test.go index 8a39d568acb2..699c5a10a1a8 100644 --- a/lxd/db/instances_test.go +++ b/lxd/db/instances_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/project" + "github.com/canonical/lxd/lxd/project" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared/api" ) func TestContainerList(t *testing.T) { diff --git a/lxd/db/legacy.go b/lxd/db/legacy.go index c91504f93756..44f0c9863fb4 100644 --- a/lxd/db/legacy.go +++ b/lxd/db/legacy.go @@ -6,7 +6,7 @@ package db import ( "database/sql" - "github.com/lxc/lxd/lxd/db/schema" + "github.com/canonical/lxd/lxd/db/schema" ) // LegacyPatch is a "database" update that performs non-database work. They diff --git a/lxd/db/migration.go b/lxd/db/migration.go index 62e66647930d..9cdf81557f11 100644 --- a/lxd/db/migration.go +++ b/lxd/db/migration.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // LoadPreClusteringData loads all the data that before the introduction of diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go index 3aebd8105ce1..656afd81299e 100644 --- a/lxd/db/migration_test.go +++ b/lxd/db/migration_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/networks.go b/lxd/db/networks.go index cbf987a29966..17ef80732eb2 100644 --- a/lxd/db/networks.go +++ b/lxd/db/networks.go @@ -10,10 +10,10 @@ import ( "net/http" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // GetNetworksLocalConfig returns a map associating each network name to its diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go index ce5957be4f4c..8509f7018f25 100644 --- a/lxd/db/networks_test.go +++ b/lxd/db/networks_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/node.go b/lxd/db/node.go index cdd3d3dd98fb..4b2e9355d6c8 100644 --- a/lxd/db/node.go +++ b/lxd/db/node.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) // ClusterRole represents the role of a member in a cluster. diff --git a/lxd/db/node/open.go b/lxd/db/node/open.go index 452502255ffd..2e4b1fb34b34 100644 --- a/lxd/db/node/open.go +++ b/lxd/db/node/open.go @@ -5,9 +5,9 @@ import ( "fmt" "path/filepath" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Open the node-local database object. diff --git a/lxd/db/node/open_test.go b/lxd/db/node/open_test.go index 16104044287b..dd3aebabe2de 100644 --- a/lxd/db/node/open_test.go +++ b/lxd/db/node/open_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/lxc/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/node" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/node/update.go b/lxd/db/node/update.go index 5610800d5346..62ba1db77cb9 100644 --- a/lxd/db/node/update.go +++ b/lxd/db/node/update.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" ) // Schema for the local database. diff --git a/lxd/db/node/update_test.go b/lxd/db/node/update_test.go index 6f204fb2913a..21984e69b417 100644 --- a/lxd/db/node/update_test.go +++ b/lxd/db/node/update_test.go @@ -4,9 +4,9 @@ import ( "database/sql" "testing" - "github.com/lxc/lxd/lxd/db/node" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/node_test.go b/lxd/db/node_test.go index f2fe6cbc06b5..666913fe62c4 100644 --- a/lxd/db/node_test.go +++ b/lxd/db/node_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/operations.go b/lxd/db/operations.go index 2521be648b2d..783b998072eb 100644 --- a/lxd/db/operations.go +++ b/lxd/db/operations.go @@ -4,7 +4,7 @@ package db import ( - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) //go:generate -command mapper lxd-generate db mapper -t operations.mapper.go diff --git a/lxd/db/operations.mapper.go b/lxd/db/operations.mapper.go index 237e08fbd00d..abd03d8b74e8 100644 --- a/lxd/db/operations.mapper.go +++ b/lxd/db/operations.mapper.go @@ -9,9 +9,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/operations_test.go b/lxd/db/operations_test.go index 71b223d3df7f..03d83c91b4be 100644 --- a/lxd/db/operations_test.go +++ b/lxd/db/operations_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/patches.go b/lxd/db/patches.go index 687dc2bf4966..6933e13f72fe 100644 --- a/lxd/db/patches.go +++ b/lxd/db/patches.go @@ -6,7 +6,7 @@ package db import ( "database/sql" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // GetAppliedPatches returns the names of all patches currently applied on this node. diff --git a/lxd/db/profiles.go b/lxd/db/profiles.go index a8d53a06cf66..c376019aa034 100644 --- a/lxd/db/profiles.go +++ b/lxd/db/profiles.go @@ -6,8 +6,8 @@ package db import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/shared/api" ) // Code generation directives. diff --git a/lxd/db/profiles.mapper.go b/lxd/db/profiles.mapper.go index c174b9fce657..a8a2fc750ac8 100644 --- a/lxd/db/profiles.mapper.go +++ b/lxd/db/profiles.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/projects.go b/lxd/db/projects.go index 22e2786accb5..b7e6fd4b2351 100644 --- a/lxd/db/projects.go +++ b/lxd/db/projects.go @@ -7,9 +7,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Code generation directives. diff --git a/lxd/db/projects.mapper.go b/lxd/db/projects.mapper.go index b9e825d3bb1e..885250a96a45 100644 --- a/lxd/db/projects.mapper.go +++ b/lxd/db/projects.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/projects_test.go b/lxd/db/projects_test.go index d0bd96563096..b5f53c5d82cb 100644 --- a/lxd/db/projects_test.go +++ b/lxd/db/projects_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/config_test.go b/lxd/db/query/config_test.go index d77026d172ff..182d15db1c77 100644 --- a/lxd/db/query/config_test.go +++ b/lxd/db/query/config_test.go @@ -4,7 +4,7 @@ import ( "database/sql" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/count_test.go b/lxd/db/query/count_test.go index 997dc44cd3fe..99f94f5c4ab2 100644 --- a/lxd/db/query/count_test.go +++ b/lxd/db/query/count_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/dump_test.go b/lxd/db/query/dump_test.go index b3ed947f885c..122128bfc1e4 100644 --- a/lxd/db/query/dump_test.go +++ b/lxd/db/query/dump_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/objects_test.go b/lxd/db/query/objects_test.go index 859c090dca84..d89737c807f1 100644 --- a/lxd/db/query/objects_test.go +++ b/lxd/db/query/objects_test.go @@ -4,7 +4,7 @@ import ( "database/sql" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/retry.go b/lxd/db/query/retry.go index f98d53274c66..55ef9c30de87 100644 --- a/lxd/db/query/retry.go +++ b/lxd/db/query/retry.go @@ -10,7 +10,7 @@ import ( "github.com/canonical/go-dqlite/driver" "github.com/mattn/go-sqlite3" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) const maxRetries = 250 diff --git a/lxd/db/query/slices_test.go b/lxd/db/query/slices_test.go index 88877e8fa232..7023a8714c1d 100644 --- a/lxd/db/query/slices_test.go +++ b/lxd/db/query/slices_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // Exercise possible failure modes. diff --git a/lxd/db/query/transaction.go b/lxd/db/query/transaction.go index c2037be95823..e9661547d149 100644 --- a/lxd/db/query/transaction.go +++ b/lxd/db/query/transaction.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // Transaction executes the given function within a database transaction. diff --git a/lxd/db/query/transaction_test.go b/lxd/db/query/transaction_test.go index 8b73b15d135b..b946cb50e53b 100644 --- a/lxd/db/query/transaction_test.go +++ b/lxd/db/query/transaction_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" ) diff --git a/lxd/db/raft.go b/lxd/db/raft.go index 430422644a11..b272faafc568 100644 --- a/lxd/db/raft.go +++ b/lxd/db/raft.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // RaftNode holds information about a single node in the dqlite raft cluster. diff --git a/lxd/db/raft_test.go b/lxd/db/raft_test.go index 6ef5a426bf43..0e30f3cef68d 100644 --- a/lxd/db/raft_test.go +++ b/lxd/db/raft_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) // Fetch all raft nodes. diff --git a/lxd/db/schema/query.go b/lxd/db/schema/query.go index 7998dc066ffe..5a4682abe5f9 100644 --- a/lxd/db/schema/query.go +++ b/lxd/db/schema/query.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "os" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" ) // DoesSchemaTableExist return whether the schema table is present in the diff --git a/lxd/db/schema/schema.go b/lxd/db/schema/schema.go index 576a5105be1d..9bc69ed9b06f 100644 --- a/lxd/db/schema/schema.go +++ b/lxd/db/schema/schema.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" ) // Schema captures the schema of a database in terms of a series of ordered diff --git a/lxd/db/schema/schema_test.go b/lxd/db/schema/schema_test.go index 752de4f14ed0..208b9ba28f15 100644 --- a/lxd/db/schema/schema_test.go +++ b/lxd/db/schema/schema_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" ) // WriteTempFile creates a temp file with the specified content diff --git a/lxd/db/schema/update_test.go b/lxd/db/schema/update_test.go index 8e3449a02306..fdacbcc0c96b 100644 --- a/lxd/db/schema/update_test.go +++ b/lxd/db/schema/update_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" ) // A Go source file matching the given prefix is created in the calling diff --git a/lxd/db/snapshots.go b/lxd/db/snapshots.go index 2d1b63a2f5a3..aaea10aff36e 100644 --- a/lxd/db/snapshots.go +++ b/lxd/db/snapshots.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Code generation directives. diff --git a/lxd/db/snapshots.mapper.go b/lxd/db/snapshots.mapper.go index 47ab1fe083dd..3b47067f93ae 100644 --- a/lxd/db/snapshots.mapper.go +++ b/lxd/db/snapshots.mapper.go @@ -9,9 +9,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/snapshots_test.go b/lxd/db/snapshots_test.go index 42a71ae56d65..878eeaa5b2fa 100644 --- a/lxd/db/snapshots_test.go +++ b/lxd/db/snapshots_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" ) func TestGetInstanceSnapshots(t *testing.T) { diff --git a/lxd/db/storage_pools.go b/lxd/db/storage_pools.go index be3b673e87ba..d490081acb69 100644 --- a/lxd/db/storage_pools.go +++ b/lxd/db/storage_pools.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // GetStoragePoolsLocalConfig returns a map associating each storage pool name to diff --git a/lxd/db/storage_pools_export_test.go b/lxd/db/storage_pools_export_test.go index e276f5ef9ecb..01421594c59b 100644 --- a/lxd/db/storage_pools_export_test.go +++ b/lxd/db/storage_pools_export_test.go @@ -3,7 +3,7 @@ package db -import "github.com/lxc/lxd/shared/api" +import "github.com/canonical/lxd/shared/api" func (c *Cluster) GetStoragePoolVolume(project string, volumeName string, volumeType int, poolID, nodeID int64) (int64, *api.StorageVolume, error) { return c.storagePoolVolumeGetType(project, volumeName, volumeType, poolID, nodeID) diff --git a/lxd/db/storage_pools_test.go b/lxd/db/storage_pools_test.go index cb6d12608011..6b771e89b9a2 100644 --- a/lxd/db/storage_pools_test.go +++ b/lxd/db/storage_pools_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/storage_volume_snapshots.go b/lxd/db/storage_volume_snapshots.go index 9c008e0e0664..2605aa6a61b9 100644 --- a/lxd/db/storage_volume_snapshots.go +++ b/lxd/db/storage_volume_snapshots.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" ) // CreateStorageVolumeSnapshot creates a new storage volume snapshot attached to a given diff --git a/lxd/db/storage_volumes.go b/lxd/db/storage_volumes.go index f1153c3f3e0c..baf81acbfe1b 100644 --- a/lxd/db/storage_volumes.go +++ b/lxd/db/storage_volumes.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // StorageRemoteDriverNames returns a list of remote storage driver names. diff --git a/lxd/db/storage_volumes_test.go b/lxd/db/storage_volumes_test.go index f13b94a9a3c7..d9735aa970ae 100644 --- a/lxd/db/storage_volumes_test.go +++ b/lxd/db/storage_volumes_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/device/config/device_runconfig.go b/lxd/device/config/device_runconfig.go index 5eabcebd019c..642e933b1400 100644 --- a/lxd/device/config/device_runconfig.go +++ b/lxd/device/config/device_runconfig.go @@ -1,7 +1,7 @@ package config import ( - "github.com/lxc/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/revert" ) // MountOwnerShiftNone do not use owner shifting. diff --git a/lxd/device/device_common.go b/lxd/device/device_common.go index 072c562711fa..44e92ecefa51 100644 --- a/lxd/device/device_common.go +++ b/lxd/device/device_common.go @@ -3,12 +3,12 @@ package device import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // deviceCommon represents the common struct for all devices. diff --git a/lxd/device/device_interface.go b/lxd/device/device_interface.go index a37428e5c29b..2c88547404ab 100644 --- a/lxd/device/device_interface.go +++ b/lxd/device/device_interface.go @@ -1,10 +1,10 @@ package device import ( - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/api" ) // VolatileSetter is a function that accepts one or more key/value strings to save into the LXD diff --git a/lxd/device/device_load.go b/lxd/device/device_load.go index 529c427927be..f63284f03b18 100644 --- a/lxd/device/device_load.go +++ b/lxd/device/device_load.go @@ -3,11 +3,11 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/validate" ) // newByType returns a new unitialised device based of the type indicated by the project and device config. diff --git a/lxd/device/device_utils_disk.go b/lxd/device/device_utils_disk.go index e8784378a154..1b9216ac3f72 100644 --- a/lxd/device/device_utils_disk.go +++ b/lxd/device/device_utils_disk.go @@ -10,13 +10,13 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/revert" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/subprocess" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/revert" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/subprocess" ) // BlockFsDetect detects the type of block device. diff --git a/lxd/device/device_utils_generic.go b/lxd/device/device_utils_generic.go index 66f170179a35..03be28dcb232 100644 --- a/lxd/device/device_utils_generic.go +++ b/lxd/device/device_utils_generic.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // deviceJoinPath joins together prefix and text delimited by a "." for device path generation. diff --git a/lxd/device/device_utils_gpu.go b/lxd/device/device_utils_gpu.go index c2452cca8050..2d7fb98ac3f2 100644 --- a/lxd/device/device_utils_gpu.go +++ b/lxd/device/device_utils_gpu.go @@ -1,7 +1,7 @@ package device import ( - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/shared/validate" "strings" ) diff --git a/lxd/device/device_utils_infiniband.go b/lxd/device/device_utils_infiniband.go index 7d9f3adf2b93..8583567549a5 100644 --- a/lxd/device/device_utils_infiniband.go +++ b/lxd/device/device_utils_infiniband.go @@ -5,9 +5,9 @@ import ( "net" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/api" ) // IBDevPrefix Infiniband devices prefix. diff --git a/lxd/device/device_utils_instance.go b/lxd/device/device_utils_instance.go index f9bff3c229b6..9bb6a7c4c178 100644 --- a/lxd/device/device_utils_instance.go +++ b/lxd/device/device_utils_instance.go @@ -1,7 +1,7 @@ package device import ( - "github.com/lxc/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/instancetype" ) // instanceSupported is a helper function to check instance type is supported for validation. diff --git a/lxd/device/device_utils_network.go b/lxd/device/device_utils_network.go index 8ea5a0cb061b..37f58e9ef0f9 100644 --- a/lxd/device/device_utils_network.go +++ b/lxd/device/device_utils_network.go @@ -14,17 +14,17 @@ import ( "github.com/j-keck/arping" "github.com/mdlayher/ndp" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" ) // Instances can be started in parallel, so lock the creation of VLANs. diff --git a/lxd/device/device_utils_proxy.go b/lxd/device/device_utils_proxy.go index 48ce5db4d92d..2cb165101b7e 100644 --- a/lxd/device/device_utils_proxy.go +++ b/lxd/device/device_utils_proxy.go @@ -5,10 +5,10 @@ import ( "net" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // ProxyParseAddr validates a proxy address and parses it into its constituent parts. diff --git a/lxd/device/device_utils_unix.go b/lxd/device/device_utils_unix.go index c1fe7c8cd2ad..07143826a58b 100644 --- a/lxd/device/device_utils_unix.go +++ b/lxd/device/device_utils_unix.go @@ -10,12 +10,12 @@ import ( "golang.org/x/sys/unix" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) // unixDefaultMode default mode to create unix devices with if not specified in device config. diff --git a/lxd/device/device_utils_unix_events.go b/lxd/device/device_utils_unix_events.go index 1d9ceabd93bb..d45fdab82a19 100644 --- a/lxd/device/device_utils_unix_events.go +++ b/lxd/device/device_utils_unix_events.go @@ -8,11 +8,11 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // UnixEvent represents the properties of a Unix device inotify event. diff --git a/lxd/device/device_utils_unix_hotplug_events.go b/lxd/device/device_utils_unix_hotplug_events.go index ce0e44631d6f..3376117f6ed6 100644 --- a/lxd/device/device_utils_unix_hotplug_events.go +++ b/lxd/device/device_utils_unix_hotplug_events.go @@ -8,10 +8,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) // UnixHotplugEvent represents the properties of a Unix hotplug device uevent. diff --git a/lxd/device/device_utils_usb_events.go b/lxd/device/device_utils_usb_events.go index 26ee8f584f3a..69eab5319f99 100644 --- a/lxd/device/device_utils_usb_events.go +++ b/lxd/device/device_utils_usb_events.go @@ -9,10 +9,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) // USBEvent represents the properties of a USB device uevent. diff --git a/lxd/device/disk.go b/lxd/device/disk.go index f41ec401a807..84e88d04f1a4 100644 --- a/lxd/device/disk.go +++ b/lxd/device/disk.go @@ -14,22 +14,22 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // Special disk "source" value used for generating a VM cloud-init config ISO. diff --git a/lxd/device/gpu.go b/lxd/device/gpu.go index 72540f32aab4..b29aec4a632a 100644 --- a/lxd/device/gpu.go +++ b/lxd/device/gpu.go @@ -1,6 +1,6 @@ package device -import "github.com/lxc/lxd/shared/validate" +import "github.com/canonical/lxd/shared/validate" func gpuValidationRules(requiredFields []string, optionalFields []string) map[string]func(value string) error { // Define a set of default validators for each field name. diff --git a/lxd/device/gpu_mdev.go b/lxd/device/gpu_mdev.go index e9787c790252..fbb46c1385c6 100644 --- a/lxd/device/gpu_mdev.go +++ b/lxd/device/gpu_mdev.go @@ -9,13 +9,13 @@ import ( "github.com/pborman/uuid" log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) type gpuMdev struct { diff --git a/lxd/device/gpu_mig.go b/lxd/device/gpu_mig.go index 3b28bebc27b8..87286f7ce75d 100644 --- a/lxd/device/gpu_mig.go +++ b/lxd/device/gpu_mig.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type gpuMIG struct { diff --git a/lxd/device/gpu_physical.go b/lxd/device/gpu_physical.go index 2f8eb68e08a5..f5a7aa553b48 100644 --- a/lxd/device/gpu_physical.go +++ b/lxd/device/gpu_physical.go @@ -11,13 +11,13 @@ import ( "golang.org/x/sys/unix" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) const gpuDRIDevPath = "/dev/dri" diff --git a/lxd/device/gpu_sriov.go b/lxd/device/gpu_sriov.go index d4314436c41d..e80e7867b0fb 100644 --- a/lxd/device/gpu_sriov.go +++ b/lxd/device/gpu_sriov.go @@ -7,14 +7,14 @@ import ( "strconv" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) type gpuSRIOV struct { diff --git a/lxd/device/infiniband_physical.go b/lxd/device/infiniband_physical.go index ec8c3c1e6750..f9690236d6ec 100644 --- a/lxd/device/infiniband_physical.go +++ b/lxd/device/infiniband_physical.go @@ -3,12 +3,12 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/shared" ) type infinibandPhysical struct { diff --git a/lxd/device/infiniband_sriov.go b/lxd/device/infiniband_sriov.go index 645637f3f706..badb6550ddc7 100644 --- a/lxd/device/infiniband_sriov.go +++ b/lxd/device/infiniband_sriov.go @@ -3,14 +3,14 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type infinibandSRIOV struct { diff --git a/lxd/device/nic.go b/lxd/device/nic.go index fb4ff9d1c1e1..3522816d6441 100644 --- a/lxd/device/nic.go +++ b/lxd/device/nic.go @@ -3,9 +3,9 @@ package device import ( "fmt" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // nicValidationRules returns config validation rules for nic devices. diff --git a/lxd/device/nic_bridged.go b/lxd/device/nic_bridged.go index 18e335942bf6..fd629ff53aa2 100644 --- a/lxd/device/nic_bridged.go +++ b/lxd/device/nic_bridged.go @@ -17,21 +17,21 @@ import ( "github.com/mdlayher/netx/eui64" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc" - firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/lxd/dnsmasq/dhcpalloc" + firewallDrivers "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) type bridgeNetwork interface { diff --git a/lxd/device/nic_ipvlan.go b/lxd/device/nic_ipvlan.go index 5870839cc735..e5b9f0a79e45 100644 --- a/lxd/device/nic_ipvlan.go +++ b/lxd/device/nic_ipvlan.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) type nicIPVLAN struct { diff --git a/lxd/device/nic_macvlan.go b/lxd/device/nic_macvlan.go index f7241767b7fb..1e7d510a8c35 100644 --- a/lxd/device/nic_macvlan.go +++ b/lxd/device/nic_macvlan.go @@ -3,13 +3,13 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) type nicMACVLAN struct { diff --git a/lxd/device/nic_p2p.go b/lxd/device/nic_p2p.go index ba89a534c852..d771acaa9a2f 100644 --- a/lxd/device/nic_p2p.go +++ b/lxd/device/nic_p2p.go @@ -3,12 +3,12 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" ) type nicP2P struct { diff --git a/lxd/device/nic_physical.go b/lxd/device/nic_physical.go index b112a8eff4b6..b1bb93fd5b74 100644 --- a/lxd/device/nic_physical.go +++ b/lxd/device/nic_physical.go @@ -3,15 +3,15 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) type nicPhysical struct { diff --git a/lxd/device/nic_routed.go b/lxd/device/nic_routed.go index b0e8804e8775..6e9956c175b0 100644 --- a/lxd/device/nic_routed.go +++ b/lxd/device/nic_routed.go @@ -10,15 +10,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) var nicRoutedIPGateway = map[string]string{ diff --git a/lxd/device/nic_sriov.go b/lxd/device/nic_sriov.go index 55cc564421b3..b60516286b99 100644 --- a/lxd/device/nic_sriov.go +++ b/lxd/device/nic_sriov.go @@ -3,12 +3,12 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) type nicSRIOV struct { diff --git a/lxd/device/nictype/nictype.go b/lxd/device/nictype/nictype.go index bf2ee20d5ba0..58da8b651303 100644 --- a/lxd/device/nictype/nictype.go +++ b/lxd/device/nictype/nictype.go @@ -5,8 +5,8 @@ package nictype import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/state" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/state" ) // NICType resolves the NIC Type for the supplied NIC device config. diff --git a/lxd/device/none.go b/lxd/device/none.go index 5fa3f08b4963..910560732a01 100644 --- a/lxd/device/none.go +++ b/lxd/device/none.go @@ -1,8 +1,8 @@ package device import ( - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" ) type none struct { diff --git a/lxd/device/pci/pci.go b/lxd/device/pci/pci.go index b0389a37f3ed..2f84f8d5a393 100644 --- a/lxd/device/pci/pci.go +++ b/lxd/device/pci/pci.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) // Device represents info about a PCI uevent device. diff --git a/lxd/device/pci/pci_test.go b/lxd/device/pci/pci_test.go index 0d0e0de61dc6..8839c5585119 100644 --- a/lxd/device/pci/pci_test.go +++ b/lxd/device/pci/pci_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/lxc/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/device/pci" ) func TestNormaliseAddress(t *testing.T) { diff --git a/lxd/device/proxy.go b/lxd/device/proxy.go index 940cef3801d2..a60d4c63d634 100644 --- a/lxd/device/proxy.go +++ b/lxd/device/proxy.go @@ -12,19 +12,19 @@ import ( liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/apparmor" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/apparmor" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + firewallDrivers "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/validate" ) type proxy struct { diff --git a/lxd/device/unix_common.go b/lxd/device/unix_common.go index b3522213ebcc..47e20fa8a034 100644 --- a/lxd/device/unix_common.go +++ b/lxd/device/unix_common.go @@ -5,13 +5,13 @@ import ( "path/filepath" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/fsmonitor/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/fsmonitor/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // unixIsOurDeviceType checks that device file type matches what we are expecting in the config. diff --git a/lxd/device/unix_hotplug.go b/lxd/device/unix_hotplug.go index 39ca346df823..6911876d7957 100644 --- a/lxd/device/unix_hotplug.go +++ b/lxd/device/unix_hotplug.go @@ -9,11 +9,11 @@ import ( udev "github.com/jochenvg/go-udev" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // unixHotplugIsOurDevice indicates whether the unixHotplug device event qualifies as part of our device. diff --git a/lxd/device/usb.go b/lxd/device/usb.go index a2aed5b6b4e0..58c29e621d1a 100644 --- a/lxd/device/usb.go +++ b/lxd/device/usb.go @@ -7,12 +7,12 @@ import ( "path" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/validate" ) // usbDevPath is the path where USB devices can be enumerated. diff --git a/lxd/devices.go b/lxd/devices.go index e8dbd24253b4..4215ef7b4f25 100644 --- a/lxd/devices.go +++ b/lxd/devices.go @@ -13,16 +13,16 @@ import ( log "gopkg.in/inconshreveable/log15.v2" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" - - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/device" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + _ "github.com/canonical/lxd/lxd/include" + + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/device" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) /* diff --git a/lxd/devlxd.go b/lxd/devlxd.go index 4b854b1dcefc..7b280b8c21ed 100644 --- a/lxd/devlxd.go +++ b/lxd/devlxd.go @@ -14,17 +14,17 @@ import ( "github.com/gorilla/mux" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/ucred" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // DevLxdServer creates an http.Server capable of handling requests against the diff --git a/lxd/devlxd_test.go b/lxd/devlxd_test.go index 1745d6c14fb6..3ebae82fdec9 100644 --- a/lxd/devlxd_test.go +++ b/lxd/devlxd_test.go @@ -13,8 +13,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/ucred" ) var testDir string diff --git a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go index 74c2b479a28c..c202894c8ab7 100644 --- a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go +++ b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go @@ -13,10 +13,10 @@ import ( "github.com/mdlayher/netx/eui64" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // ErrDHCPNotSupported indicates network doesn't support DHCP for this IP protocol. diff --git a/lxd/dnsmasq/dnsmasq.go b/lxd/dnsmasq/dnsmasq.go index 26da9e2944db..73d86a64ad37 100644 --- a/lxd/dnsmasq/dnsmasq.go +++ b/lxd/dnsmasq/dnsmasq.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/version" ) const staticAllocationDeviceSeparator = "." diff --git a/lxd/endpoints/cluster.go b/lxd/endpoints/cluster.go index 8e6c2cea8ed0..007bff31326a 100644 --- a/lxd/endpoints/cluster.go +++ b/lxd/endpoints/cluster.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // ClusterAddress returns the cluster addresss of the cluster endpoint, or an diff --git a/lxd/endpoints/devlxd_test.go b/lxd/endpoints/devlxd_test.go index f92c0bbf2cdf..43c16e2ec2d8 100644 --- a/lxd/endpoints/devlxd_test.go +++ b/lxd/endpoints/devlxd_test.go @@ -3,7 +3,7 @@ package endpoints_test import ( "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/endpoints.go b/lxd/endpoints/endpoints.go index 921fd5850d9f..0b0efd711ac1 100644 --- a/lxd/endpoints/endpoints.go +++ b/lxd/endpoints/endpoints.go @@ -9,10 +9,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" tomb "gopkg.in/tomb.v2" ) diff --git a/lxd/endpoints/endpoints_exported_test.go b/lxd/endpoints/endpoints_exported_test.go index cc4802fee881..4d13a4dfeda6 100644 --- a/lxd/endpoints/endpoints_exported_test.go +++ b/lxd/endpoints/endpoints_exported_test.go @@ -1,8 +1,8 @@ package endpoints import ( - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // New creates a new Endpoints instance without bringing it up. diff --git a/lxd/endpoints/endpoints_test.go b/lxd/endpoints/endpoints_test.go index 4fcb7fbef34c..146dd16f20a3 100644 --- a/lxd/endpoints/endpoints_test.go +++ b/lxd/endpoints/endpoints_test.go @@ -12,11 +12,11 @@ import ( "strconv" "testing" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/listeners/fancytls.go b/lxd/endpoints/listeners/fancytls.go index 85765dc074c0..c68a0a1effa4 100644 --- a/lxd/endpoints/listeners/fancytls.go +++ b/lxd/endpoints/listeners/fancytls.go @@ -7,8 +7,8 @@ import ( "github.com/armon/go-proxyproto" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // FancyTLSListener is a variation of the standard tls.Listener that supports diff --git a/lxd/endpoints/listeners/starttls.go b/lxd/endpoints/listeners/starttls.go index 2df3056966d7..1b6149085b3c 100644 --- a/lxd/endpoints/listeners/starttls.go +++ b/lxd/endpoints/listeners/starttls.go @@ -7,8 +7,8 @@ import ( "net" "sync" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // StarttlsListener is a variation of the standard tls.Listener that supports diff --git a/lxd/endpoints/local_test.go b/lxd/endpoints/local_test.go index 57b34c19beb3..c06e5db54d13 100644 --- a/lxd/endpoints/local_test.go +++ b/lxd/endpoints/local_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/network.go b/lxd/endpoints/network.go index 43d7141dc1b4..8a8e6a4f9855 100644 --- a/lxd/endpoints/network.go +++ b/lxd/endpoints/network.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // NetworkPublicKey returns the public key of the TLS certificate used by the diff --git a/lxd/endpoints/network_test.go b/lxd/endpoints/network_test.go index 7204420ad2ab..f792dfb7d16b 100644 --- a/lxd/endpoints/network_test.go +++ b/lxd/endpoints/network_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/network_util.go b/lxd/endpoints/network_util.go index fa859837fa56..6f6532eeeb80 100644 --- a/lxd/endpoints/network_util.go +++ b/lxd/endpoints/network_util.go @@ -5,7 +5,7 @@ import ( "net" "regexp" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) type networkServerErrorLogWriter struct { diff --git a/lxd/endpoints/pprof.go b/lxd/endpoints/pprof.go index bf7b9ae07e09..1d9f3691c16f 100644 --- a/lxd/endpoints/pprof.go +++ b/lxd/endpoints/pprof.go @@ -6,9 +6,9 @@ import ( "net/http" "time" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" _ "net/http/pprof" // pprof magic ) diff --git a/lxd/endpoints/socket.go b/lxd/endpoints/socket.go index 4acde8a7d940..dfdd34b25428 100644 --- a/lxd/endpoints/socket.go +++ b/lxd/endpoints/socket.go @@ -10,9 +10,9 @@ import ( "os/user" "strconv" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Bind to the given unix socket path. diff --git a/lxd/events.go b/lxd/events.go index 9f9ed1b8b7b2..d05447290b91 100644 --- a/lxd/events.go +++ b/lxd/events.go @@ -6,12 +6,12 @@ import ( "net/http" "strings" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" ) var eventTypes = []string{"logging", "operation", "lifecycle"} diff --git a/lxd/events/common.go b/lxd/events/common.go index 550b97bf6f19..7c1ccc0b4d5a 100644 --- a/lxd/events/common.go +++ b/lxd/events/common.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/websocket" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // EventHandler called when the connection receives an event from the client. diff --git a/lxd/events/devlxdEvents.go b/lxd/events/devlxdEvents.go index 11545eb509b4..6d72be8daf17 100644 --- a/lxd/events/devlxdEvents.go +++ b/lxd/events/devlxdEvents.go @@ -9,8 +9,8 @@ import ( "github.com/pborman/uuid" "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // DevLXDServer represents an instance of an devlxd event server. diff --git a/lxd/events/events.go b/lxd/events/events.go index 6cb7fbfd9faf..455b61b293d1 100644 --- a/lxd/events/events.go +++ b/lxd/events/events.go @@ -9,9 +9,9 @@ import ( "github.com/pborman/uuid" "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // EventSource indicates the source of an event. diff --git a/lxd/events/logging.go b/lxd/events/logging.go index 05f1e19815e5..f0f55fda7fc9 100644 --- a/lxd/events/logging.go +++ b/lxd/events/logging.go @@ -5,7 +5,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // LoggingServer controls what server to use for messages coming from the logger. diff --git a/lxd/filter/clause.go b/lxd/filter/clause.go index 4b6d0a836b13..951cc0f4f636 100644 --- a/lxd/filter/clause.go +++ b/lxd/filter/clause.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Clause is a single filter clause in a filter string. diff --git a/lxd/filter/clause_test.go b/lxd/filter/clause_test.go index 0cfa73f5f980..7da8ba6ce19d 100644 --- a/lxd/filter/clause_test.go +++ b/lxd/filter/clause_test.go @@ -3,7 +3,7 @@ package filter_test import ( "testing" - "github.com/lxc/lxd/lxd/filter" + "github.com/canonical/lxd/lxd/filter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/filter/match_test.go b/lxd/filter/match_test.go index cdd719cbe618..5de596104e3d 100644 --- a/lxd/filter/match_test.go +++ b/lxd/filter/match_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/filter/value_test.go b/lxd/filter/value_test.go index 96691155604f..137cb209e1c9 100644 --- a/lxd/filter/value_test.go +++ b/lxd/filter/value_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" ) diff --git a/lxd/firewall/drivers/drivers_nftables.go b/lxd/firewall/drivers/drivers_nftables.go index 9754f23c09d5..e7b2ad02e094 100644 --- a/lxd/firewall/drivers/drivers_nftables.go +++ b/lxd/firewall/drivers/drivers_nftables.go @@ -12,9 +12,9 @@ import ( "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) const nftablesNamespace = "lxd" diff --git a/lxd/firewall/drivers/drivers_xtables.go b/lxd/firewall/drivers/drivers_xtables.go index a96a1ab0e5c6..21e8449dd269 100644 --- a/lxd/firewall/drivers/drivers_xtables.go +++ b/lxd/firewall/drivers/drivers_xtables.go @@ -11,11 +11,11 @@ import ( "strings" "sync" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // iptablesChainNICFilterPrefix chain prefix used for NIC specific filtering rules. diff --git a/lxd/firewall/firewall_interface.go b/lxd/firewall/firewall_interface.go index b1df9bfd6d56..eb9443d3d258 100644 --- a/lxd/firewall/firewall_interface.go +++ b/lxd/firewall/firewall_interface.go @@ -3,7 +3,7 @@ package firewall import ( "net" - drivers "github.com/lxc/lxd/lxd/firewall/drivers" + drivers "github.com/canonical/lxd/lxd/firewall/drivers" ) // Firewall represents a LXD firewall. diff --git a/lxd/firewall/firewall_load.go b/lxd/firewall/firewall_load.go index ec332e703d7d..4c40c93c83c9 100644 --- a/lxd/firewall/firewall_load.go +++ b/lxd/firewall/firewall_load.go @@ -1,8 +1,8 @@ package firewall import ( - "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/shared/logger" ) // New returns an appropriate firewall implementation. diff --git a/lxd/fsmonitor/drivers/common.go b/lxd/fsmonitor/drivers/common.go index 7e086ca66ef8..345fb7bbd3c7 100644 --- a/lxd/fsmonitor/drivers/common.go +++ b/lxd/fsmonitor/drivers/common.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) type common struct { diff --git a/lxd/fsmonitor/drivers/driver_fsnotify.go b/lxd/fsmonitor/drivers/driver_fsnotify.go index f55354da7ac8..2b28d367ea3f 100644 --- a/lxd/fsmonitor/drivers/driver_fsnotify.go +++ b/lxd/fsmonitor/drivers/driver_fsnotify.go @@ -10,7 +10,7 @@ import ( fsn "github.com/fsnotify/fsnotify" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) var fsnotifyLoaded bool diff --git a/lxd/fsmonitor/drivers/interface.go b/lxd/fsmonitor/drivers/interface.go index 42b0e6f7a01f..3f5de1ddb0b2 100644 --- a/lxd/fsmonitor/drivers/interface.go +++ b/lxd/fsmonitor/drivers/interface.go @@ -3,7 +3,7 @@ package drivers import ( "context" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // driver is the extended internal interface. diff --git a/lxd/fsmonitor/drivers/load.go b/lxd/fsmonitor/drivers/load.go index 4511084c5074..f2e2123aaad5 100644 --- a/lxd/fsmonitor/drivers/load.go +++ b/lxd/fsmonitor/drivers/load.go @@ -3,7 +3,7 @@ package drivers import ( "context" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) var drivers = map[string]func() driver{ diff --git a/lxd/fsmonitor/fsmonitor.go b/lxd/fsmonitor/fsmonitor.go index 6d5277401411..acc95f6ef374 100644 --- a/lxd/fsmonitor/fsmonitor.go +++ b/lxd/fsmonitor/fsmonitor.go @@ -3,8 +3,8 @@ package fsmonitor import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/fsmonitor/drivers" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/fsmonitor/drivers" + "github.com/canonical/lxd/shared/logger" ) type fsMonitor struct { diff --git a/lxd/fsmonitor/load.go b/lxd/fsmonitor/load.go index 58826cbc0151..ac73b99c34d6 100644 --- a/lxd/fsmonitor/load.go +++ b/lxd/fsmonitor/load.go @@ -6,10 +6,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/fsmonitor/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/fsmonitor/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // New creates a new FSMonitor instance. diff --git a/lxd/images.go b/lxd/images.go index bf841225ee45..71800fba4366 100644 --- a/lxd/images.go +++ b/lxd/images.go @@ -28,29 +28,29 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - projectutils "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + projectutils "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) var imagesCmd = APIEndpoint{ diff --git a/lxd/init.go b/lxd/init.go index a88c17e946fd..fc16924ec6e1 100644 --- a/lxd/init.go +++ b/lxd/init.go @@ -3,10 +3,10 @@ package main import ( "fmt" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type initDataNode struct { diff --git a/lxd/instance.go b/lxd/instance.go index c915a7014af9..c4e65d5ef306 100644 --- a/lxd/instance.go +++ b/lxd/instance.go @@ -11,18 +11,18 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Helper functions diff --git a/lxd/instance/drivers/driver_common.go b/lxd/instance/drivers/driver_common.go index f2f698797846..15fc390982a3 100644 --- a/lxd/instance/drivers/driver_common.go +++ b/lxd/instance/drivers/driver_common.go @@ -10,24 +10,24 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/maas" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/maas" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // ErrInstanceIsStopped indicates that the instance is stopped. diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go index 0d50d63edcd9..1df713fc16cf 100644 --- a/lxd/instance/drivers/driver_lxc.go +++ b/lxd/instance/drivers/driver_lxc.go @@ -30,36 +30,36 @@ import ( liblxc "gopkg.in/lxc/go-lxc.v2" yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/seccomp" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/template" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/netutils" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/seccomp" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/template" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/netutils" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/units" ) // Helper functions diff --git a/lxd/instance/drivers/driver_lxc_cmd.go b/lxd/instance/drivers/driver_lxc_cmd.go index ea21e705c04f..928a9ac9573b 100644 --- a/lxd/instance/drivers/driver_lxc_cmd.go +++ b/lxd/instance/drivers/driver_lxc_cmd.go @@ -5,8 +5,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // lxcCmd represents a running command for an LXC container. diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go index aeb9f8427627..fc24586e37a1 100644 --- a/lxd/instance/drivers/driver_qemu.go +++ b/lxd/instance/drivers/driver_qemu.go @@ -33,38 +33,38 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/drivers/qmp" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - pongoTemplate "github.com/lxc/lxd/lxd/template" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/lxd/vsock" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/drivers/qmp" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + pongoTemplate "github.com/canonical/lxd/lxd/template" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/lxd/vsock" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/version" ) // qemuUnsafeIO is used to indicate disk should use unsafe cache I/O. diff --git a/lxd/instance/drivers/driver_qemu_cmd.go b/lxd/instance/drivers/driver_qemu_cmd.go index 2259a65277c9..59359f7d8de5 100644 --- a/lxd/instance/drivers/driver_qemu_cmd.go +++ b/lxd/instance/drivers/driver_qemu_cmd.go @@ -6,9 +6,9 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Cmd represents a running command for an Qemu VM. diff --git a/lxd/instance/drivers/load.go b/lxd/instance/drivers/load.go index 176da45e5dd4..683bf1433c78 100644 --- a/lxd/instance/drivers/load.go +++ b/lxd/instance/drivers/load.go @@ -6,16 +6,16 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Instance driver definitions. diff --git a/lxd/instance/drivers/qmp/commands.go b/lxd/instance/drivers/qmp/commands.go index 97fe51e00919..ff212c8156cd 100644 --- a/lxd/instance/drivers/qmp/commands.go +++ b/lxd/instance/drivers/qmp/commands.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) // Status returns the current VM status. diff --git a/lxd/instance/drivers/qmp/monitor.go b/lxd/instance/drivers/qmp/monitor.go index 07f818e5c62e..d954cc8ef071 100644 --- a/lxd/instance/drivers/qmp/monitor.go +++ b/lxd/instance/drivers/qmp/monitor.go @@ -10,7 +10,7 @@ import ( "github.com/digitalocean/go-qemu/qmp" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) var monitors = map[string]*Monitor{} diff --git a/lxd/instance/drivers/test_util.go b/lxd/instance/drivers/test_util.go index 6ea131b9951d..5449fe696094 100644 --- a/lxd/instance/drivers/test_util.go +++ b/lxd/instance/drivers/test_util.go @@ -1,8 +1,8 @@ package drivers import ( - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" ) // PrepareEqualTest modifies any unexported variables required for reflect.DeepEqual to complete safely. diff --git a/lxd/instance/filter.go b/lxd/instance/filter.go index 495f6717b5fd..a5fab8bd3021 100644 --- a/lxd/instance/filter.go +++ b/lxd/instance/filter.go @@ -1,8 +1,8 @@ package instance import ( - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/shared/api" ) // Filter returns a filtered list of instances that match the given clauses. diff --git a/lxd/instance/instance_interface.go b/lxd/instance/instance_interface.go index 26e19f625006..354b1a203b8b 100644 --- a/lxd/instance/instance_interface.go +++ b/lxd/instance/instance_interface.go @@ -9,14 +9,14 @@ import ( "github.com/pkg/sftp" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" ) // HookStart hook used when instance has started. diff --git a/lxd/instance/instance_utils.go b/lxd/instance/instance_utils.go index 320aadc7ed59..d5c61c099b1d 100644 --- a/lxd/instance/instance_utils.go +++ b/lxd/instance/instance_utils.go @@ -17,24 +17,24 @@ import ( log "gopkg.in/inconshreveable/log15.v2" liblxc "gopkg.in/lxc/go-lxc.v2" - lxd "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/seccomp" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + lxd "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/seccomp" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) // ValidDevices is linked from instance/drivers.validDevices to validate device config. diff --git a/lxd/instance/instancetype/instance_type.go b/lxd/instance/instancetype/instance_type.go index 55a040086ab9..4b324da0b229 100644 --- a/lxd/instance/instancetype/instance_type.go +++ b/lxd/instance/instancetype/instance_type.go @@ -3,7 +3,7 @@ package instancetype import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Type indicates the type of instance. diff --git a/lxd/instance/operationlock/operationlock.go b/lxd/instance/operationlock/operationlock.go index acd243dff37e..b598df6ca689 100644 --- a/lxd/instance/operationlock/operationlock.go +++ b/lxd/instance/operationlock/operationlock.go @@ -7,8 +7,8 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/logger" ) // TimeoutSeconds number of seconds that the operation lock will be kept for without calling Reset(). diff --git a/lxd/instance_backup.go b/lxd/instance_backup.go index 90583a53f21c..a4157e4b6344 100644 --- a/lxd/instance_backup.go +++ b/lxd/instance_backup.go @@ -9,17 +9,17 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // swagger:operation GET /1.0/instances/{name}/backups instances instance_backups_get diff --git a/lxd/instance_console.go b/lxd/instance_console.go index c6bf3d7d68dc..c7ac6a43b08e 100644 --- a/lxd/instance_console.go +++ b/lxd/instance_console.go @@ -16,16 +16,16 @@ import ( "golang.org/x/sys/unix" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" ) type consoleWs struct { diff --git a/lxd/instance_delete.go b/lxd/instance_delete.go index d28248b890db..af63ee1a148a 100644 --- a/lxd/instance_delete.go +++ b/lxd/instance_delete.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" ) // swagger:operation DELETE /1.0/instances/{name} instances instance_delete diff --git a/lxd/instance_exec.go b/lxd/instance_exec.go index 225e9468a36e..87b5b6bdf430 100644 --- a/lxd/instance_exec.go +++ b/lxd/instance_exec.go @@ -18,19 +18,19 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/netutils" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/netutils" + "github.com/canonical/lxd/shared/version" ) const execWSControl = -1 diff --git a/lxd/instance_file.go b/lxd/instance_file.go index 4f0fc348eafb..e367a36b09d0 100644 --- a/lxd/instance_file.go +++ b/lxd/instance_file.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/sftp" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" ) func instanceFileHandler(d *Daemon, r *http.Request) response.Response { diff --git a/lxd/instance_get.go b/lxd/instance_get.go index 3af101c3bc49..1ffe9e95c559 100644 --- a/lxd/instance_get.go +++ b/lxd/instance_get.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/response" ) // swagger:operation GET /1.0/instances/{name} instances instance_get diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go index 893ff256efa0..fcc02ce93a7e 100644 --- a/lxd/instance_instance_types.go +++ b/lxd/instance_instance_types.go @@ -11,13 +11,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) type instanceType struct { diff --git a/lxd/instance_logs.go b/lxd/instance_logs.go index be040b212b94..dfc17022bec4 100644 --- a/lxd/instance_logs.go +++ b/lxd/instance_logs.go @@ -9,13 +9,13 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) var instanceLogCmd = APIEndpoint{ diff --git a/lxd/instance_metadata.go b/lxd/instance_metadata.go index 6e6c60a6fd6e..acdd15947fea 100644 --- a/lxd/instance_metadata.go +++ b/lxd/instance_metadata.go @@ -14,14 +14,14 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // swagger:operation GET /1.0/instances/{name}/metadata instances instance_metadata_get diff --git a/lxd/instance_patch.go b/lxd/instance_patch.go index adf4b17f1f95..66fc27fe055e 100644 --- a/lxd/instance_patch.go +++ b/lxd/instance_patch.go @@ -9,15 +9,15 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - projecthelpers "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + projecthelpers "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // swagger:operation PATCH /1.0/instances/{name} instances instance_patch diff --git a/lxd/instance_post.go b/lxd/instance_post.go index 66747182fd4d..44befc0ff827 100644 --- a/lxd/instance_post.go +++ b/lxd/instance_post.go @@ -10,19 +10,19 @@ import ( "github.com/gorilla/mux" "github.com/pborman/uuid" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var internalClusterInstanceMovedCmd = APIEndpoint{ diff --git a/lxd/instance_put.go b/lxd/instance_put.go index e20c10586084..f38e39a44830 100644 --- a/lxd/instance_put.go +++ b/lxd/instance_put.go @@ -7,18 +7,18 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - projecthelpers "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + projecthelpers "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // swagger:operation PUT /1.0/instances/{name} instances instance_put diff --git a/lxd/instance_snapshot.go b/lxd/instance_snapshot.go index 49b697b6e01c..3237e7c9db6e 100644 --- a/lxd/instance_snapshot.go +++ b/lxd/instance_snapshot.go @@ -11,19 +11,19 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) // swagger:operation GET /1.0/instances/{name}/snapshots instances instance_snapshots_get diff --git a/lxd/instance_state.go b/lxd/instance_state.go index 8b062cfa903e..221120633198 100644 --- a/lxd/instance_state.go +++ b/lxd/instance_state.go @@ -8,12 +8,12 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // swagger:operation GET /1.0/instances/{name}/state instances instance_state_get diff --git a/lxd/instance_test.go b/lxd/instance_test.go index 3b73625428b1..8c45c922fa95 100644 --- a/lxd/instance_test.go +++ b/lxd/instance_test.go @@ -6,16 +6,16 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/revert" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + instanceDrivers "github.com/canonical/lxd/lxd/instance/drivers" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/revert" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" ) type containerTestSuite struct { diff --git a/lxd/instances.go b/lxd/instances.go index bfeb6b9544ab..52561922e2e8 100644 --- a/lxd/instances.go +++ b/lxd/instances.go @@ -11,14 +11,14 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) var instancesCmd = APIEndpoint{ diff --git a/lxd/instances_get.go b/lxd/instances_get.go index 4d666e159aa9..badffe1d501e 100644 --- a/lxd/instances_get.go +++ b/lxd/instances_get.go @@ -11,18 +11,18 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // urlInstanceTypeDetect detects what sort of instance type filter is being requested. Either diff --git a/lxd/instances_post.go b/lxd/instances_post.go index 4e5ec2d4556d..82bfa100f185 100644 --- a/lxd/instances_post.go +++ b/lxd/instances_post.go @@ -16,23 +16,23 @@ import ( "github.com/gorilla/websocket" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/archive" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/archive" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" ) func createFromImage(d *Daemon, r *http.Request, projectName string, req *api.InstancesPost) response.Response { diff --git a/lxd/ip/addr.go b/lxd/ip/addr.go index 26ac6a61e72a..6ed4a3909e45 100644 --- a/lxd/ip/addr.go +++ b/lxd/ip/addr.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Addr represents arguments for address protocol manipulation diff --git a/lxd/ip/class.go b/lxd/ip/class.go index 35ef9e250ef5..319a6e8c55ea 100644 --- a/lxd/ip/class.go +++ b/lxd/ip/class.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Class represents qdisc class object diff --git a/lxd/ip/filter.go b/lxd/ip/filter.go index 0789f06a85ae..c71bf8ca7edd 100644 --- a/lxd/ip/filter.go +++ b/lxd/ip/filter.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Action represents an action in filter diff --git a/lxd/ip/link.go b/lxd/ip/link.go index b44c86c5eb22..165bd1068474 100644 --- a/lxd/ip/link.go +++ b/lxd/ip/link.go @@ -9,7 +9,7 @@ import ( "regexp" "strconv" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Link represents base arguments for link device diff --git a/lxd/ip/neigh.go b/lxd/ip/neigh.go index 2360e4841ef5..1098602898be 100644 --- a/lxd/ip/neigh.go +++ b/lxd/ip/neigh.go @@ -5,8 +5,8 @@ import ( "net" "strings" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // NeighbourIPState can be { PERMANENT | NOARP | REACHABLE | STALE | NONE | INCOMPLETE | DELAY | PROBE | FAILED }. diff --git a/lxd/ip/neigh_proxy.go b/lxd/ip/neigh_proxy.go index 24cf1dc506a5..4b8ecd4a22b8 100644 --- a/lxd/ip/neigh_proxy.go +++ b/lxd/ip/neigh_proxy.go @@ -4,8 +4,8 @@ import ( "net" "strings" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // NeighProxy represents arguments for neighbour proxy manipulation. diff --git a/lxd/ip/qdisc.go b/lxd/ip/qdisc.go index 773730f25ba7..53f8dae0240a 100644 --- a/lxd/ip/qdisc.go +++ b/lxd/ip/qdisc.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Qdisc represents 'queueing discipline' object diff --git a/lxd/ip/route.go b/lxd/ip/route.go index 087089aa301f..7a4dcec5f447 100644 --- a/lxd/ip/route.go +++ b/lxd/ip/route.go @@ -3,7 +3,7 @@ package ip import ( "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Route represents arguments for route manipulation diff --git a/lxd/ip/tuntap.go b/lxd/ip/tuntap.go index ad02cde007ce..ccfb41e95b0f 100644 --- a/lxd/ip/tuntap.go +++ b/lxd/ip/tuntap.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Tuntap represents arguments for tuntap manipulation diff --git a/lxd/lifecycle/certificate.go b/lxd/lifecycle/certificate.go index 28eaced35308..2d4e3b37b572 100644 --- a/lxd/lifecycle/certificate.go +++ b/lxd/lifecycle/certificate.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // CertificateAction represents a lifecycle event action for Certificates. diff --git a/lxd/lifecycle/cluster.go b/lxd/lifecycle/cluster.go index 28a6b250b314..981c5d433d8d 100644 --- a/lxd/lifecycle/cluster.go +++ b/lxd/lifecycle/cluster.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ClusterAction represents a lifecycle event action for clusters. diff --git a/lxd/lifecycle/cluster_member.go b/lxd/lifecycle/cluster_member.go index 64febb5eb14f..1bbedfe653fe 100644 --- a/lxd/lifecycle/cluster_member.go +++ b/lxd/lifecycle/cluster_member.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ClusterMemberAction represents a lifecycle event action for cluster members. diff --git a/lxd/lifecycle/config.go b/lxd/lifecycle/config.go index 82a025115ace..72fd639c5905 100644 --- a/lxd/lifecycle/config.go +++ b/lxd/lifecycle/config.go @@ -3,7 +3,7 @@ package lifecycle import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ConfigAction represents a lifecycle event action for the server configuration diff --git a/lxd/lifecycle/image.go b/lxd/lifecycle/image.go index 82cb7d87a207..d225560440ae 100644 --- a/lxd/lifecycle/image.go +++ b/lxd/lifecycle/image.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // ImageAction represents a lifecycle event action for images. diff --git a/lxd/lifecycle/image_alias.go b/lxd/lifecycle/image_alias.go index 576af5951ac9..992d866aa026 100644 --- a/lxd/lifecycle/image_alias.go +++ b/lxd/lifecycle/image_alias.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // ImageAliasAction represents a lifecycle event action for image aliases. diff --git a/lxd/lifecycle/instance.go b/lxd/lifecycle/instance.go index 2083e56f69d9..9e4fd80d9007 100644 --- a/lxd/lifecycle/instance.go +++ b/lxd/lifecycle/instance.go @@ -3,9 +3,9 @@ package lifecycle import ( "fmt" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // Internal copy of the instance interface. diff --git a/lxd/lifecycle/instance_backup.go b/lxd/lifecycle/instance_backup.go index 2056d9ef4df4..50f4dd24f5dc 100644 --- a/lxd/lifecycle/instance_backup.go +++ b/lxd/lifecycle/instance_backup.go @@ -4,9 +4,9 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // InstanceBackupAction represents a lifecycle event action for instance backups. diff --git a/lxd/lifecycle/instance_log.go b/lxd/lifecycle/instance_log.go index 56e1f82709a0..214050b2117d 100644 --- a/lxd/lifecycle/instance_log.go +++ b/lxd/lifecycle/instance_log.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // InstanceLogAction represents a lifecycle event action for instance logs. diff --git a/lxd/lifecycle/instance_metadata.go b/lxd/lifecycle/instance_metadata.go index 5446c1d31507..3f068f8288e9 100644 --- a/lxd/lifecycle/instance_metadata.go +++ b/lxd/lifecycle/instance_metadata.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // InstanceMetadataAction represents a lifecycle event action for instance metadata. diff --git a/lxd/lifecycle/instance_metadata_template.go b/lxd/lifecycle/instance_metadata_template.go index 4732ed4d579a..b7bcda604c15 100644 --- a/lxd/lifecycle/instance_metadata_template.go +++ b/lxd/lifecycle/instance_metadata_template.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // InstanceMetadataTemplateAction represents a lifecycle event action for instance metadata templates. diff --git a/lxd/lifecycle/instance_snapshot.go b/lxd/lifecycle/instance_snapshot.go index 76b8841aa1b6..07db118a7351 100644 --- a/lxd/lifecycle/instance_snapshot.go +++ b/lxd/lifecycle/instance_snapshot.go @@ -4,9 +4,9 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // InstanceSnapshotAction represents a lifecycle event action for instance snapshots. diff --git a/lxd/lifecycle/network.go b/lxd/lifecycle/network.go index 10118a990542..3d9547f90a61 100644 --- a/lxd/lifecycle/network.go +++ b/lxd/lifecycle/network.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // Internal copy of the network interface. diff --git a/lxd/lifecycle/operation.go b/lxd/lifecycle/operation.go index a6ff2a636f9e..00bd45561996 100644 --- a/lxd/lifecycle/operation.go +++ b/lxd/lifecycle/operation.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Internal copy of the operation interface. diff --git a/lxd/lifecycle/profile.go b/lxd/lifecycle/profile.go index 9d51a4f14835..2f05e2425cac 100644 --- a/lxd/lifecycle/profile.go +++ b/lxd/lifecycle/profile.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // ProfileAction represents a lifecycle event action for profiles. diff --git a/lxd/lifecycle/project.go b/lxd/lifecycle/project.go index 062f457c6c92..d42ad7d4af4a 100644 --- a/lxd/lifecycle/project.go +++ b/lxd/lifecycle/project.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ProjectAction represents a lifecycle event action for projects. diff --git a/lxd/lifecycle/storage_pool.go b/lxd/lifecycle/storage_pool.go index 6ad9a887b451..8d253112c3e5 100644 --- a/lxd/lifecycle/storage_pool.go +++ b/lxd/lifecycle/storage_pool.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // StoragePoolAction represents a lifecycle event action for storage pools. diff --git a/lxd/lifecycle/storage_volume.go b/lxd/lifecycle/storage_volume.go index dbd11dd65936..5cc856b746d4 100644 --- a/lxd/lifecycle/storage_volume.go +++ b/lxd/lifecycle/storage_volume.go @@ -4,9 +4,9 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // Internal copy of the volume interface. diff --git a/lxd/lifecycle/storage_volume_snapshot.go b/lxd/lifecycle/storage_volume_snapshot.go index e948a06d49f4..f906e0b02a8c 100644 --- a/lxd/lifecycle/storage_volume_snapshot.go +++ b/lxd/lifecycle/storage_volume_snapshot.go @@ -4,10 +4,10 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // StorageVolumeSnapshotAction represents a lifecycle event action for storage volume snapshots. diff --git a/lxd/logging.go b/lxd/logging.go index 517aa9f4d6d5..db0c1e76a7d1 100644 --- a/lxd/logging.go +++ b/lxd/logging.go @@ -9,15 +9,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // This task function expires logs when executed. It's started by the Daemon diff --git a/lxd/maas/controller.go b/lxd/maas/controller.go index 152c31f1b3bd..c35e9a79b124 100644 --- a/lxd/maas/controller.go +++ b/lxd/maas/controller.go @@ -7,7 +7,7 @@ import ( "github.com/juju/gomaasapi" - "github.com/lxc/lxd/lxd/project" + "github.com/canonical/lxd/lxd/project" ) // Instance is a MAAS specific instance interface. diff --git a/lxd/main.go b/lxd/main.go index b60cfd489760..040bce2ccb4e 100644 --- a/lxd/main.go +++ b/lxd/main.go @@ -8,14 +8,14 @@ import ( "github.com/canonical/go-dqlite" "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/version" ) // Initialize the random number generator diff --git a/lxd/main_activateifneeded.go b/lxd/main_activateifneeded.go index b935579f73b1..bfdbf608c280 100644 --- a/lxd/main_activateifneeded.go +++ b/lxd/main_activateifneeded.go @@ -8,14 +8,14 @@ import ( sqlite3 "github.com/mattn/go-sqlite3" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) func init() { diff --git a/lxd/main_callhook.go b/lxd/main_callhook.go index 865345863f88..e24f6c70deec 100644 --- a/lxd/main_callhook.go +++ b/lxd/main_callhook.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" + "github.com/canonical/lxd/client" ) type cmdCallhook struct { diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go index 3cfcbbffb934..46e3d641b829 100644 --- a/lxd/main_checkfeature.go +++ b/lxd/main_checkfeature.go @@ -5,10 +5,10 @@ import ( "os" "runtime" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) /* diff --git a/lxd/main_cluster.go b/lxd/main_cluster.go index 9b4da64d6157..0fbf102430f9 100644 --- a/lxd/main_cluster.go +++ b/lxd/main_cluster.go @@ -13,15 +13,15 @@ import ( "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/termios" "github.com/spf13/cobra" ) diff --git a/lxd/main_daemon.go b/lxd/main_daemon.go index e1012ce835dd..0128d0d75a1e 100644 --- a/lxd/main_daemon.go +++ b/lxd/main_daemon.go @@ -11,8 +11,8 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared/logger" ) type cmdDaemon struct { diff --git a/lxd/main_forkcoresched.go b/lxd/main_forkcoresched.go index 19323c7c1f7f..1d4b3cde3a17 100644 --- a/lxd/main_forkcoresched.go +++ b/lxd/main_forkcoresched.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkdns.go b/lxd/main_forkdns.go index 5f55f2ba701c..d357813c6062 100644 --- a/lxd/main_forkdns.go +++ b/lxd/main_forkdns.go @@ -14,11 +14,11 @@ import ( "github.com/miekg/dns" "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/dnsutil" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/dnsutil" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) type cmdForkDNS struct { diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go index 2f31921068e0..392397539dab 100644 --- a/lxd/main_forkexec.go +++ b/lxd/main_forkexec.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkmount.go b/lxd/main_forkmount.go index 04af40e4b3d7..c7defba26703 100644 --- a/lxd/main_forkmount.go +++ b/lxd/main_forkmount.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forknet.go b/lxd/main_forknet.go index 8d8cc168cc32..bdb19414a16a 100644 --- a/lxd/main_forknet.go +++ b/lxd/main_forknet.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/shared/netutils" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/shared/netutils" ) /* diff --git a/lxd/main_forkproxy.go b/lxd/main_forkproxy.go index 03f2126d3146..6f2d88852f6e 100644 --- a/lxd/main_forkproxy.go +++ b/lxd/main_forkproxy.go @@ -16,13 +16,13 @@ import ( "golang.org/x/sys/unix" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/netutils" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/netutils" ) /* diff --git a/lxd/main_forkproxy_test.go b/lxd/main_forkproxy_test.go index 623519f0f062..80c16ff7f2ce 100644 --- a/lxd/main_forkproxy_test.go +++ b/lxd/main_forkproxy_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" ) func TestParseAddr(t *testing.T) { diff --git a/lxd/main_forkstart.go b/lxd/main_forkstart.go index 14db13c7b327..7c95d4c18230 100644 --- a/lxd/main_forkstart.go +++ b/lxd/main_forkstart.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) type cmdForkstart struct { diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go index 9a43dd65969e..f7a0e1ca5038 100644 --- a/lxd/main_forksyscall.go +++ b/lxd/main_forksyscall.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkusernsexec.go b/lxd/main_forkusernsexec.go index 1cd65af5c67f..41e5da6825dd 100644 --- a/lxd/main_forkusernsexec.go +++ b/lxd/main_forkusernsexec.go @@ -7,7 +7,7 @@ import ( "golang.org/x/sys/unix" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkzfs.go b/lxd/main_forkzfs.go index df021fc95cbe..f21742792ed2 100644 --- a/lxd/main_forkzfs.go +++ b/lxd/main_forkzfs.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) type cmdForkZFS struct { diff --git a/lxd/main_init.go b/lxd/main_init.go index 1ac414f21308..4e0a2da7d6d8 100644 --- a/lxd/main_init.go +++ b/lxd/main_init.go @@ -7,11 +7,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) type cmdInitData struct { diff --git a/lxd/main_init_auto.go b/lxd/main_init_auto.go index 6ac2fb0d7f8d..11b30271b3fc 100644 --- a/lxd/main_init_auto.go +++ b/lxd/main_init_auto.go @@ -5,11 +5,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func (c *cmdInit) RunAuto(cmd *cobra.Command, args []string, d lxd.InstanceServer, server *api.Server) (*cmdInitData, error) { diff --git a/lxd/main_init_dump.go b/lxd/main_init_dump.go index 2d86fdd02925..9568181ea93b 100644 --- a/lxd/main_init_dump.go +++ b/lxd/main_init_dump.go @@ -5,8 +5,8 @@ import ( yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" ) func (c *cmdInit) RunDump(d lxd.InstanceServer) error { diff --git a/lxd/main_init_interactive.go b/lxd/main_init_interactive.go index a284ce6f64e2..e7f89f6c5760 100644 --- a/lxd/main_init_interactive.go +++ b/lxd/main_init_interactive.go @@ -14,17 +14,17 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) func (c *cmdInit) RunInteractive(cmd *cobra.Command, args []string, d lxd.InstanceServer, server *api.Server) (*cmdInitData, error) { diff --git a/lxd/main_init_preseed.go b/lxd/main_init_preseed.go index 58ed2f9331fb..44ac4c503bdf 100644 --- a/lxd/main_init_preseed.go +++ b/lxd/main_init_preseed.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" + "github.com/canonical/lxd/client" ) func (c *cmdInit) RunPreseed(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) { diff --git a/lxd/main_manpage.go b/lxd/main_manpage.go index 05e785f18d60..8d6342ebd516 100644 --- a/lxd/main_manpage.go +++ b/lxd/main_manpage.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - cli "github.com/lxc/lxd/shared/cmd" + cli "github.com/canonical/lxd/shared/cmd" ) type cmdManpage struct { diff --git a/lxd/main_migratedumpsuccess.go b/lxd/main_migratedumpsuccess.go index 1bbd00a42ae4..1d8f27a6c957 100644 --- a/lxd/main_migratedumpsuccess.go +++ b/lxd/main_migratedumpsuccess.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" ) type cmdMigratedumpsuccess struct { diff --git a/lxd/main_netcat.go b/lxd/main_netcat.go index b1dbf5faf332..0cc60c1336a4 100644 --- a/lxd/main_netcat.go +++ b/lxd/main_netcat.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/eagain" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/eagain" ) type cmdNetcat struct { diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go index f11c0d4cb95b..73b2cd6e3a03 100644 --- a/lxd/main_nsexec.go +++ b/lxd/main_nsexec.go @@ -20,7 +20,7 @@ package main import ( // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_recover.go b/lxd/main_recover.go index 882f131da808..9e6463d64d1c 100644 --- a/lxd/main_recover.go +++ b/lxd/main_recover.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/validate" ) type cmdRecover struct { diff --git a/lxd/main_shutdown.go b/lxd/main_shutdown.go index e3d51b497206..68179751b975 100644 --- a/lxd/main_shutdown.go +++ b/lxd/main_shutdown.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" + "github.com/canonical/lxd/client" ) type cmdShutdown struct { diff --git a/lxd/main_sql.go b/lxd/main_sql.go index 1b7ca7f576eb..e64d15a83432 100644 --- a/lxd/main_sql.go +++ b/lxd/main_sql.go @@ -9,8 +9,8 @@ import ( "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" ) type cmdSql struct { diff --git a/lxd/main_test.go b/lxd/main_test.go index e3701f46ca2d..3004a737f135 100644 --- a/lxd/main_test.go +++ b/lxd/main_test.go @@ -6,14 +6,14 @@ import ( "io/ioutil" "os" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/sys" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" ) func mockStartDaemon() (*Daemon, error) { diff --git a/lxd/main_version.go b/lxd/main_version.go index 9396b336e948..c54a995eeb16 100644 --- a/lxd/main_version.go +++ b/lxd/main_version.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/version" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/version" ) type cmdVersion struct { diff --git a/lxd/main_waitready.go b/lxd/main_waitready.go index da9caca5d649..30fd24f5250b 100644 --- a/lxd/main_waitready.go +++ b/lxd/main_waitready.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/logger" ) type cmdWaitready struct { diff --git a/lxd/migrate.go b/lxd/migrate.go index 4711ed707789..487015118b76 100644 --- a/lxd/migrate.go +++ b/lxd/migrate.go @@ -1,6 +1,6 @@ // Package migration provides the primitives for migration in LXD. // -// See https://github.com/lxc/lxd/blob/master/specs/migration.md for a complete +// See https://github.com/canonical/lxd/blob/master/specs/migration.md for a complete // description. package main @@ -19,14 +19,14 @@ import ( "google.golang.org/protobuf/proto" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/tcp" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/tcp" ) type migrationFields struct { diff --git a/lxd/migrate_instance.go b/lxd/migrate_instance.go index dbdcbaae5ab7..7d61d3a1c786 100644 --- a/lxd/migrate_instance.go +++ b/lxd/migrate_instance.go @@ -16,20 +16,20 @@ import ( "google.golang.org/protobuf/proto" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) func newMigrationSource(inst instance.Instance, stateful bool, instanceOnly bool) (*migrationSourceWs, error) { diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go index b94db6e8b99d..e0c011a686af 100644 --- a/lxd/migrate_storage_volumes.go +++ b/lxd/migrate_storage_volumes.go @@ -7,15 +7,15 @@ import ( "github.com/gorilla/websocket" "google.golang.org/protobuf/proto" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) func newStorageMigrationSource(volumeOnly bool) (*migrationSourceWs, error) { diff --git a/lxd/migration/migration_volumes.go b/lxd/migration/migration_volumes.go index e6b71f5df962..098d963e1628 100644 --- a/lxd/migration/migration_volumes.go +++ b/lxd/migration/migration_volumes.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Type represents the migration transport type. It indicates the method by which the migration can diff --git a/lxd/migration/wsproto.go b/lxd/migration/wsproto.go index bbc6a7010164..c4e9f2adbaaa 100644 --- a/lxd/migration/wsproto.go +++ b/lxd/migration/wsproto.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/websocket" "google.golang.org/protobuf/proto" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // ProtoRecv gets a protobuf message from a websocket diff --git a/lxd/network/driver_bridge.go b/lxd/network/driver_bridge.go index 4426fbe227cc..b9c669508eb3 100644 --- a/lxd/network/driver_bridge.go +++ b/lxd/network/driver_bridge.go @@ -18,27 +18,27 @@ import ( "github.com/mdlayher/netx/eui64" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc" - firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network/openvswitch" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/lxd/dnsmasq/dhcpalloc" + firewallDrivers "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network/openvswitch" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) // ForkdnsServersListPath defines the path that contains the forkdns server candidate file. diff --git a/lxd/network/driver_common.go b/lxd/network/driver_common.go index 6a36f276a6e7..154576094613 100644 --- a/lxd/network/driver_common.go +++ b/lxd/network/driver_common.go @@ -8,18 +8,18 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/validate" ) // Info represents information about a network driver. diff --git a/lxd/network/network_interface.go b/lxd/network/network_interface.go index 01acd3687200..c583a440126d 100644 --- a/lxd/network/network_interface.go +++ b/lxd/network/network_interface.go @@ -3,12 +3,12 @@ package network import ( "net" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Type represents a LXD network driver type. diff --git a/lxd/network/network_load.go b/lxd/network/network_load.go index 208fcc98758d..96204a20ae0b 100644 --- a/lxd/network/network_load.go +++ b/lxd/network/network_load.go @@ -1,7 +1,7 @@ package network import ( - "github.com/lxc/lxd/lxd/state" + "github.com/canonical/lxd/lxd/state" ) var drivers = map[string]func() Network{ diff --git a/lxd/network/network_utils.go b/lxd/network/network_utils.go index 699bc4a9e0b0..a1104ede1aac 100644 --- a/lxd/network/network_utils.go +++ b/lxd/network/network_utils.go @@ -15,21 +15,21 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/lxd/dnsmasq/dhcpalloc" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) func networkValidPort(value string) error { diff --git a/lxd/network/network_utils_bridge.go b/lxd/network/network_utils_bridge.go index aaebbe1c25ff..79ccf353084e 100644 --- a/lxd/network/network_utils_bridge.go +++ b/lxd/network/network_utils_bridge.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "strings" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network/openvswitch" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network/openvswitch" + "github.com/canonical/lxd/shared" ) // BridgeVLANFilteringStatus returns whether VLAN filtering is enabled on a bridge interface. diff --git a/lxd/network/network_utils_sriov.go b/lxd/network/network_utils_sriov.go index 53fd470f21bc..df462c349aeb 100644 --- a/lxd/network/network_utils_sriov.go +++ b/lxd/network/network_utils_sriov.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // sriovReservedDevicesMutex used to coordinate access for checking reserved devices. diff --git a/lxd/network/openvswitch/ovs.go b/lxd/network/openvswitch/ovs.go index c94b9b770a95..476aeeeaf546 100644 --- a/lxd/network/openvswitch/ovs.go +++ b/lxd/network/openvswitch/ovs.go @@ -3,7 +3,7 @@ package openvswitch import ( "os/exec" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // NewOVS initialises new OVS wrapper. diff --git a/lxd/networks.go b/lxd/networks.go index 7e3609f6abdf..bad08a1dd04f 100644 --- a/lxd/networks.go +++ b/lxd/networks.go @@ -14,24 +14,24 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/network/openvswitch" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/network/openvswitch" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Lock to prevent concurent networks creation diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go index 7b2a49dbfefe..b3d1e73691e6 100644 --- a/lxd/networks_utils.go +++ b/lxd/networks_utils.go @@ -1,11 +1,11 @@ package main import ( - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) func networkAutoAttach(cluster *db.Cluster, devName string) error { diff --git a/lxd/node/config.go b/lxd/node/config.go index 61892f87c99b..d39c3ec2904a 100644 --- a/lxd/node/config.go +++ b/lxd/node/config.go @@ -3,11 +3,11 @@ package node import ( "fmt" - "github.com/lxc/lxd/lxd/config" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/config" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // Config holds node-local configuration values for a certain LXD instance. diff --git a/lxd/node/config_test.go b/lxd/node/config_test.go index fb20433f97b8..446467d7ef2c 100644 --- a/lxd/node/config_test.go +++ b/lxd/node/config_test.go @@ -3,8 +3,8 @@ package node_test import ( "testing" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/node/raft.go b/lxd/node/raft.go index 77cf61082bbe..37c4416d6f0a 100644 --- a/lxd/node/raft.go +++ b/lxd/node/raft.go @@ -3,7 +3,7 @@ package node import ( "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) // DetermineRaftNode figures out what raft node ID and address we have, if any. diff --git a/lxd/node/raft_test.go b/lxd/node/raft_test.go index de87befd7159..36579c9a8a25 100644 --- a/lxd/node/raft_test.go +++ b/lxd/node/raft_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" ) // The raft identity (ID and address) of a node depends on the value of diff --git a/lxd/operations.go b/lxd/operations.go index cde96dedac9f..fa0641d051ba 100644 --- a/lxd/operations.go +++ b/lxd/operations.go @@ -10,19 +10,19 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var operationCmd = APIEndpoint{ diff --git a/lxd/operations/linux.go b/lxd/operations/linux.go index 23f7da141c27..a8f21c67f286 100644 --- a/lxd/operations/linux.go +++ b/lxd/operations/linux.go @@ -6,7 +6,7 @@ package operations import ( "fmt" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) func registerDBOperation(op *Operation, opType db.OperationType) error { diff --git a/lxd/operations/notlinux.go b/lxd/operations/notlinux.go index a3409178825e..8b357d44a752 100644 --- a/lxd/operations/notlinux.go +++ b/lxd/operations/notlinux.go @@ -6,7 +6,7 @@ package operations import ( "fmt" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) func registerDBOperation(op *Operation, opType db.OperationType) error { diff --git a/lxd/operations/operations.go b/lxd/operations/operations.go index 2b29e7c80a80..980d5ba4f82d 100644 --- a/lxd/operations/operations.go +++ b/lxd/operations/operations.go @@ -10,16 +10,16 @@ import ( "github.com/pborman/uuid" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) var debug bool diff --git a/lxd/operations/response.go b/lxd/operations/response.go index e3a9f50d2f12..09ecb2b2e91d 100644 --- a/lxd/operations/response.go +++ b/lxd/operations/response.go @@ -6,12 +6,12 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/version" ) // Operation response diff --git a/lxd/operations/websocket.go b/lxd/operations/websocket.go index 46c83473cd64..15427ed0d72a 100644 --- a/lxd/operations/websocket.go +++ b/lxd/operations/websocket.go @@ -6,8 +6,8 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" ) type operationWebSocket struct { diff --git a/lxd/patches.go b/lxd/patches.go index b4cf4d060f9e..52ad99712497 100644 --- a/lxd/patches.go +++ b/lxd/patches.go @@ -16,24 +16,24 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - driver "github.com/lxc/lxd/lxd/storage" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + driver "github.com/canonical/lxd/lxd/storage" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) type patchStage int diff --git a/lxd/patches_utils.go b/lxd/patches_utils.go index 1b03c1188224..25b92138c2a9 100644 --- a/lxd/patches_utils.go +++ b/lxd/patches_utils.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" ) // For 'btrfs' storage backend. diff --git a/lxd/profiles.go b/lxd/profiles.go index 1af3616b28a5..73327519144c 100644 --- a/lxd/profiles.go +++ b/lxd/profiles.go @@ -12,20 +12,20 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var profilesCmd = APIEndpoint{ diff --git a/lxd/profiles_utils.go b/lxd/profiles_utils.go index 1272d3be371c..860fe0313758 100644 --- a/lxd/profiles_utils.go +++ b/lxd/profiles_utils.go @@ -3,13 +3,13 @@ package main import ( "fmt" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func doProfileUpdate(d *Daemon, projectName string, name string, id int64, profile *api.Profile, req api.ProfilePut) error { diff --git a/lxd/project/permissions.go b/lxd/project/permissions.go index 0963f90941fb..59aeea5e5c59 100644 --- a/lxd/project/permissions.go +++ b/lxd/project/permissions.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/db" - deviceconfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/db" + deviceconfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" ) // AllowInstanceCreation returns an error if any project-specific limit or diff --git a/lxd/project/permissions_test.go b/lxd/project/permissions_test.go index 3327fcada096..06a3911e7f50 100644 --- a/lxd/project/permissions_test.go +++ b/lxd/project/permissions_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // If there's no limit configured on the project, the check passes. diff --git a/lxd/project/project.go b/lxd/project/project.go index a8ea42ab115d..5d7d1df6c291 100644 --- a/lxd/project/project.go +++ b/lxd/project/project.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" ) // Default is the string used for a default project. diff --git a/lxd/project/project_test.go b/lxd/project/project_test.go index 43532a9f3bd3..8737dd2f875f 100644 --- a/lxd/project/project_test.go +++ b/lxd/project/project_test.go @@ -3,7 +3,7 @@ package project_test import ( "fmt" - "github.com/lxc/lxd/lxd/project" + "github.com/canonical/lxd/lxd/project" ) func ExampleInstance() { diff --git a/lxd/rbac/requests.go b/lxd/rbac/requests.go index aeea2acc1725..feb71a6ca97f 100644 --- a/lxd/rbac/requests.go +++ b/lxd/rbac/requests.go @@ -3,8 +3,8 @@ package rbac import ( "net/http" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/shared" ) // UserIsAdmin checks whether the requestor is a global admin. diff --git a/lxd/rbac/server.go b/lxd/rbac/server.go index d8e1054acb67..bf6a0721985e 100644 --- a/lxd/rbac/server.go +++ b/lxd/rbac/server.go @@ -19,8 +19,8 @@ import ( "gopkg.in/macaroon-bakery.v2/httpbakery" "gopkg.in/macaroon-bakery.v2/httpbakery/agent" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) type rbacResource struct { diff --git a/lxd/request/request.go b/lxd/request/request.go index ec680b775345..c9a40ae85d3a 100644 --- a/lxd/request/request.go +++ b/lxd/request/request.go @@ -5,7 +5,7 @@ import ( "net" "net/http" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // CreateRequestor extracts the lifecycle event requestor data from an http.Request context diff --git a/lxd/resources.go b/lxd/resources.go index 37b1095e244b..571b56ca3362 100644 --- a/lxd/resources.go +++ b/lxd/resources.go @@ -5,10 +5,10 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared/api" ) var api10ResourcesCmd = APIEndpoint{ diff --git a/lxd/resources/cpu.go b/lxd/resources/cpu.go index 0ab93337fc2b..9a90e35bf539 100644 --- a/lxd/resources/cpu.go +++ b/lxd/resources/cpu.go @@ -13,7 +13,7 @@ import ( "github.com/digitalocean/go-smbios/smbios" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysDevicesCPU = "/sys/devices/system/cpu" diff --git a/lxd/resources/gpu.go b/lxd/resources/gpu.go index 65c8e0200744..05196d72187e 100644 --- a/lxd/resources/gpu.go +++ b/lxd/resources/gpu.go @@ -15,7 +15,7 @@ import ( "github.com/jaypipes/pcidb" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysClassDrm = "/sys/class/drm" diff --git a/lxd/resources/memory.go b/lxd/resources/memory.go index 95b407a2c52a..d6a31952935a 100644 --- a/lxd/resources/memory.go +++ b/lxd/resources/memory.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" ) var sysDevicesNode = "/sys/devices/system/node" diff --git a/lxd/resources/network.go b/lxd/resources/network.go index 107df7bd0ea9..de391ed3e181 100644 --- a/lxd/resources/network.go +++ b/lxd/resources/network.go @@ -13,7 +13,7 @@ import ( "github.com/jaypipes/pcidb" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysClassNet = "/sys/class/net" diff --git a/lxd/resources/network_ethtool.go b/lxd/resources/network_ethtool.go index 9d191cb3a9a3..761dc68f7ffb 100644 --- a/lxd/resources/network_ethtool.go +++ b/lxd/resources/network_ethtool.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) type ethtoolReq struct { diff --git a/lxd/resources/pci.go b/lxd/resources/pci.go index 390d5cd8e5ba..bb8723cf6d7c 100644 --- a/lxd/resources/pci.go +++ b/lxd/resources/pci.go @@ -11,7 +11,7 @@ import ( "github.com/jaypipes/pcidb" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetPCI returns a filled api.ResourcesPCI struct ready for use by LXD diff --git a/lxd/resources/resources.go b/lxd/resources/resources.go index 4556c3b21001..62eb51de5fcb 100644 --- a/lxd/resources/resources.go +++ b/lxd/resources/resources.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetResources returns a filled api.Resources struct ready for use by LXD diff --git a/lxd/resources/storage.go b/lxd/resources/storage.go index 2b53cd751456..1dcb02b1f223 100644 --- a/lxd/resources/storage.go +++ b/lxd/resources/storage.go @@ -12,7 +12,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var devDiskByPath = "/dev/disk/by-path" diff --git a/lxd/resources/system.go b/lxd/resources/system.go index 7ae381172213..706871d69358 100644 --- a/lxd/resources/system.go +++ b/lxd/resources/system.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysClassDMIID = "/sys/class/dmi/id" diff --git a/lxd/resources/usb.go b/lxd/resources/usb.go index 401855b4e428..7b130ca4f4b5 100644 --- a/lxd/resources/usb.go +++ b/lxd/resources/usb.go @@ -9,8 +9,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/usbid" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/usbid" ) var sysBusUSB = "/sys/bus/usb/devices" diff --git a/lxd/response.go b/lxd/response.go index 5869114fe36a..c31f3a7f9de9 100644 --- a/lxd/response.go +++ b/lxd/response.go @@ -3,9 +3,9 @@ package main import ( "net/http" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/response" ) func forwardedResponseToNode(d *Daemon, r *http.Request, node string) response.Response { diff --git a/lxd/response/response.go b/lxd/response/response.go index 82eb2d1fe1cd..d981b9772155 100644 --- a/lxd/response/response.go +++ b/lxd/response/response.go @@ -12,11 +12,11 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) var debug bool diff --git a/lxd/response/smart.go b/lxd/response/smart.go index 87cafd52305c..6567034f0c0e 100644 --- a/lxd/response/smart.go +++ b/lxd/response/smart.go @@ -6,8 +6,8 @@ import ( "net/http" "os" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared/api" ) var httpResponseErrors = map[int][]error{ diff --git a/lxd/revert/revert_test.go b/lxd/revert/revert_test.go index 20b0fefb7b01..8dcb07bc51b1 100644 --- a/lxd/revert/revert_test.go +++ b/lxd/revert/revert_test.go @@ -3,7 +3,7 @@ package revert_test import ( "fmt" - "github.com/lxc/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/revert" ) func ExampleReverter_fail() { diff --git a/lxd/rsync/rsync.go b/lxd/rsync/rsync.go index ac1c53dad15e..409f84b7a8d9 100644 --- a/lxd/rsync/rsync.go +++ b/lxd/rsync/rsync.go @@ -12,10 +12,10 @@ import ( "github.com/pborman/uuid" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Debug controls additional debugging in rsync output. diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go index 3ea2788853f3..cd3438596e36 100644 --- a/lxd/seccomp/seccomp.go +++ b/lxd/seccomp/seccomp.go @@ -20,18 +20,18 @@ import ( liblxc "gopkg.in/lxc/go-lxc.v2" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" - - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/ucred" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/netutils" - "github.com/lxc/lxd/shared/osarch" + _ "github.com/canonical/lxd/lxd/include" + + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/netutils" + "github.com/canonical/lxd/shared/osarch" ) /* diff --git a/lxd/snapshot_common.go b/lxd/snapshot_common.go index c4d9f98f6ce9..b29771d34c61 100644 --- a/lxd/snapshot_common.go +++ b/lxd/snapshot_common.go @@ -8,7 +8,7 @@ import ( "github.com/robfig/cron/v3" - "github.com/lxc/lxd/lxd/util" + "github.com/canonical/lxd/lxd/util" ) // SnapshotScheduleAliases contains the mapping of scheduling aliases to cron syntax diff --git a/lxd/snapshot_common_test.go b/lxd/snapshot_common_test.go index 2a08eaf2bf35..3e657e975bf6 100644 --- a/lxd/snapshot_common_test.go +++ b/lxd/snapshot_common_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/revert" ) func (suite *containerTestSuite) TestSnapshotScheduling() { diff --git a/lxd/state/notlinux.go b/lxd/state/notlinux.go index 6a1a11a143d2..af714abf4af4 100644 --- a/lxd/state/notlinux.go +++ b/lxd/state/notlinux.go @@ -6,7 +6,7 @@ package state import ( "context" - "github.com/lxc/lxd/lxd/events" + "github.com/canonical/lxd/lxd/events" ) // State here is just an empty shim to statisfy dependencies. diff --git a/lxd/state/state.go b/lxd/state/state.go index 5d6d8f978f22..23b22116568e 100644 --- a/lxd/state/state.go +++ b/lxd/state/state.go @@ -8,15 +8,15 @@ import ( "net/http" "net/url" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/firewall" - "github.com/lxc/lxd/lxd/fsmonitor" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/maas" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/firewall" + "github.com/canonical/lxd/lxd/fsmonitor" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/maas" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" ) // State is a gateway to the two main stateful components of LXD, the database diff --git a/lxd/state/testing.go b/lxd/state/testing.go index f750884ecd8d..6242363ae5d2 100644 --- a/lxd/state/testing.go +++ b/lxd/state/testing.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/firewall" - "github.com/lxc/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/firewall" + "github.com/canonical/lxd/lxd/sys" ) // NewTestState returns a State object initialized with testable instances of diff --git a/lxd/storage.go b/lxd/storage.go index 685791ae3db4..84e46dddd07e 100644 --- a/lxd/storage.go +++ b/lxd/storage.go @@ -10,16 +10,16 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Simply cache used to storage the activated drivers on this LXD instance. This diff --git a/lxd/storage/backend_lxd.go b/lxd/storage/backend_lxd.go index ddeecda34a0f..e2e106484f0e 100644 --- a/lxd/storage/backend_lxd.go +++ b/lxd/storage/backend_lxd.go @@ -14,28 +14,28 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/storage/memorypipe" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/storage/memorypipe" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) var unavailablePools = make(map[string]struct{}) diff --git a/lxd/storage/backend_lxd_patches.go b/lxd/storage/backend_lxd_patches.go index aa51dfa832e8..cc8f7dbd6a3d 100644 --- a/lxd/storage/backend_lxd_patches.go +++ b/lxd/storage/backend_lxd_patches.go @@ -6,14 +6,14 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var lxdEarlyPatches = map[string]func(b *lxdBackend) error{} diff --git a/lxd/storage/backend_mock.go b/lxd/storage/backend_mock.go index 54e93fc16f57..23582ee83db8 100644 --- a/lxd/storage/backend_mock.go +++ b/lxd/storage/backend_mock.go @@ -4,17 +4,17 @@ import ( "io" "time" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" ) type mockBackend struct { diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go index 636d1f941f20..a83a6ca91526 100644 --- a/lxd/storage/drivers/driver_btrfs.go +++ b/lxd/storage/drivers/driver_btrfs.go @@ -9,14 +9,14 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) var btrfsVersion string diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go index faecb0e07417..61aec90288e1 100644 --- a/lxd/storage/drivers/driver_btrfs_utils.go +++ b/lxd/storage/drivers/driver_btrfs_utils.go @@ -14,10 +14,10 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" ) // Errors diff --git a/lxd/storage/drivers/driver_btrfs_volumes.go b/lxd/storage/drivers/driver_btrfs_volumes.go index d5b69b7df213..6dcd84d4806c 100644 --- a/lxd/storage/drivers/driver_btrfs_volumes.go +++ b/lxd/storage/drivers/driver_btrfs_volumes.go @@ -16,16 +16,16 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/archive" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/archive" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function. diff --git a/lxd/storage/drivers/driver_ceph.go b/lxd/storage/drivers/driver_ceph.go index 7586d87f5141..71eb68b9f232 100644 --- a/lxd/storage/drivers/driver_ceph.go +++ b/lxd/storage/drivers/driver_ceph.go @@ -9,13 +9,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) var cephAllowedFilesystems = []string{"btrfs", "ext4", "xfs"} diff --git a/lxd/storage/drivers/driver_ceph_utils.go b/lxd/storage/drivers/driver_ceph_utils.go index 0eaa330cb11b..4b7f70c32deb 100644 --- a/lxd/storage/drivers/driver_ceph_utils.go +++ b/lxd/storage/drivers/driver_ceph_utils.go @@ -15,11 +15,11 @@ import ( "github.com/pborman/uuid" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // cephBlockVolSuffix suffix used for block content type volumes. diff --git a/lxd/storage/drivers/driver_ceph_volumes.go b/lxd/storage/drivers/driver_ceph_volumes.go index fcc60833c554..3b60a3381126 100644 --- a/lxd/storage/drivers/driver_ceph_volumes.go +++ b/lxd/storage/drivers/driver_ceph_volumes.go @@ -14,17 +14,17 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied diff --git a/lxd/storage/drivers/driver_cephfs.go b/lxd/storage/drivers/driver_cephfs.go index 4d3a0a853559..5f735bd140c8 100644 --- a/lxd/storage/drivers/driver_cephfs.go +++ b/lxd/storage/drivers/driver_cephfs.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/validate" ) var cephfsVersion string diff --git a/lxd/storage/drivers/driver_cephfs_utils.go b/lxd/storage/drivers/driver_cephfs_utils.go index f46d9424691f..594a45b567c9 100644 --- a/lxd/storage/drivers/driver_cephfs_utils.go +++ b/lxd/storage/drivers/driver_cephfs_utils.go @@ -3,7 +3,7 @@ package drivers import ( "fmt" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // fsExists checks that the Ceph FS instance indeed exists. diff --git a/lxd/storage/drivers/driver_cephfs_volumes.go b/lxd/storage/drivers/driver_cephfs_volumes.go index b44f7a7ef172..e89217c7f7fa 100644 --- a/lxd/storage/drivers/driver_cephfs_volumes.go +++ b/lxd/storage/drivers/driver_cephfs_volumes.go @@ -9,15 +9,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // CreateVolume creates a new storage volume on disk. diff --git a/lxd/storage/drivers/driver_common.go b/lxd/storage/drivers/driver_common.go index 2d91f9f9e0b6..316305702f25 100644 --- a/lxd/storage/drivers/driver_common.go +++ b/lxd/storage/drivers/driver_common.go @@ -7,10 +7,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) type common struct { diff --git a/lxd/storage/drivers/driver_dir.go b/lxd/storage/drivers/driver_dir.go index 2f94eb57f818..01ce28a57b1b 100644 --- a/lxd/storage/drivers/driver_dir.go +++ b/lxd/storage/drivers/driver_dir.go @@ -7,9 +7,9 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type dir struct { diff --git a/lxd/storage/drivers/driver_dir_utils.go b/lxd/storage/drivers/driver_dir_utils.go index 9d2ef1fcf61e..b8f4fda8f2b2 100644 --- a/lxd/storage/drivers/driver_dir_utils.go +++ b/lxd/storage/drivers/driver_dir_utils.go @@ -5,9 +5,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/quota" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/quota" + "github.com/canonical/lxd/shared/units" ) // withoutGetVolID returns a copy of this struct but with a volIDFunc which will cause quotas to be skipped. diff --git a/lxd/storage/drivers/driver_dir_volumes.go b/lxd/storage/drivers/driver_dir_volumes.go index cc89427a601f..c1f96e6ce25a 100644 --- a/lxd/storage/drivers/driver_dir_volumes.go +++ b/lxd/storage/drivers/driver_dir_volumes.go @@ -9,15 +9,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/storage/quota" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/storage/quota" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/units" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied diff --git a/lxd/storage/drivers/driver_lvm.go b/lxd/storage/drivers/driver_lvm.go index fb8d71ecf63a..e70ee81b1967 100644 --- a/lxd/storage/drivers/driver_lvm.go +++ b/lxd/storage/drivers/driver_lvm.go @@ -11,12 +11,12 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) const lvmVgPoolMarker = "lxd_pool" // Indicator tag used to mark volume groups as in use by LXD. @@ -550,7 +550,7 @@ func (d *lvm) Mount() (bool, error) { } // Unmount unmounts the storage pool (this does nothing). -// LVM doesn't currently support unmounting, please see https://github.com/lxc/lxd/issues/9278 +// LVM doesn't currently support unmounting, please see https://github.com/canonical/lxd/issues/9278 func (d *lvm) Unmount() (bool, error) { return false, nil } diff --git a/lxd/storage/drivers/driver_lvm_patches.go b/lxd/storage/drivers/driver_lvm_patches.go index c28f21aeee0d..a99cb8167721 100644 --- a/lxd/storage/drivers/driver_lvm_patches.go +++ b/lxd/storage/drivers/driver_lvm_patches.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // patchStorageSkipActivation set skipactivation=y on all LXD LVM logical volumes (excluding thin pool volumes). diff --git a/lxd/storage/drivers/driver_lvm_utils.go b/lxd/storage/drivers/driver_lvm_utils.go index 8a121a4f116c..f1e1b358590f 100644 --- a/lxd/storage/drivers/driver_lvm_utils.go +++ b/lxd/storage/drivers/driver_lvm_utils.go @@ -10,12 +10,12 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/version" ) // lvmBlockVolSuffix suffix used for block content type volumes. diff --git a/lxd/storage/drivers/driver_lvm_volumes.go b/lxd/storage/drivers/driver_lvm_volumes.go index 79556073fb1e..dd75fde4af5b 100644 --- a/lxd/storage/drivers/driver_lvm_volumes.go +++ b/lxd/storage/drivers/driver_lvm_volumes.go @@ -13,15 +13,15 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/validate" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function. diff --git a/lxd/storage/drivers/driver_mock.go b/lxd/storage/drivers/driver_mock.go index 76ce6b126839..69f3746aa219 100644 --- a/lxd/storage/drivers/driver_mock.go +++ b/lxd/storage/drivers/driver_mock.go @@ -3,12 +3,12 @@ package drivers import ( "io" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" ) type mock struct { diff --git a/lxd/storage/drivers/driver_zfs.go b/lxd/storage/drivers/driver_zfs.go index c722cd8cea07..b2175d3faa4c 100644 --- a/lxd/storage/drivers/driver_zfs.go +++ b/lxd/storage/drivers/driver_zfs.go @@ -8,14 +8,14 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) var zfsVersion string diff --git a/lxd/storage/drivers/driver_zfs_patches.go b/lxd/storage/drivers/driver_zfs_patches.go index aae5028ea2a2..c7f2627c46ca 100644 --- a/lxd/storage/drivers/driver_zfs_patches.go +++ b/lxd/storage/drivers/driver_zfs_patches.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) func (d *zfs) patchStorageCreateVM() error { diff --git a/lxd/storage/drivers/driver_zfs_utils.go b/lxd/storage/drivers/driver_zfs_utils.go index 8e6134578509..eb425f87a7e7 100644 --- a/lxd/storage/drivers/driver_zfs_utils.go +++ b/lxd/storage/drivers/driver_zfs_utils.go @@ -10,10 +10,10 @@ import ( "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) const ( diff --git a/lxd/storage/drivers/driver_zfs_volumes.go b/lxd/storage/drivers/driver_zfs_volumes.go index cee647e9a743..f15fb0e93fc6 100644 --- a/lxd/storage/drivers/driver_zfs_volumes.go +++ b/lxd/storage/drivers/driver_zfs_volumes.go @@ -17,18 +17,18 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/archive" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/archive" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied diff --git a/lxd/storage/drivers/generic_vfs.go b/lxd/storage/drivers/generic_vfs.go index 08212581ea8a..04c0dff85148 100644 --- a/lxd/storage/drivers/generic_vfs.go +++ b/lxd/storage/drivers/generic_vfs.go @@ -12,19 +12,19 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/archive" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/archive" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" ) // genericVolumeBlockExtension extension used for generic block volume disk files. diff --git a/lxd/storage/drivers/interface.go b/lxd/storage/drivers/interface.go index 60c0e83590df..064394f00613 100644 --- a/lxd/storage/drivers/interface.go +++ b/lxd/storage/drivers/interface.go @@ -3,14 +3,14 @@ package drivers import ( "io" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" ) // driver is the extended internal interface. diff --git a/lxd/storage/drivers/load.go b/lxd/storage/drivers/load.go index 38e41058f631..59118d306d53 100644 --- a/lxd/storage/drivers/load.go +++ b/lxd/storage/drivers/load.go @@ -1,8 +1,8 @@ package drivers import ( - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) var drivers = map[string]func() driver{ diff --git a/lxd/storage/drivers/utils.go b/lxd/storage/drivers/utils.go index 2d583c07a36d..e7a51c4d636a 100644 --- a/lxd/storage/drivers/utils.go +++ b/lxd/storage/drivers/utils.go @@ -13,10 +13,10 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" ) // MinBlockBoundary minimum block boundary size to use. diff --git a/lxd/storage/drivers/utils_cgo.go b/lxd/storage/drivers/utils_cgo.go index 888ebf479073..228467409098 100644 --- a/lxd/storage/drivers/utils_cgo.go +++ b/lxd/storage/drivers/utils_cgo.go @@ -9,7 +9,7 @@ import ( "unsafe" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/storage/drivers/volume.go b/lxd/storage/drivers/volume.go index cdd31bddafdc..fea29a4bb758 100644 --- a/lxd/storage/drivers/volume.go +++ b/lxd/storage/drivers/volume.go @@ -4,13 +4,13 @@ import ( "fmt" "os" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/refcount" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/units" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/refcount" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/units" ) // tmpVolSuffix Suffix to use for any temporary volumes created by LXD. diff --git a/lxd/storage/filesystem/fs.go b/lxd/storage/filesystem/fs.go index d38b269b9500..b44fd3a454c4 100644 --- a/lxd/storage/filesystem/fs.go +++ b/lxd/storage/filesystem/fs.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // Filesystem magic numbers. diff --git a/lxd/storage/load.go b/lxd/storage/load.go index 1fac8ab79e11..3262a8bb7324 100644 --- a/lxd/storage/load.go +++ b/lxd/storage/load.go @@ -6,15 +6,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // PoolIDTemporary is used to indicate a temporary pool instance that is not in the database. diff --git a/lxd/storage/pool_interface.go b/lxd/storage/pool_interface.go index 8efed9ae60e0..bfc360fcbc70 100644 --- a/lxd/storage/pool_interface.go +++ b/lxd/storage/pool_interface.go @@ -4,15 +4,15 @@ import ( "io" "time" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" ) // MountInfo represents info about the result of a mount operation. diff --git a/lxd/storage/quota/projectquota.go b/lxd/storage/quota/projectquota.go index 81828a2f8d47..28f607ec41b4 100644 --- a/lxd/storage/quota/projectquota.go +++ b/lxd/storage/quota/projectquota.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) /* diff --git a/lxd/storage/storage.go b/lxd/storage/storage.go index f8b5658b10a5..7d0f13279ee3 100644 --- a/lxd/storage/storage.go +++ b/lxd/storage/storage.go @@ -3,9 +3,9 @@ package storage import ( "os" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" ) // InstancePath returns the directory of an instance or snapshot. diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go index cd57e661a708..4b606ba09c3a 100644 --- a/lxd/storage/utils.go +++ b/lxd/storage/utils.go @@ -11,26 +11,26 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/archive" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/archive" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // ValidName validates the provided name, and returns an error if it's not a valid storage name. diff --git a/lxd/storage_migration.go b/lxd/storage_migration.go index aaa3a9eb4e5e..c7f1bd24fd8e 100644 --- a/lxd/storage_migration.go +++ b/lxd/storage_migration.go @@ -3,11 +3,11 @@ package main import ( "time" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/shared" ) func snapshotProtobufToInstanceArgs(inst instance.Instance, snap *migration.Snapshot) db.InstanceArgs { diff --git a/lxd/storage_pools.go b/lxd/storage_pools.go index 1ac6c8614cd0..830b01e2c47e 100644 --- a/lxd/storage_pools.go +++ b/lxd/storage_pools.go @@ -10,20 +10,20 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Lock to prevent concurent storage pools creation diff --git a/lxd/storage_pools_config.go b/lxd/storage_pools_config.go index ea473db3e532..4c551b1cfa0c 100644 --- a/lxd/storage_pools_config.go +++ b/lxd/storage_pools_config.go @@ -7,10 +7,10 @@ import ( "golang.org/x/sys/unix" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) var storagePoolConfigKeys = map[string]func(value string) error{ diff --git a/lxd/storage_pools_utils.go b/lxd/storage_pools_utils.go index 7e6513206c23..5f32016faf25 100644 --- a/lxd/storage_pools_utils.go +++ b/lxd/storage_pools_utils.go @@ -5,14 +5,14 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // storagePoolDBCreate creates a storage pool DB entry and returns the created Pool ID. diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go index 5bd66552b534..e3cfa2cb0930 100644 --- a/lxd/storage_volumes.go +++ b/lxd/storage_volumes.go @@ -13,19 +13,19 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) var storagePoolVolumesCmd = APIEndpoint{ diff --git a/lxd/storage_volumes_snapshot.go b/lxd/storage_volumes_snapshot.go index ed98b809d0e7..c99a4a66b1a6 100644 --- a/lxd/storage_volumes_snapshot.go +++ b/lxd/storage_volumes_snapshot.go @@ -13,19 +13,19 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) var storagePoolVolumeSnapshotsTypeCmd = APIEndpoint{ diff --git a/lxd/storage_volumes_utils.go b/lxd/storage_volumes_utils.go index 807f11db1f8e..178be1c9ea4d 100644 --- a/lxd/storage_volumes_utils.go +++ b/lxd/storage_volumes_utils.go @@ -3,14 +3,14 @@ package main import ( "fmt" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var supportedVolumeTypes = []int{db.StoragePoolVolumeTypeContainer, db.StoragePoolVolumeTypeVM, db.StoragePoolVolumeTypeCustom, db.StoragePoolVolumeTypeImage} diff --git a/lxd/swagger.go b/lxd/swagger.go index 31470c432140..1a6b42dba2a5 100644 --- a/lxd/swagger.go +++ b/lxd/swagger.go @@ -11,13 +11,13 @@ // // Version: 1.0 // License: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 -// Contact: LXD upstream https://github.com/lxc/lxd +// Contact: LXD upstream https://github.com/canonical/lxd // // swagger:meta package main import ( - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Common error definitions. diff --git a/lxd/sys/apparmor.go b/lxd/sys/apparmor.go index 3c65687719e5..501d4624de1b 100644 --- a/lxd/sys/apparmor.go +++ b/lxd/sys/apparmor.go @@ -12,9 +12,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/syndtr/gocapability/capability" ) diff --git a/lxd/sys/os.go b/lxd/sys/os.go index 98e5fed4065f..fe95eedbe0bc 100644 --- a/lxd/sys/os.go +++ b/lxd/sys/os.go @@ -11,12 +11,12 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) // InotifyTargetInfo records the inotify information associated with a given diff --git a/lxd/task/group_test.go b/lxd/task/group_test.go index 26a089a484e2..0f08a5404475 100644 --- a/lxd/task/group_test.go +++ b/lxd/task/group_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/task" + "github.com/canonical/lxd/lxd/task" "github.com/stretchr/testify/assert" ) diff --git a/lxd/task/task_test.go b/lxd/task/task_test.go index 3ede9bc3a55a..873166164323 100644 --- a/lxd/task/task_test.go +++ b/lxd/task/task_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/task" + "github.com/canonical/lxd/lxd/task" "github.com/stretchr/testify/assert" ) diff --git a/lxd/ucred/ucred.go b/lxd/ucred/ucred.go index 48cc92a2114e..141071cf6cf1 100644 --- a/lxd/ucred/ucred.go +++ b/lxd/ucred/ucred.go @@ -7,8 +7,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/request" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/request" ) // ErrNotUnixSocket is returned when the underlying connection isn't a unix socket. diff --git a/lxd/util/config.go b/lxd/util/config.go index 334b51954618..255f15898fa1 100644 --- a/lxd/util/config.go +++ b/lxd/util/config.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // CompareConfigs compares two config maps and returns an error if they differ. diff --git a/lxd/util/config_test.go b/lxd/util/config_test.go index 4c6e25194423..f4800a225a79 100644 --- a/lxd/util/config_test.go +++ b/lxd/util/config_test.go @@ -3,7 +3,7 @@ package util_test import ( "testing" - "github.com/lxc/lxd/lxd/util" + "github.com/canonical/lxd/lxd/util" "github.com/stretchr/testify/assert" ) diff --git a/lxd/util/encryption.go b/lxd/util/encryption.go index fb2f6f0a1806..287b479f9dbd 100644 --- a/lxd/util/encryption.go +++ b/lxd/util/encryption.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "golang.org/x/crypto/scrypt" ) diff --git a/lxd/util/http.go b/lxd/util/http.go index e78bdad42067..0e88e5a9f0b8 100644 --- a/lxd/util/http.go +++ b/lxd/util/http.go @@ -20,8 +20,8 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // DebugJSON helper to log JSON. diff --git a/lxd/util/kernel.go b/lxd/util/kernel.go index eb82d9c8d374..3a7e3287c0a9 100644 --- a/lxd/util/kernel.go +++ b/lxd/util/kernel.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // LoadModule loads the kernel module with the given name, by invoking diff --git a/lxd/util/net.go b/lxd/util/net.go index 677d2274f355..4d5141716288 100644 --- a/lxd/util/net.go +++ b/lxd/util/net.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "net" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // InMemoryNetwork creates a fully in-memory listener and dial function. diff --git a/lxd/util/net_test.go b/lxd/util/net_test.go index 8ca003536176..eb684bbcbeb3 100644 --- a/lxd/util/net_test.go +++ b/lxd/util/net_test.go @@ -6,8 +6,8 @@ import ( "net" "testing" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/util/storage.go b/lxd/util/storage.go index ddb78825c9e0..7384c543b68c 100644 --- a/lxd/util/storage.go +++ b/lxd/util/storage.go @@ -1,9 +1,9 @@ package util import ( - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // PoolType represents a type of storage pool (local, remote or any). diff --git a/lxd/util/sys.go b/lxd/util/sys.go index 5d8bd0b27ca1..24abe6f151dc 100644 --- a/lxd/util/sys.go +++ b/lxd/util/sys.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared/osarch" ) // GetArchitectures returns the list of supported architectures. diff --git a/lxd/vsock/vsock.go b/lxd/vsock/vsock.go index 496a81a09b77..f442def2717b 100644 --- a/lxd/vsock/vsock.go +++ b/lxd/vsock/vsock.go @@ -9,7 +9,7 @@ import ( "github.com/mdlayher/vsock" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Dial connects to a remote vsock. diff --git a/shared/cert.go b/shared/cert.go index 27abc49c40e1..25957a3b6adb 100644 --- a/shared/cert.go +++ b/shared/cert.go @@ -27,7 +27,7 @@ import ( "path/filepath" "time" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // KeyPairAndCA returns a CertInfo object with a reference to the key pair and diff --git a/shared/cert_test.go b/shared/cert_test.go index a1874ece75f9..3bc968b6706d 100644 --- a/shared/cert_test.go +++ b/shared/cert_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // A new key pair is generated if none exists and saved to the appropriate diff --git a/shared/cmd/ask.go b/shared/cmd/ask.go index cfc947d9c531..1c48463f7d1e 100644 --- a/shared/cmd/ask.go +++ b/shared/cmd/ask.go @@ -9,7 +9,7 @@ import ( "golang.org/x/crypto/ssh/terminal" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) var stdin = bufio.NewReader(os.Stdin) diff --git a/shared/eagain/file_unix.go b/shared/eagain/file_unix.go index d80d23f8ab6b..6724918d1eaf 100644 --- a/shared/eagain/file_unix.go +++ b/shared/eagain/file_unix.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Reader represents an io.Reader that handles EAGAIN diff --git a/shared/idmap/idmapset_linux.go b/shared/idmap/idmapset_linux.go index 78fbb932227e..814e10e2b46e 100644 --- a/shared/idmap/idmapset_linux.go +++ b/shared/idmap/idmapset_linux.go @@ -18,8 +18,8 @@ import ( "sync/atomic" "syscall" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) const VFS3FscapsUnsupported int32 = 0 diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go index daaf3727571f..ee67a4400d05 100644 --- a/shared/idmap/shift_linux.go +++ b/shared/idmap/shift_linux.go @@ -13,10 +13,10 @@ import ( "golang.org/x/sys/unix" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // #cgo LDFLAGS: -lacl diff --git a/shared/instance.go b/shared/instance.go index a1b875184d1f..40cad632fe26 100644 --- a/shared/instance.go +++ b/shared/instance.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // InstanceAction indicates the type of action being performed. diff --git a/shared/instancewriter/instance_tar_writer.go b/shared/instancewriter/instance_tar_writer.go index d8368b33f958..ff0797b63b29 100644 --- a/shared/instancewriter/instance_tar_writer.go +++ b/shared/instancewriter/instance_tar_writer.go @@ -10,9 +10,9 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) // InstanceTarWriter provides a TarWriter implementation that handles ID shifting and hardlink tracking. diff --git a/shared/logging/log.go b/shared/logging/log.go index a074628113e0..2c41e22aa47f 100644 --- a/shared/logging/log.go +++ b/shared/logging/log.go @@ -9,7 +9,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/inconshreveable/log15.v2/term" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // GetLogger returns a logger suitable for using as logger.Log. diff --git a/shared/netutils/network_linux.go b/shared/netutils/network_linux.go index 009117c5b8a2..4a8018512f6b 100644 --- a/shared/netutils/network_linux.go +++ b/shared/netutils/network_linux.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // WebsocketExecMirror mirrors a websocket connection with a set of Writer/Reader. diff --git a/shared/netutils/network_linux_cgo.go b/shared/netutils/network_linux_cgo.go index bacc1290c352..32663a00d4be 100644 --- a/shared/netutils/network_linux_cgo.go +++ b/shared/netutils/network_linux_cgo.go @@ -11,7 +11,7 @@ import ( "strings" "unsafe" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) /* diff --git a/shared/network.go b/shared/network.go index a1fce830c9a6..b681e29afcc6 100644 --- a/shared/network.go +++ b/shared/network.go @@ -16,7 +16,7 @@ import ( "github.com/gorilla/websocket" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // connectErrorPrefix used as prefix to error returned from RFC3493Dialer. diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go index f7ed79caad70..e40e3e58f7f7 100644 --- a/shared/simplestreams/products.go +++ b/shared/simplestreams/products.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // Products represents the base of download.json diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go index f303f4a5d76c..d1637b46e638 100644 --- a/shared/simplestreams/simplestreams.go +++ b/shared/simplestreams/simplestreams.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) var urlDefaultOS = map[string]string{ diff --git a/shared/simplestreams/sort.go b/shared/simplestreams/sort.go index d22b13aff8fb..1ee3f2f17ce5 100644 --- a/shared/simplestreams/sort.go +++ b/shared/simplestreams/sort.go @@ -1,8 +1,8 @@ package simplestreams import ( - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) var nativeName, _ = osarch.ArchitectureGetLocal() diff --git a/shared/subprocess/proc.go b/shared/subprocess/proc.go index 377da9b82e07..618e44d1e7ac 100644 --- a/shared/subprocess/proc.go +++ b/shared/subprocess/proc.go @@ -15,7 +15,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Process struct. Has ability to set runtime arguments diff --git a/shared/util.go b/shared/util.go index 24e42ebd9df6..2ef072ce0eea 100644 --- a/shared/util.go +++ b/shared/util.go @@ -26,9 +26,9 @@ import ( "github.com/flosch/pongo2" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) const SnapshotDelimiter = "/" diff --git a/shared/util_linux.go b/shared/util_linux.go index 0197cd12b685..a4c727bf69da 100644 --- a/shared/util_linux.go +++ b/shared/util_linux.go @@ -19,8 +19,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" ) // --- pure Go functions --- diff --git a/shared/util_linux_cgo.go b/shared/util_linux_cgo.go index 61b823c2c67f..1b55c9014396 100644 --- a/shared/util_linux_cgo.go +++ b/shared/util_linux_cgo.go @@ -8,7 +8,7 @@ import ( "os" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" "golang.org/x/sys/unix" ) diff --git a/shared/validate/validate.go b/shared/validate/validate.go index 6ea9389a1819..f265d81d9be6 100644 --- a/shared/validate/validate.go +++ b/shared/validate/validate.go @@ -14,8 +14,8 @@ import ( "github.com/pborman/uuid" "github.com/robfig/cron/v3" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/units" ) // stringInSlice checks whether the supplied string is present in the supplied slice. diff --git a/shared/validate/validate_test.go b/shared/validate/validate_test.go index e1613c089cbe..f71ffa7d5d0c 100644 --- a/shared/validate/validate_test.go +++ b/shared/validate/validate_test.go @@ -3,7 +3,7 @@ package validate_test import ( "fmt" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/shared/validate" ) func ExampleIsNetworkMAC() { diff --git a/shared/version/platform_linux.go b/shared/version/platform_linux.go index 983581eb1e72..3707dd8a1522 100644 --- a/shared/version/platform_linux.go +++ b/shared/version/platform_linux.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" ) func getPlatformVersionStrings() []string { diff --git a/shared/version/useragent.go b/shared/version/useragent.go index 83bf0475177d..71b46f795ab7 100644 --- a/shared/version/useragent.go +++ b/shared/version/useragent.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared/osarch" ) // UserAgent contains a string suitable as a user-agent diff --git a/test/godeps.list b/test/godeps.list index b7840e562a95..a55776752071 100644 --- a/test/godeps.list +++ b/test/godeps.list @@ -1,14 +1,14 @@ github.com/gorilla/websocket github.com/juju/persistent-cookiejar -github.com/lxc/lxd/client -github.com/lxc/lxd/shared -github.com/lxc/lxd/shared/api -github.com/lxc/lxd/shared/cancel -github.com/lxc/lxd/shared/ioprogress -github.com/lxc/lxd/shared/logger -github.com/lxc/lxd/shared/simplestreams -github.com/lxc/lxd/shared/tcp -github.com/lxc/lxd/shared/units +github.com/canonical/lxd/client +github.com/canonical/lxd/shared +github.com/canonical/lxd/shared/api +github.com/canonical/lxd/shared/cancel +github.com/canonical/lxd/shared/ioprogress +github.com/canonical/lxd/shared/logger +github.com/canonical/lxd/shared/simplestreams +github.com/canonical/lxd/shared/tcp +github.com/canonical/lxd/shared/units github.com/pkg/sftp gopkg.in/inconshreveable/log15.v2 gopkg.in/juju/environschema.v1/form From 5939233491c0461f6c6f47fc2c1237efa39be966 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 15:28:44 -0400 Subject: [PATCH 03/12] Makefile: pin raft to a specific SHA1 commit Signed-off-by: Simon Deziel --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f5b6015b0884..9521bac7ea50 100644 --- a/Makefile +++ b/Makefile @@ -53,10 +53,11 @@ lxd-p2c: .PHONY: deps deps: @if [ ! -e "$(RAFT_PATH)" ]; then \ - git clone --depth=1 "https://github.com/canonical/raft" "$(RAFT_PATH)"; \ + git clone "https://github.com/canonical/raft" "$(RAFT_PATH)"; \ elif [ -e "$(RAFT_PATH)/.git" ]; then \ cd "$(RAFT_PATH)"; git pull; \ - fi + fi; \ + git reset --hard abf9c42a9bb63c24920ab9f0bfbc4b7a47e7e5f4 cd "$(RAFT_PATH)" && \ autoreconf -i && \ From 403eb9fa90ed47d5ed7b71dada905ece9e8190d0 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 15:28:47 -0400 Subject: [PATCH 04/12] Makefile: pin dqlite to a specific SHA1 commit Signed-off-by: Simon Deziel --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9521bac7ea50..57e9c3f2f66c 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,11 @@ deps: # dqlite @if [ ! -e "$(DQLITE_PATH)" ]; then \ - git clone --depth=1 "https://github.com/canonical/dqlite" "$(DQLITE_PATH)"; \ + git clone "https://github.com/canonical/dqlite" "$(DQLITE_PATH)"; \ elif [ -e "$(DQLITE_PATH)/.git" ]; then \ cd "$(DQLITE_PATH)"; git pull; \ - fi + fi; \ + git reset --hard 50ee9af350b2fb4e79f9eb58db22c8a0927138de cd "$(DQLITE_PATH)" && \ autoreconf -i && \ From 3f952dd2d650507f12fb1ff8f5fda906ba7f5aa2 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 15:39:56 -0400 Subject: [PATCH 05/12] lxd: Update instance types URL Signed-off-by: Simon Deziel --- lxd/instance_instance_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go index fcc02ce93a7e..f2f161de17fc 100644 --- a/lxd/instance_instance_types.go +++ b/lxd/instance_instance_types.go @@ -111,7 +111,7 @@ func instanceRefreshTypesTask(d *Daemon) (task.Func, task.Schedule) { func instanceRefreshTypes(ctx context.Context, d *Daemon) error { // Attempt to download the new definitions downloadParse := func(filename string, target interface{}) error { - url := fmt.Sprintf("https://images.linuxcontainers.org/meta/instance-types/%s", filename) + url := fmt.Sprintf("https://images.lxd.canonical.com/meta/instance-types/%s", filename) httpClient, err := util.HTTPClient("", d.proxy) if err != nil { From 583d4d09c2ee0aae854f93f508d3242c74b65d03 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 2 Aug 2023 15:33:10 -0400 Subject: [PATCH 06/12] github: the sphinx config moved to doc/ This was done in #11837 Signed-off-by: Simon Deziel (cherry picked from commit 6ad0451350696e6830bcf9a4afe68e9388feff75) --- .github/labeler.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index f219e55c5361..0e4b213e1519 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -4,4 +4,3 @@ API: - shared/api/**/* Documentation: - doc/**/* -- .sphinx/**/* From b0ce38b9f28596d590ea6017d7b9358596cd15e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 4 Dec 2023 17:12:35 -0500 Subject: [PATCH 07/12] github: Update for new labeler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Signed-off-by: Simon Deziel (cherry picked from commit d2d26decc54cb6e98b8cff573e28790f7f8df9b0) --- .github/labeler.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 0e4b213e1519..7a16429d889b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,10 @@ API: -- doc/api-extensions.md -- doc/rest-api.yaml -- shared/api/**/* +- changed-files: + - any-glob-to-any-file: + - doc/api-extensions.md + - doc/rest-api.yaml + - shared/api/**/* Documentation: -- doc/**/* +- changed-files: + - any-glob-to-any-file: + - doc/**/* From 211de9b41981f1db64ce2acccff29970a0df31e5 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 14 Feb 2024 09:31:48 -0500 Subject: [PATCH 08/12] github: add labels when PRs target LTS branches Signed-off-by: Simon Deziel (cherry picked from commit 9323bd28dcb5722b06c24de2a1fe204e087b73f2) --- .github/labeler.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 7a16429d889b..8d43efcc0001 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -8,3 +8,12 @@ Documentation: - changed-files: - any-glob-to-any-file: - doc/**/* + +"5.21 LTS": +- base-branch: 'stable-5.21' + +"5.0 LTS": +- base-branch: 'stable-5.0' + +"4.0 LTS": +- base-branch: 'stable-4.0' From 4e9794160bddc342ad28123fa8880f1a4fac48eb Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Jan 2024 17:14:00 +0100 Subject: [PATCH 09/12] lxc/config/default: Remove images remote Signed-off-by: Din Music (cherry picked from commit 9ee455979684f2f9bf4a87e529bc34599c6c46bc) Signed-off-by: Simon Deziel --- lxc/config/default.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lxc/config/default.go b/lxc/config/default.go index b16af972c5af..59d083dfafc8 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -7,13 +7,6 @@ var LocalRemote = Remote{ Public: false, } -// ImagesRemote is the community image server (over simplestreams) -var ImagesRemote = Remote{ - Addr: "https://images.linuxcontainers.org", - Public: true, - Protocol: "simplestreams", -} - // UbuntuRemote is the Ubuntu image server (over simplestreams) var UbuntuRemote = Remote{ Addr: "https://cloud-images.ubuntu.com/releases", @@ -39,7 +32,6 @@ var StaticRemotes = map[string]Remote{ // DefaultRemotes is the list of default remotes var DefaultRemotes = map[string]Remote{ - "images": ImagesRemote, "local": LocalRemote, "ubuntu": UbuntuRemote, "ubuntu-daily": UbuntuDailyRemote, From 4a699b00b766d0f9046866ee3ac663b664ed474f Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Tue, 2 Apr 2024 14:56:00 +0100 Subject: [PATCH 10/12] lxc/config/default: Add images remote for images.lxd.canonical.com Signed-off-by: Thomas Parrott (cherry picked from commit ed8073c3eeafb2056e30843751d0edc78dec938a) Signed-off-by: Simon Deziel --- lxc/config/default.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lxc/config/default.go b/lxc/config/default.go index 59d083dfafc8..0bac9c909a2b 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -7,6 +7,13 @@ var LocalRemote = Remote{ Public: false, } +// ImagesRemote is the main image server (over simplestreams). +var ImagesRemote = Remote{ + Addr: "https://images.lxd.canonical.com", + Public: true, + Protocol: "simplestreams", +} + // UbuntuRemote is the Ubuntu image server (over simplestreams) var UbuntuRemote = Remote{ Addr: "https://cloud-images.ubuntu.com/releases", @@ -26,6 +33,7 @@ var UbuntuDailyRemote = Remote{ // StaticRemotes is the list of remotes which can't be removed var StaticRemotes = map[string]Remote{ "local": LocalRemote, + "images": ImagesRemote, "ubuntu": UbuntuRemote, "ubuntu-daily": UbuntuDailyRemote, } From effd80461f920d248594c5658e439351c1f753be Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 12 Apr 2024 13:39:46 +0100 Subject: [PATCH 11/12] lxd/config/default: Add images to DefaultRemotes Same as the other ubuntu remotes. Signed-off-by: Thomas Parrott (cherry picked from commit 9eabc9c221ba90b416488790c8e1c825d79d182d) Signed-off-by: Simon Deziel --- lxc/config/default.go | 1 + 1 file changed, 1 insertion(+) diff --git a/lxc/config/default.go b/lxc/config/default.go index 0bac9c909a2b..04850dad0987 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -41,6 +41,7 @@ var StaticRemotes = map[string]Remote{ // DefaultRemotes is the list of default remotes var DefaultRemotes = map[string]Remote{ "local": LocalRemote, + "images": ImagesRemote, "ubuntu": UbuntuRemote, "ubuntu-daily": UbuntuDailyRemote, } From 4fbc5b2ba81829c05ac34556cb050b8911a7004e Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 16:17:08 -0400 Subject: [PATCH 12/12] *: replace images.linuxcontainers.org by images.lxd.canonical.com Signed-off-by: Simon Deziel --- README.md | 2 +- client/doc.go | 2 +- doc/external_resources.md | 2 +- doc/metadata.yaml | 2 +- doc/rest-api.yaml | 6 +++--- shared/api/image.go | 2 +- shared/api/instance.go | 2 +- shared/util_test.go | 4 ++-- test/suites/remote.sh | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c68f689b7b21..97399a19bb5d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ LXD is a next generation system container and virtual machine manager. It offers a unified user experience around full Linux systems running inside containers or virtual machines. -It's image based with pre-made images available for a [wide number of Linux distributions](https://images.linuxcontainers.org) +It's image based with pre-made images available for a [wide number of Linux distributions](https://images.lxd.canonical.com) and is built around a very powerful, yet pretty simple, REST API. diff --git a/client/doc.go b/client/doc.go index 4df61c8cb597..dfe3342350a3 100644 --- a/client/doc.go +++ b/client/doc.go @@ -115,7 +115,7 @@ // } // // // Connect to the remote SimpleStreams server -// d, err = lxd.ConnectSimpleStreams("https://images.linuxcontainers.org", nil) +// d, err = lxd.ConnectSimpleStreams("https://images.lxd.canonical.com", nil) // if err != nil { // return err // } diff --git a/doc/external_resources.md b/doc/external_resources.md index f40e2fa76d5a..cd47c84f32c8 100644 --- a/doc/external_resources.md +++ b/doc/external_resources.md @@ -4,5 +4,5 @@ :maxdepth: 1 Project repository -Image server +Image server ``` diff --git a/doc/metadata.yaml b/doc/metadata.yaml index f8957a32dd73..7d0a50e0639a 100644 --- a/doc/metadata.yaml +++ b/doc/metadata.yaml @@ -121,5 +121,5 @@ navigation: external: true - title: Image server - location: https://images.linuxcontainers.org + location: https://images.lxd.canonical.com external: true diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml index e2653794dde7..db917ed6eb5c 100644 --- a/doc/rest-api.yaml +++ b/doc/rest-api.yaml @@ -900,7 +900,7 @@ definitions: x-go-name: Protocol server: description: URL of the source server - example: https://images.linuxcontainers.org + example: https://images.lxd.canonical.com type: string x-go-name: Server type: object @@ -1017,7 +1017,7 @@ definitions: x-go-name: Secret server: description: URL of the source server - example: https://images.linuxcontainers.org + example: https://images.lxd.canonical.com type: string x-go-name: Server type: @@ -1837,7 +1837,7 @@ definitions: x-go-name: Websockets server: description: Remote server URL (for remote images) - example: https://images.linuxcontainers.org + example: https://images.lxd.canonical.com type: string x-go-name: Server source: diff --git a/shared/api/image.go b/shared/api/image.go index b6970da37e86..f52170d7382d 100644 --- a/shared/api/image.go +++ b/shared/api/image.go @@ -204,7 +204,7 @@ type ImageSource struct { Protocol string `json:"protocol" yaml:"protocol"` // URL of the source server - // Example: https://images.linuxcontainers.org + // Example: https://images.lxd.canonical.com Server string `json:"server" yaml:"server"` // Type of image (container or virtual-machine) diff --git a/shared/api/instance.go b/shared/api/instance.go index 42494cd0c09c..5a7a98340d33 100644 --- a/shared/api/instance.go +++ b/shared/api/instance.go @@ -267,7 +267,7 @@ type InstanceSource struct { Properties map[string]string `json:"properties,omitempty" yaml:"properties,omitempty"` // Remote server URL (for remote images) - // Example: https://images.linuxcontainers.org + // Example: https://images.lxd.canonical.com Server string `json:"server,omitempty" yaml:"server,omitempty"` // Remote server secret (for remote private images) diff --git a/shared/util_test.go b/shared/util_test.go index 9d5a91d8acee..5bd266a6afac 100644 --- a/shared/util_test.go +++ b/shared/util_test.go @@ -25,7 +25,7 @@ func TestURLEncode(t *testing.T) { } func TestUrlsJoin(t *testing.T) { - baseUrl := "http://images.linuxcontainers.org/streams/v1/" + baseUrl := "http://images.lxd.canonical.com/streams/v1/" path := "../../image/root.tar.xz" res, err := JoinUrls(baseUrl, path) @@ -34,7 +34,7 @@ func TestUrlsJoin(t *testing.T) { return } - expected := "http://images.linuxcontainers.org/image/root.tar.xz" + expected := "http://images.lxd.canonical.com/image/root.tar.xz" if res != expected { t.Error(fmt.Errorf("'%s' != '%s'", res, expected)) } diff --git a/test/suites/remote.sh b/test/suites/remote.sh index 2073d2b42739..d4a03d3f92d7 100644 --- a/test/suites/remote.sh +++ b/test/suites/remote.sh @@ -12,7 +12,7 @@ test_remote_url() { # shellcheck disable=2153 urls="${LXD_DIR}/unix.socket unix:${LXD_DIR}/unix.socket unix://${LXD_DIR}/unix.socket" if [ -z "${LXD_OFFLINE:-}" ]; then - urls="images.linuxcontainers.org https://images.linuxcontainers.org ${urls}" + urls="images.lxd.canonical.com https://images.lxd.canonical.com ${urls}" fi # an invalid protocol returns an error @@ -146,8 +146,8 @@ test_remote_admin() { # Check that we can add domains with valid certs without confirmation: if [ -z "${LXD_OFFLINE:-}" ]; then - lxc_remote remote add images1 images.linuxcontainers.org - lxc_remote remote add images2 images.linuxcontainers.org:443 + lxc_remote remote add images1 images.lxd.canonical.com + lxc_remote remote add images2 images.lxd.canonical.com:443 lxc_remote remote remove images1 lxc_remote remote remove images2 fi