Updates LXD dependency to the latest stable release (3.18) from October

2019.
hatched · Jan 20, 2020 · e4d82ea · e4d82ea
1 parent fc33d09
commit e4d82ea
Show file tree

Hide file tree

Showing 6 changed files with 1,120 additions and 29 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -127,7 +127,7 @@
 
 [[constraint]]
   name = "github.com/lxc/lxd"
-  revision = "4c2bbb608e7a90a9f175a566b9e638069424f0f7"
+  revision = "3a5f63bc49591c4cb62268f210b07ff8e74b727d"
 
 [[constraint]]
   name = "github.com/oracle/oci-go-sdk"

diff --git a/container/lxd/container.go b/container/lxd/container.go
@@ -13,8 +13,8 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/retry"
 	"github.com/juju/utils/arch"
-	"github.com/lxc/lxd/shared"
 	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/units"
 	"github.com/lxc/lxd/shared/version"
 
 	"github.com/juju/juju/core/constraints"
@@ -104,7 +104,7 @@ func (c *Container) Mem() uint {
 		return 0
 	}
 
-	bytes, err := shared.ParseByteSizeString(v)
+	bytes, err := units.ParseByteSizeString(v)
 	if err != nil {
 		logger.Errorf("failed to parse %q into bytes, ignoring err: %s", v, err)
 		return 0

diff --git a/container/lxd/mocks/clock_mock.go b/container/lxd/mocks/clock_mock.go