The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6737
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 1ec4c0d4668d7baaa9efbc7e29e68cb68239ff3f Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Mon, 20 Jan 2020 12:09:03 +0000
Subject: [PATCH 1/2] lxd/instance: Renames driver files for consistency
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/instance/drivers/{container_lxc.go => driver_lxc.go} | 0
lxd/instance/drivers/{vm_qemu.go => driver_qemu.go} | 0
lxd/instance/drivers/{vm_qemu_cmd.go => driver_qemu_cmd.go} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename lxd/instance/drivers/{container_lxc.go => driver_lxc.go} (100%)
rename lxd/instance/drivers/{vm_qemu.go => driver_qemu.go} (100%)
rename lxd/instance/drivers/{vm_qemu_cmd.go => driver_qemu_cmd.go} (100%)
diff --git a/lxd/instance/drivers/container_lxc.go
b/lxd/instance/drivers/driver_lxc.go
similarity index 100%
rename from lxd/instance/drivers/container_lxc.go
rename to lxd/instance/drivers/driver_lxc.go
diff --git a/lxd/instance/drivers/vm_qemu.go
b/lxd/instance/drivers/driver_qemu.go
similarity index 100%
rename from lxd/instance/drivers/vm_qemu.go
rename to lxd/instance/drivers/driver_qemu.go
diff --git a/lxd/instance/drivers/vm_qemu_cmd.go
b/lxd/instance/drivers/driver_qemu_cmd.go
similarity index 100%
rename from lxd/instance/drivers/vm_qemu_cmd.go
rename to lxd/instance/drivers/driver_qemu_cmd.go
From 7e2fb712273ffdc7c8ffd1e2252b3ba92c09a4f8 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Mon, 20 Jan 2020 12:11:22 +0000
Subject: [PATCH 2/2] lxd/instance: Comment clarification
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/instance/instance_utils.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/instance/instance_utils.go b/lxd/instance/instance_utils.go
index 34e62a4c06..4ad0300638 100644
--- a/lxd/instance/instance_utils.go
+++ b/lxd/instance/instance_utils.go
@@ -35,13 +35,13 @@ import (
// ProfileValidationName is an indicator that the instance is just being used
for profile validation.
const ProfileValidationName = ""
-// ValidDevices is linked from instance/load.validDevices to validate device
config.
+// ValidDevices is linked from instance/drivers.validDevices to validate
device config.
var ValidDevices func(state *state.State, cluster *db.Cluster, instanceType
instancetype.Type, instanceName string, devices deviceConfig.Devices, expanded
bool) error
-// Load is linked from instance/load.load to allow different instance types to
be loaded.
+// Load is linked from instance/drivers.load to allow different instance types
to be loaded.
var Load func(s *state.State, args db.InstanceArgs, profiles []api.Profile)
(Instance, error)
-// Create is linked from instance/load.create to allow difference instance
types to be created.
+// Create is linked from instance/drivers.create to allow difference instance
types to be created.
var Create func(s *state.State, args db.InstanceArgs) (Instance, error)
// NetworkGetLeaseAddresses is linked from main.networkGetLeaseAddresses to
limit scope of moving
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
