The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6280
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) ===
To comply with go lint.
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
From 18b51cb6ea367fdaf785398d062cc9c9c4db5a78 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Wed, 25 Sep 2019 16:50:00 +0100
Subject: [PATCH] lxd: Changes containerLXC function Id() function to ID()
To comply with go lint.
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/container.go | 2 +-
lxd/container_backup.go | 2 +-
lxd/container_lxc.go | 3 ++-
lxd/devlxd.go | 4 ++--
lxd/instance_interface.go | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lxd/container.go b/lxd/container.go
index dce1e8f191..ac61f1af11 100644
--- a/lxd/container.go
+++ b/lxd/container.go
@@ -541,7 +541,7 @@ func containerCreateAsCopy(s *state.State, args
db.InstanceArgs, sourceContainer
}
// Restore snapshot creation date
- err = s.Cluster.ContainerCreationUpdate(cs.Id(),
snap.CreationDate())
+ err = s.Cluster.ContainerCreationUpdate(cs.ID(),
snap.CreationDate())
if err != nil {
if !refresh {
ct.Delete()
diff --git a/lxd/container_backup.go b/lxd/container_backup.go
index 4e016d7af0..cf6b834cb2 100644
--- a/lxd/container_backup.go
+++ b/lxd/container_backup.go
@@ -160,7 +160,7 @@ func containerBackupsPost(d *Daemon, r *http.Request)
response.Response {
backup := func(op *operations.Operation) error {
args := db.InstanceBackupArgs{
Name: fullName,
- InstanceID: c.Id(),
+ InstanceID: c.ID(),
CreationDate: time.Now(),
ExpiryDate: req.ExpiresAt,
InstanceOnly: instanceOnly,
diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index f2c7195b69..3352ee40e0 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -6624,7 +6624,8 @@ func (c *containerLXC) ExpandedDevices()
deviceConfig.Devices {
return c.expandedDevices
}
-func (c *containerLXC) Id() int {
+// ID gets container's ID.
+func (c *containerLXC) ID() int {
return c.id
}
diff --git a/lxd/devlxd.go b/lxd/devlxd.go
index 7862f06aa9..45a8384248 100644
--- a/lxd/devlxd.go
+++ b/lxd/devlxd.go
@@ -114,7 +114,7 @@ var devlxdEventsGet = devLxdHandler{"/1.0/events", func(d
*Daemon, c container,
return &devLxdResponse{"internal server error",
http.StatusInternalServerError, "raw"}
}
- listener, err := d.devlxdEvents.AddListener(strconv.Itoa(c.Id()), conn,
strings.Split(typeStr, ","), "", false)
+ listener, err := d.devlxdEvents.AddListener(strconv.Itoa(c.ID()), conn,
strings.Split(typeStr, ","), "", false)
if err != nil {
return &devLxdResponse{"internal server error",
http.StatusInternalServerError, "raw"}
}
@@ -132,7 +132,7 @@ func devlxdEventSend(c container, eventType string,
eventMessage interface{}) er
event["timestamp"] = time.Now()
event["metadata"] = eventMessage
- return c.DaemonState().DevlxdEvents.Send(strconv.Itoa(c.Id()),
eventType, eventMessage)
+ return c.DaemonState().DevlxdEvents.Send(strconv.Itoa(c.ID()),
eventType, eventMessage)
}
var handlers = []devLxdHandler{
diff --git a/lxd/instance_interface.go b/lxd/instance_interface.go
index 80af10ce13..6e03b7b30a 100644
--- a/lxd/instance_interface.go
+++ b/lxd/instance_interface.go
@@ -74,7 +74,7 @@ type Instance interface {
DeviceEventHandler(*device.RunConfig) error
// Properties
- Id() int
+ ID() int
Location() string
Project() string
Name() string
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
